You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2007/04/29 10:11:07 UTC

svn commit: r533485 - in /incubator/tuscany/java/sca/modules: binding-ws-axis2/ binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/ databinding-axiom/

Author: antelder
Date: Sun Apr 29 01:11:06 2007
New Revision: 533485

URL: http://svn.apache.org/viewvc?view=rev&rev=533485
Log:
Move up to the Axis2 1.2 release

Modified:
    incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
    incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
    incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml?view=diff&rev=533485&r1=533484&r2=533485
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/pom.xml Sun Apr 29 01:11:06 2007
@@ -84,25 +84,25 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-kernel</artifactId>
-            <version>1.1.1</version>
+            <version>1.2</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-api</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.4</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.4</version>
         </dependency>
 
         <dependency>
-           <groupId>incubator-woden</groupId>
+           <groupId>org.apache.woden</groupId>
            <artifactId>woden</artifactId>
-           <version>1.0.0M6</version>
+           <version>1.0-incubating-M7a</version>
            <scope>runtime</scope>
         </dependency>
 
@@ -115,14 +115,14 @@
         <dependency>
             <groupId>org.apache.neethi</groupId>
             <artifactId>neethi</artifactId>
-            <version>2.0</version>
+            <version>2.0.1</version>
             <scope>runtime</scope>
         </dependency>
 
         <dependency>
            <groupId>org.apache.ws.commons.schema</groupId>
            <artifactId>XmlSchema</artifactId>
-           <version>1.2</version>
+           <version>1.3.1</version>
         </dependency>
 
         <dependency>

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java?view=diff&rev=533485&r1=533484&r2=533485
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ReferenceBinding.java Sun Apr 29 01:11:06 2007
@@ -153,7 +153,7 @@
         options.setTimeOutInMilliSeconds(30 * 1000); // 30 seconds
 
         SOAPFactory soapFactory = OMAbstractFactory.getSOAP11Factory();
-        QName wsdlOperationQName = new QName(wsBinding.getNamespace(), operationName);
+        QName wsdlOperationQName = new QName(operationName);
 
         Axis2TargetInvoker invoker;
         if (hasCallback) {

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java?view=diff&rev=533485&r1=533484&r2=533485
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceBinding.java Sun Apr 29 01:11:06 2007
@@ -42,10 +42,10 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
+import org.apache.axis2.description.WSDL2Constants;
 import org.apache.axis2.description.WSDLToAxisServiceBuilder;
 import org.apache.axis2.engine.MessageReceiver;
 import org.apache.axis2.wsdl.WSDLConstants;
-import org.apache.axis2.wsdl.WSDLConstants.WSDL20_2004Constants;
 import org.apache.tuscany.binding.ws.WebServiceBinding;
 import org.apache.tuscany.http.ServletHostExtensionPoint;
 import org.apache.tuscany.interfacedef.InterfaceContract;
@@ -148,9 +148,9 @@
             if (op != null) {
 
                 if (op.isNonBlocking()) {
-                    axisOp.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_ONLY);
+                    axisOp.setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_ONLY);
                 } else {
-                    axisOp.setMessageExchangePattern(WSDL20_2004Constants.MEP_URI_IN_OUT);
+                    axisOp.setMessageExchangePattern(WSDL2Constants.MEP_URI_IN_OUT);
                 }
 
                 MessageReceiver msgrec = null;

Modified: incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java?view=diff&rev=533485&r1=533484&r2=533485
==============================================================================
--- incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java (original)
+++ incubator/tuscany/java/sca/modules/binding-ws-axis2/src/main/java/org/apache/tuscany/binding/axis2/Axis2ServiceServlet.java Sun Apr 29 01:11:06 2007
@@ -67,6 +67,15 @@
     }
 
     /**
+     * Override Axis2 servlet method to avoid loop when init 
+     * is called after servletConfig already initialized by
+     * this classes init(ConfigurationContext) method.
+     */
+    @Override
+    public void init() throws ServletException {
+    }
+
+    /**
      * We've setup the Servlet by passing in a ConfigurationContext on our init method 
      * override this method to just return that
      */

Modified: incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml?view=diff&rev=533485&r1=533484&r2=533485
==============================================================================
--- incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/databinding-axiom/pom.xml Sun Apr 29 01:11:06 2007
@@ -55,7 +55,7 @@
                     <artifactId>xercesImpl</artifactId>
                 </exclusion>
             </exclusions>
-            <version>1.2.2</version>
+            <version>1.2.4</version>
         </dependency>
 
         <dependency>
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
             <artifactId>axiom-impl</artifactId>
-            <version>1.2.2</version>
+            <version>1.2.4</version>
             <scope>runtime</scope>
         </dependency>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org