synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sami...@apache.org
Subject svn commit: r351723 - in /incubator/synapse/trunk/java: src/org/apache/synapse/axis2/ src/org/apache/synapse/processors/builtin/axis2/ src/org/apache/synapse/processors/mediatortypes/axis2/ test/org/apache/synapse/configurators/ test/org/apache/synapse...
Date Fri, 02 Dec 2005 13:52:39 GMT
Author: saminda
Date: Fri Dec  2 05:52:16 2005
New Revision: 351723

URL: http://svn.apache.org/viewcvs?rev=351723&view=rev
Log:
Corrected compilation erros and updated to code to cope with latest 
axis-0.93

Modified:
    incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java
    incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2Sender.java
    incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
    incubator/synapse/trunk/java/src/org/apache/synapse/axis2/SynapseDispatcher.java
    incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingProcessor.java
    incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java
    incubator/synapse/trunk/java/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java
    incubator/synapse/trunk/java/test/org/apache/synapse/configurators/SynapseConfiguratorTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java
(original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2FlexibleMEPClient.java
Fri Dec  2 05:52:16 2005
@@ -25,7 +25,7 @@
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.OutInAxisOperation;
-import org.apache.axis2.engine.AxisConfigurationImpl;
+import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEngine;
 import org.apache.axis2.om.OMAbstractFactory;
 
@@ -52,7 +52,7 @@
             AxisService axisService = new AxisService(assumedServiceName);
             AxisOperation axisOperationTemplate = new OutInAxisOperation(
                     new QName("TemplateOperation"));
-            PhasesInfo info = ((AxisConfigurationImpl) configContext
+            PhasesInfo info = ((AxisConfiguration) configContext
                     .getAxisConfiguration()).getPhasesinfo();
             if (info != null) {
                 info.setOperationPhases(axisOperationTemplate);
@@ -124,7 +124,7 @@
             engine.send(msgCtx);
 
             MessageContext response = new MessageContext(msgCtx
-                    .getSystemContext(), msgCtx.getSessionContext(), msgCtx
+                    .getConfigurationContext(), msgCtx.getSessionContext(), msgCtx
                     .getTransportIn(), msgCtx.getTransportOut());
             response.setProperty(MessageContext.TRANSPORT_IN, msgCtx
                     .getProperty(MessageContext.TRANSPORT_IN));
@@ -142,7 +142,7 @@
                     response, msgCtx.getEnvelope().getNamespace().getName());
 
             response.setEnvelope(resenvelope);
-            engine = new AxisEngine(msgCtx.getSystemContext());
+            engine = new AxisEngine(msgCtx.getConfigurationContext());
             engine.receive(response);
             response.setProperty(Constants.ISRESPONSE_PROPERTY, new Boolean(
                     true));

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2Sender.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2Sender.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2Sender.java (original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2Sender.java Fri Dec  2
05:52:16 2005
@@ -41,9 +41,9 @@
 
 			MessageContext messageContext = ((Axis2SynapseMessage) smc)
 					.getMessageContext();
-			AxisEngine ae = new AxisEngine(messageContext.getSystemContext());
+			AxisEngine ae = new AxisEngine(messageContext.getConfigurationContext());
 
-			ConfigurationContext sc = messageContext.getSystemContext();
+			ConfigurationContext sc = messageContext.getConfigurationContext();
 
 			MessageContext outMsgContext = Axis2FlexibleMEPClient
 					.send(messageContext);
@@ -91,7 +91,7 @@
 	public static void sendBack(SynapseMessage smc) {
 		MessageContext messageContext = ((Axis2SynapseMessage) smc)
 				.getMessageContext();
-		AxisEngine ae = new AxisEngine(messageContext.getSystemContext());
+		AxisEngine ae = new AxisEngine(messageContext.getConfigurationContext());
 
 		if (messageContext.getEnvelope().getHeader() == null)
 			messageContext.getEnvelope().getBody().insertSiblingBefore(

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
(original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/axis2/Axis2SynapseEnvironmentFinder.java
Fri Dec  2 05:52:16 2005
@@ -46,7 +46,7 @@
 
    public static synchronized SynapseEnvironment getSynapseEnvironment(
             MessageContext mc) {
-        AxisConfiguration ac = mc.getSystemContext().getAxisConfiguration();
+        AxisConfiguration ac = mc.getConfigurationContext().getAxisConfiguration();
         Parameter synapseEnvParam = ac.getParameter(SYNAPSE_ENVIRONMENT);
         if (synapseEnvParam == null) {
 

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/axis2/SynapseDispatcher.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/axis2/SynapseDispatcher.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/axis2/SynapseDispatcher.java (original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/axis2/SynapseDispatcher.java Fri Dec
 2 05:52:16 2005
@@ -49,7 +49,7 @@
 	}
 
 	public AxisService findService(MessageContext mc) throws AxisFault {
-		AxisConfiguration ac = mc.getSystemContext().getAxisConfiguration();
+		AxisConfiguration ac = mc.getConfigurationContext().getAxisConfiguration();
 		AxisService as = ac.getService(SYNAPSE_SERVICE_NAME);
 		// TODO handle missing config
 		return as;
@@ -65,7 +65,7 @@
 		ao.registerOperationContext(mc, oc);
 
 		// fill the service group context and service context info
-		mc.getSystemContext().fillServiceContextAndServiceGroupContext(mc);
+		mc.getConfigurationContext().fillServiceContextAndServiceGroupContext(mc);
 		// TODO handle missing config
 		return ao;
 	}

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingProcessor.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingProcessor.java
(original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingProcessor.java
Fri Dec  2 05:52:16 2005
@@ -57,7 +57,7 @@
 		try {
 			MessageContext mc = ((Axis2SynapseMessage) smc)
 					.getMessageContext();
-			ConfigurationContext cc = mc.getSystemContext();
+			ConfigurationContext cc = mc.getConfigurationContext();
 			AxisConfiguration ac = cc.getAxisConfiguration();
 			AxisEngine ae = new AxisEngine(cc);
 			AxisService as = ac.getService(Constants.EMPTYMEDIATOR);

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java
(original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/FaultProcessor.java
Fri Dec  2 05:52:16 2005
@@ -52,13 +52,13 @@
 					.getMessageContext();
 			MessageContext outMC = Utils
 					.createOutMessageContext(messageContext);
-			outMC.setConfigurationContext(messageContext.getSystemContext());
+			outMC.setConfigurationContext(messageContext.getConfigurationContext());
 			outMC.setServerSide(true);
 
 			outMC.setEnvelope(OMAbstractFactory.getSOAP11Factory()
 					.getDefaultFaultEnvelope());
 
-			AxisEngine ae = new AxisEngine(messageContext.getSystemContext());
+			AxisEngine ae = new AxisEngine(messageContext.getConfigurationContext());
 			Object os = messageContext
 					.getProperty(MessageContext.TRANSPORT_OUT);
 			outMC.setProperty(MessageContext.TRANSPORT_OUT, os);

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java
(original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/processors/mediatortypes/axis2/ServiceMediatorProcessor.java
Fri Dec  2 05:52:16 2005
@@ -64,7 +64,7 @@
 		
 
 		try {
-			ConfigurationContext cc = messageContext.getSystemContext();
+			ConfigurationContext cc = messageContext.getConfigurationContext();
 			AxisConfiguration ac = cc.getAxisConfiguration();
 			AxisEngine ae = new AxisEngine(cc);
 

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/configurators/SynapseConfiguratorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/configurators/SynapseConfiguratorTest.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/configurators/SynapseConfiguratorTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/configurators/SynapseConfiguratorTest.java
Fri Dec  2 05:52:16 2005
@@ -33,7 +33,7 @@
 				.getSynapseEnvironment(mc);
         assertNotNull(env);
 
-        AxisConfiguration ac = mc.getSystemContext().getAxisConfiguration();
+        AxisConfiguration ac = mc.getConfigurationContext().getAxisConfiguration();
 
         Parameter parm =  ac.getParameter(Constants.SYNAPSE_ENVIRONMENT);
         assertNotNull(parm);

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/FaultProcessorWithRuleTest.java
Fri Dec  2 05:52:16 2005
@@ -50,8 +50,7 @@
     public void testFaultPrcessor() throws Exception {
         MessageSender msgSender = new MessageSender();
         Options co = new Options();
-        co.setTo(targetEpr);
-        co.setSenderTransportProtocol(Constants.TRANSPORT_HTTP);
+        co.setTo(targetEpr);        
         msgSender.setClientOptions(co);
         msgSender.send(operation.getLocalPart(),Axis2EvnSetup.payload());
 

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendBackProcessorWithRuleTest.java
Fri Dec  2 05:52:16 2005
@@ -45,8 +45,7 @@
     public void testSendPrcessor() throws Exception {
         MessageSender msgSender = new MessageSender();
         Options co = new Options();
-        co.setTo(targetEpr);
-        co.setSenderTransportProtocol(Constants.TRANSPORT_HTTP);
+        co.setTo(targetEpr);        
         msgSender.setClientOptions(co);
         msgSender.send(operation.getLocalPart(), Axis2EvnSetup.payload());
 

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java?rev=351723&r1=351722&r2=351723&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java (original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/util/Axis2EvnSetup.java Fri Dec 
2 05:52:16 2005
@@ -46,7 +46,7 @@
         msgCtx.setEnvelope(testEnvSetup());
         msgCtx.setServerSide(true);
 
-        AxisConfiguration axisConfiguration = msgCtx.getSystemContext()
+        AxisConfiguration axisConfiguration = msgCtx.getConfigurationContext()
                 .getAxisConfiguration();
         AxisService service = new AxisService(
                 new QName("se"));



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


Mime
View raw message