svn commit: r673115 - in /servicemix/components/shared-libraries/trunk/servicemix-soap: pom.xml src/main/java/org/apache/servicemix/soap/SoapEndpoint.java src/main/java/org/apache/servicemix/soap/SoapHelper.java

[gnodet]

Author: gnodet
Date: Tue Jul  1 09:00:28 2008
New Revision: 673115

URL: http://svn.apache.org/viewvc?rev=673115&view=rev
Log:
Use correct version for servicemix-common

Modified:
    servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
    
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
    
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java

Modified: servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml
URL: 
http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml?rev=673115&r1=673114&r2=673115&view=diff
==============================================================================
--- servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml 
(original)
+++ servicemix/components/shared-libraries/trunk/servicemix-soap/pom.xml Tue 
Jul  1 09:00:28 2008
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.apache.servicemix</groupId>
       <artifactId>servicemix-common</artifactId>
-      <version>${servicemix-version}</version>
+      <version>4.0-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
@@ -90,6 +90,10 @@
       <artifactId>xmlsec</artifactId>
       <version>1.3.0</version>
     </dependency>
+    <dependency>
+      <groupId>wsdl4j</groupId>
+      <artifactId>wsdl4j</artifactId>
+    </dependency>
   </dependencies>
   
   <build>

Modified: 
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java?rev=673115&r1=673114&r2=673115&view=diff
==============================================================================
--- 
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
 (original)
+++ 
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapEndpoint.java
 Tue Jul  1 09:00:28 2008
@@ -41,11 +41,10 @@
 
 import org.apache.servicemix.common.Endpoint;
 import org.apache.servicemix.common.ExchangeProcessor;
+import org.apache.servicemix.common.JbiConstants;
+import org.apache.servicemix.common.security.KeystoreManager;
+import org.apache.servicemix.common.security.AuthenticationService;
 import org.apache.servicemix.common.wsdl1.JbiExtension;
-import org.apache.servicemix.common.xbean.XBeanServiceUnit;
-import org.apache.servicemix.jbi.messaging.MessageExchangeSupport;
-import org.apache.servicemix.jbi.security.auth.AuthenticationService;
-import org.apache.servicemix.jbi.security.keystore.KeystoreManager;
 import org.apache.servicemix.soap.handlers.addressing.AddressingHandler;
 import org.springframework.core.io.Resource;
 import org.w3c.dom.Document;
@@ -57,7 +56,7 @@
     protected ServiceEndpoint activated;
     protected ExchangeProcessor processor;
     protected Role role;
-    protected URI defaultMep = MessageExchangeSupport.IN_OUT;
+    protected URI defaultMep = JbiConstants.IN_OUT;
     protected boolean soap;
     protected String soapVersion;
     protected Resource wsdlResource;

Modified: 
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java
URL: 
http://svn.apache.org/viewvc/servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java?rev=673115&r1=673114&r2=673115&view=diff
==============================================================================
--- 
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java
 (original)
+++ 
servicemix/components/shared-libraries/trunk/servicemix-soap/src/main/java/org/apache/servicemix/soap/SoapHelper.java
 Tue Jul  1 09:00:28 2008
@@ -50,6 +50,8 @@
 import org.apache.servicemix.soap.marshalers.SoapMarshaler;
 import org.apache.servicemix.soap.marshalers.SoapMessage;
 import org.apache.servicemix.soap.marshalers.SoapWriter;
+import org.apache.servicemix.common.JbiConstants;
+
 import org.w3c.dom.Document;
 
 import com.ibm.wsdl.Constants;
@@ -65,10 +67,6 @@
 
     private static final Log logger = LogFactory.getLog(SoapHelper.class);
 
-    public static final URI IN_ONLY = 
URI.create("http://www.w3.org/2004/08/wsdl/in-only";);
-    public static final URI IN_OUT = 
URI.create("http://www.w3.org/2004/08/wsdl/in-out";);
-    public static final URI ROBUST_IN_ONLY = 
URI.create("http://www.w3.org/2004/08/wsdl/robust-in-only";);
-
     private SoapEndpoint endpoint;
     private List policies;
     private JBIMarshaler jbiMarshaler;
@@ -255,11 +253,11 @@
                             && oper.getOutput().getMessage().getParts().size() 
> 0;
             boolean faults = oper.getFaults().size() > 0;
             if (output) {
-                mep = IN_OUT;
+                mep = JbiConstants.IN_OUT;
             } else if (faults) {
-                mep = ROBUST_IN_ONLY;
+                mep = JbiConstants.ROBUST_IN_ONLY;
             } else {
-                mep = IN_ONLY;
+                mep = JbiConstants.IN_ONLY;
             }
         }
         return mep;