servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r358588 - in /incubator/servicemix/trunk: assembly/ etc/ servicemix-components/ servicemix-jsr181/ servicemix-jsr181/src/main/java/org/servicemix/jsr181/ servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/ servicemix-lwcontainer/ s...
Date Thu, 22 Dec 2005 17:03:51 GMT
Author: gnodet
Date: Thu Dec 22 09:03:38 2005
New Revision: 358588

URL: http://svn.apache.org/viewcvs?rev=358588&view=rev
Log:
Upgrade to a newer version of XFire

Modified:
    incubator/servicemix/trunk/assembly/project.xml
    incubator/servicemix/trunk/etc/project.properties
    incubator/servicemix/trunk/servicemix-components/project.xml
    incubator/servicemix/trunk/servicemix-jsr181/   (props changed)
    incubator/servicemix/trunk/servicemix-jsr181/project.xml
    incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181Endpoint.java
    incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181ExchangeProcessor.java
    incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiChannel.java
    incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiProxy.java
    incubator/servicemix/trunk/servicemix-lwcontainer/   (props changed)
    incubator/servicemix/trunk/servicemix-wsnotification/project.xml
    incubator/servicemix/trunk/servicemix-wspojo/   (props changed)
    incubator/servicemix/trunk/servicemix-wsrm/   (props changed)
    incubator/servicemix/trunk/tooling/maven-jbi-plugin/   (props changed)
    incubator/servicemix/trunk/tooling/servicemix-web/   (props changed)

Modified: incubator/servicemix/trunk/assembly/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/assembly/project.xml?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/assembly/project.xml (original)
+++ incubator/servicemix/trunk/assembly/project.xml Thu Dec 22 09:03:38 2005
@@ -594,7 +594,7 @@
       </properties>
     </dependency>
     <dependency>
-      <groupId>xfire</groupId>
+      <groupId>servicemix</groupId>
       <artifactId>xfire-all</artifactId>
       <version>${xfire_version}</version>
       <properties>

Modified: incubator/servicemix/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/etc/project.properties?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/etc/project.properties (original)
+++ incubator/servicemix/trunk/etc/project.properties Thu Dec 22 09:03:38 2005
@@ -251,10 +251,7 @@
 # http://www.xbean.org/, ASL 2
 xbean_version=2.1-SNAPSHOT
 # http://xfire.codehaus.org/, http://xfire.codehaus.org/License - BSD
-xfire_version=1.0-20051129.225317
-xfire_jaxws_version=1.0-20051130.145319
-#xfire_version=1.0-SNAPSHOT
-#xfire_jaxws_version=1.0-SNAPSHOT
+xfire_version=1.0-20051222
 # from ws-commons ?
 xfire_xmlschema_version=20051110
 # ?

Modified: incubator/servicemix/trunk/servicemix-components/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-components/project.xml?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-components/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-components/project.xml Thu Dec 22 09:03:38 2005
@@ -421,7 +421,7 @@
 
     <!-- for XFire component -->
     <dependency>
-      <groupId>xfire</groupId>
+      <groupId>servicemix</groupId>
       <artifactId>xfire-all</artifactId>
       <version>${xfire_version}</version>
     </dependency>

Propchange: incubator/servicemix/trunk/servicemix-jsr181/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 22 09:03:38 2005
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/trunk/servicemix-jsr181/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/project.xml?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-jsr181/project.xml Thu Dec 22 09:03:38 2005
@@ -66,17 +66,9 @@
         </properties>
       </dependency>
       <dependency>
-        <groupId>xfire</groupId>
+        <groupId>servicemix</groupId>
         <artifactId>xfire-all</artifactId>
         <version>${xfire_version}</version>
