You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/02/06 13:03:15 UTC

svn commit: r504094 - in /webservices/synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java pom.xml

Author: asankha
Date: Tue Feb  6 04:03:15 2007
New Revision: 504094

URL: http://svn.apache.org/viewvc?view=rev&rev=504094
Log:
upgrade synapse to axis2 1.1.1

Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
    webservices/synapse/trunk/java/pom.xml

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java?view=diff&rev=504094&r1=504093&r2=504094
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/DynamicAxisOperation.java Tue Feb  6 04:03:15 2007
@@ -66,7 +66,7 @@
 		return new DynamicOperationClient(this, sc, options);
 	}
 
-	class DynamicOperationClient implements OperationClient {
+	class DynamicOperationClient extends OperationClient {
 
 		private AxisOperation axisOp;
 
@@ -86,7 +86,8 @@
 
 		DynamicOperationClient(OutInAxisOperation axisOp, ServiceContext sc,
 				Options options) {
-			this.axisOp = axisOp;
+            super(axisOp, sc, options);
+            this.axisOp = axisOp;
 			this.sc = sc;
 			this.options = options;
 			this.completed = false;
@@ -165,7 +166,7 @@
 		 * @param mc
 		 *            the message context whose id is to be set
 		 */
-		private void setMessageID(MessageContext mc) {
+        protected void setMessageID(MessageContext mc) {
 			// now its the time to put the parameters set by the user in to the
 			// correct places and to the
 			// if there is no message id still, set a new one.
@@ -231,12 +232,13 @@
 				mc.setTransportIn(options.getTransportIn());
 			}
 
+			/*TODO FIXME 
 			if (mc.getSoapAction() == null || "".equals(mc.getSoapAction())) {
-				String soapaction = axisOp.getSoapAction();
+				String soapaction = axisOp.getOutputAction();
 				if (soapaction != null) {
 					mc.setSoapAction(soapaction);
 				}
-			}
+			}*/
 			addReferenceParameters(mc);
 			if (options.isUseSeparateListener()) {
 
@@ -313,7 +315,7 @@
 			}
 		}
 
-		private void addReferenceParameters(MessageContext msgctx) {
+		protected void addReferenceParameters(MessageContext msgctx) {
 			EndpointReference to = msgctx.getTo();
 			if (options.isManageSession()) {
 				EndpointReference tepr = sc.getTargetEPR();

Modified: webservices/synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=504094&r1=504093&r2=504094
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Tue Feb  6 04:03:15 2007
@@ -256,7 +256,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-rahas</artifactId>
-            <version>${axis2.version}</version>
+            <version>${axis2.security.version}</version>
         </dependency>
 
         <dependency>
@@ -280,7 +280,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-secpolicy</artifactId>
-            <version>${axis2.version}</version>
+            <version>${axis2.security.version}</version>
         </dependency>
         
         <dependency>
@@ -292,7 +292,7 @@
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-security</artifactId>
-            <version>${axis2.version}</version>
+            <version>${axis2.security.version}</version>
         </dependency>
 
         <dependency>
@@ -596,7 +596,8 @@
 
     <properties>
         <synapse.version>SNAPSHOT</synapse.version>
-        <axis2.version>1.1.051</axis2.version>
+        <axis2.version>1.1.1</axis2.version>
+        <axis2.security.version>1.1</axis2.security.version>
         <rampart.version>1.1</rampart.version>
         <axiom.version>1.2.1</axiom.version>
         <xml_schema.version>1.064</xml_schema.version>



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