-        <properties>
-          <jbi.bundle>true</jbi.bundle>
-        </properties>
-      </dependency>
-      <dependency>
-        <groupId>xfire</groupId>
-        <artifactId>xfire-jaxws</artifactId>
-        <version>${xfire_jaxws_version}</version>
         <properties>
           <jbi.bundle>true</jbi.bundle>
         </properties>

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181Endpoint.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181Endpoint.java?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181Endpoint.java
(original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181Endpoint.java
Thu Dec 22 09:03:38 2005
@@ -239,12 +239,17 @@
         props.put(ObjectServiceFactory.PORT_TYPE, interfaceName);
         props.put(ObjectServiceFactory.STYLE, SoapConstants.STYLE_WRAPPED);
         props.put(ObjectServiceFactory.USE, SoapConstants.USE_LITERAL);
+        factory.getSoap11Transports().clear();
+        factory.getSoap12Transports().clear();
+        factory.getSoap11Transports().add(JbiTransport.JBI_BINDING);
         xfireService = factory.create(serviceClass, svcLocalName, svcNamespace, props);
         xfireService.setInvoker(new BeanInvoker(getPojo()));
         xfire.getServiceRegistry().register(xfireService);
+        /*
         xfire.getTransportManager().disableAll(xfireService);
         Transport jbiT = xfire.getTransportManager().getTransport(JbiTransport.JBI_BINDING);
         xfire.getTransportManager().enable(jbiT, xfireService);
+        */
         this.description = generateWsdl();
         
         // Check service name and endpoint name

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181ExchangeProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181ExchangeProcessor.java?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181ExchangeProcessor.java
(original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/Jsr181ExchangeProcessor.java
Thu Dec 22 09:03:38 2005
@@ -38,7 +38,6 @@
 import org.codehaus.xfire.MessageContext;
 import org.codehaus.xfire.XFire;
 import org.codehaus.xfire.exchange.InMessage;
-import org.codehaus.xfire.exchange.RobustInOutExchange;
 import org.codehaus.xfire.service.Service;
 import org.codehaus.xfire.transport.Channel;
 import org.codehaus.xfire.transport.Transport;
@@ -75,7 +74,7 @@
         ctx.setXFire(xfire);
         ctx.setService(service);
         ctx.setProperty(Channel.BACKCHANNEL_URI, out);
-        ctx.setExchange(new RobustInOutExchange(ctx));
+        ctx.setExchange(new org.codehaus.xfire.exchange.MessageExchange(ctx));
         InMessage msg = new InMessage();
         ctx.getExchange().setInMessage(msg);
         NormalizedMessage in = exchange.getMessage("in");

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiChannel.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiChannel.java?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiChannel.java
(original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiChannel.java
Thu Dec 22 09:03:38 2005
@@ -41,7 +41,7 @@
 import org.codehaus.xfire.exchange.MessageSerializer;
 import org.codehaus.xfire.exchange.OutMessage;
 import org.codehaus.xfire.fault.XFireFault;
-import org.codehaus.xfire.soap.SoapBinding;
+import org.codehaus.xfire.soap.AbstractSoapBinding;
 import org.codehaus.xfire.transport.AbstractChannel;
 import org.codehaus.xfire.transport.Channel;
 import org.codehaus.xfire.util.STAXUtils;
@@ -129,12 +129,12 @@
         MessageSerializer serializer = context.getOutMessage().getSerializer();
         if (serializer == null)
         {
-            SoapBinding binding = (SoapBinding) context.getBinding();
+        	AbstractSoapBinding binding = (AbstractSoapBinding) context.getBinding();
             if (binding == null)
             {
                 throw new XFireException("Couldn't find the binding!");
             }
-            serializer = SoapBinding.getSerializer(binding.getStyle(), binding.getUse());
+            serializer = AbstractSoapBinding.getSerializer(binding.getStyle(), binding.getUse());
         }
         serializer.writeMessage(message, writer, context);
         writer.close();

Modified: incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiProxy.java
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiProxy.java?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiProxy.java
(original)
+++ incubator/servicemix/trunk/servicemix-jsr181/src/main/java/org/servicemix/jsr181/xfire/JbiProxy.java
Thu Dec 22 09:03:38 2005
@@ -78,8 +78,7 @@
     
     public Object getProxy() throws Exception {
         if (proxy == null) {
-            Transport transport = xfire.getTransportManager().getTransportForUri("jbi://");
-            Client client = new Client(transport, getDescription(), serviceClass);
+            Client client = new Client(JbiTransport.JBI_BINDING, getDescription(), serviceClass);
             if (interfaceName != null) {
                 client.getService().setProperty(JbiChannel.JBI_INTERFACE_NAME, interfaceName);
             }

Propchange: incubator/servicemix/trunk/servicemix-lwcontainer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 22 09:03:38 2005
@@ -0,0 +1 @@
+target

Modified: incubator/servicemix/trunk/servicemix-wsnotification/project.xml
URL: http://svn.apache.org/viewcvs/incubator/servicemix/trunk/servicemix-wsnotification/project.xml?rev=358588&r1=358587&r2=358588&view=diff
==============================================================================
--- incubator/servicemix/trunk/servicemix-wsnotification/project.xml (original)
+++ incubator/servicemix/trunk/servicemix-wsnotification/project.xml Thu Dec 22 09:03:38 2005
@@ -191,14 +191,9 @@
       <version>${jencks_version}</version>
     </dependency>
     <dependency>
-      <groupId>xfire</groupId>
+      <groupId>servicemix</groupId>
       <artifactId>xfire-all</artifactId>
       <version>${xfire_version}</version>
-    </dependency>
-    <dependency>
-      <groupId>xfire</groupId>
-      <artifactId>xfire-jaxws</artifactId>
-      <version>${xfire_jaxws_version}</version>
     </dependency>
     <dependency>
       <groupId>jdom</groupId>

Propchange: incubator/servicemix/trunk/servicemix-wspojo/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 22 09:03:38 2005
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/trunk/servicemix-wsrm/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 22 09:03:38 2005
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/trunk/tooling/maven-jbi-plugin/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 22 09:03:38 2005
@@ -0,0 +1 @@
+target

Propchange: incubator/servicemix/trunk/tooling/servicemix-web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Dec 22 09:03:38 2005
@@ -0,0 +1 @@
+target



Mime
View raw message