synapse-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p..@apache.org
Subject svn commit: r368512 - in /incubator/synapse/trunk/java: src/org/apache/synapse/processors/builtin/axis2/ src/samples/userguide/ test/org/apache/axis2/ test/org/apache/synapse/environment/ test/org/apache/synapse/mediators/ test/org/apache/synapse/spi/i...
Date Thu, 12 Jan 2006 23:14:42 GMT
Author: pzf
Date: Thu Jan 12 15:14:26 2006
New Revision: 368512

URL: http://svn.apache.org/viewcvs?rev=368512&view=rev
Log:
Code tidying - removing unnecessary imports and minor updates for a clean build prior to release.


Modified:
    incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
    incubator/synapse/trunk/java/src/samples/userguide/DumbStockQuoteClient.java
    incubator/synapse/trunk/java/src/samples/userguide/ProxyStockQuoteClient.java
    incubator/synapse/trunk/java/test/org/apache/axis2/MultipleAddressingMoudleEngagementTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
    incubator/synapse/trunk/java/test/org/apache/synapse/spi/processors/FaultProcessorTest.java

Modified: incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
(original)
+++ incubator/synapse/trunk/java/src/org/apache/synapse/processors/builtin/axis2/AddressingInProcessor.java
Thu Jan 12 15:14:26 2006
@@ -21,7 +21,8 @@
 import org.apache.axis2.context.*;
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.description.InOutAxisOperation;
+
+
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.AxisEngine;
 
@@ -35,7 +36,7 @@
 
 
 import org.apache.synapse.axis2.Axis2SynapseMessage;
-import org.apache.synapse.axis2.EmptyMessageReceiver;
+
 
 import org.apache.synapse.processors.AbstractProcessor;
 
@@ -48,110 +49,6 @@
 public class AddressingInProcessor extends AbstractProcessor {
     private Log log = LogFactory.getLog(getClass());
 
-//    public boolean process(SynapseEnvironment se, SynapseMessage smc) {
-//        log.debug("process");
-//        try {
-//            MessageContext mc = ((Axis2SynapseMessage) smc)
-//                    .getMessageContext();
-//            ///////////////////////////////////////////////////////////////////
-//            // Default Configurations. We are not going to alter these configurtions
-//            ConfigurationContext cc = mc.getConfigurationContext();
-//            AxisConfiguration ac = cc.getAxisConfiguration();
-//            //////////////////////////////////////////////////////////////////
-////            AxisService as = ac.getService(Constants.EMPTYMEDIATOR);
-////            if (as == null)
-////                throw new SynapseException("cannot locate service "
-////                        + Constants.EMPTYMEDIATOR);
-//
-//            ///////////////////////////////////////////////////////////////////
-//            //////////////////////////////////////////////////////////////////
-//            // making addressing on/off behavior possible
-//            // default addressing is on. Allow MessageContext to pass through the chain
-//            // and fill the addressingHeaderInformation. Once the chain is excuted old
ConfigurationContext
-//            // set to the MessageContext.
-//            // inorder to make this possible, we create a new ConfigurationContext
-//            // from scratch. Then add the service, operation and MessageReceiver
-//            // programatically. After the invocation, old ConfigurationContext and
-//            // AxisConfiguration is set to the MessageContext
-//
-//            ConfigurationContextFactory configCtxFac =
-//                    new ConfigurationContextFactory();
-//            ConfigurationContext configCtx =
-//                    configCtxFac.buildConfigurationContext(null);
-//            AxisConfiguration axisConfig = configCtx.getAxisConfiguration();
-//
-//            AxisService service = new AxisService(Constants.EMPTYMEDIATOR);
-//            service.setClassLoader(ac.getServiceClassLoader());
-//            AxisOperation axisOp =
-//                    new InOutAxisOperation(Constants.MEDIATE_OPERATION_NAME);
-//            axisOp.setMessageReceiver(new EmptyMessageReceiver());
-//            service.addOperation(axisOp);
-//            axisConfig.addService(service);
-//
-//            mc.setConfigurationContext(configCtx);
-//
-//            //setging the addressing enable ConfigurationContext to SynapeMessage
-//
-//            smc.setProperty(
-//                    Constants.ADDRESSING_PROCESSED_CONFIGURATION_CONTEXT,
-//                    configCtx);
-//            //////////////////////////////////////////////////////////////////
-//            //////////////////////////////////////////////////////////////////
-//            //AxisEngine ae = new AxisEngine(cc);
-//            AxisEngine ae = new AxisEngine(configCtx);
-//
-//            // see if addressing already engage
-////            boolean addressingModuleEngage = false;
-////            for (Iterator iterator = ac.getEngagedModules().iterator();
-////                 iterator.hasNext();) {
-////                QName qname = (QName) iterator.next();
-////                if (qname.getLocalPart()
-////                        .equals(org.apache.axis2.Constants.MODULE_ADDRESSING)) {
-////                    addressingModuleEngage = true;
-////                    break;
-////                }
-////            }
-////            if (!addressingModuleEngage) {
-////                ac.engageModule(new QName(
-////                        org.apache.axis2.Constants.MODULE_ADDRESSING));
-////            }
-////            AxisOperation ao = as
-////                    .getOperation(Constants.MEDIATE_OPERATION_NAME);
-////            OperationContext oc = OperationContextFactory
-////                    .createOperationContext(ao.getAxisSpecifMEPConstant(), ao);
-//            OperationContext oc = OperationContextFactory
-//                    .createOperationContext(axisOp.getAxisSpecifMEPConstant(),
-//                            axisOp);
-//            //ao.registerOperationContext(mc, oc);
-//            axisOp.registerOperationContext(mc, oc);
-//
-//            //ServiceContext sc = Utils.fillContextInformation(ao, as, cc);
-//            ServiceContext sc =
-//                    Utils.fillContextInformation(axisOp, service, configCtx);
-//            oc.setParent(sc);
-//
-//            mc.setOperationContext(oc);
-//            mc.setServiceContext(sc);
-//
-////            mc.setAxisOperation(ao);
-////            mc.setAxisService(as);
-//            mc.setAxisOperation(axisOp);
-//            mc.setAxisService(service);
-//
-//            ae.receive(mc);
-//            //////////////////////////////////////////////////////////////////////
-//            // Now the MessageContext is filled with SOAP properties. We don't need to
send
-//            // this message anymore time through AddressingInHandler. But we need to send
it through
-//            // AddressingOutHandler
-//            // Thus, setting the Default ConfigurationContext
-//            mc.setConfigurationContext(cc);
-//            /////////////////////////////////////////////////////////////////////
-//
-//        } catch (AxisFault e) {
-//            throw new SynapseException(e);
-//        }
-//        return true;
-//    }
 
     public boolean process(SynapseEnvironment se, SynapseMessage smc) {
         log.debug("Processing __AddressingInHandler__");

Modified: incubator/synapse/trunk/java/src/samples/userguide/DumbStockQuoteClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/samples/userguide/DumbStockQuoteClient.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/samples/userguide/DumbStockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/src/samples/userguide/DumbStockQuoteClient.java Thu Jan 12
15:14:26 2006
@@ -10,8 +10,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
+
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
@@ -85,8 +84,8 @@
 			AxisServiceGroup asg = new AxisServiceGroup(ac);
 			AxisService as = new AxisService("AnonymousService");
 			asg.addService(as);
-			ServiceGroupContext sgc = new ServiceGroupContext(cc, asg);
-			ServiceContext sc = sgc.getServiceContext(as);
+			
+			
 			AxisOperation axisOperationTemplate = new OutInAxisOperation(
 					new QName("getQuote"));
 			as.addOperation(axisOperationTemplate);

Modified: incubator/synapse/trunk/java/src/samples/userguide/ProxyStockQuoteClient.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/src/samples/userguide/ProxyStockQuoteClient.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/src/samples/userguide/ProxyStockQuoteClient.java (original)
+++ incubator/synapse/trunk/java/src/samples/userguide/ProxyStockQuoteClient.java Thu Jan
12 15:14:26 2006
@@ -10,8 +10,7 @@
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
 import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.context.ServiceContext;
-import org.apache.axis2.context.ServiceGroupContext;
+
 import org.apache.axis2.description.AxisOperation;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.AxisServiceGroup;
@@ -110,8 +109,7 @@
 			AxisServiceGroup asg = new AxisServiceGroup(ac);
 			AxisService as = new AxisService("AnonymousService");
 			asg.addService(as);
-			ServiceGroupContext sgc = new ServiceGroupContext(cc, asg);
-			ServiceContext sc = sgc.getServiceContext(as);
+			
 			AxisOperation axisOperationTemplate = new OutInAxisOperation(
 					new QName("getQuote"));
 			as.addOperation(axisOperationTemplate);

Modified: incubator/synapse/trunk/java/test/org/apache/axis2/MultipleAddressingMoudleEngagementTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/axis2/MultipleAddressingMoudleEngagementTest.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/axis2/MultipleAddressingMoudleEngagementTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/axis2/MultipleAddressingMoudleEngagementTest.java
Thu Jan 12 15:14:26 2006
@@ -5,9 +5,7 @@
 import org.apache.axis2.om.OMElement;
 import org.apache.synapse.SynapseEnvironment;
 import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.mediatortypes.ClassMediatorProcessor;
-import org.apache.synapse.xml.ClassMediatorProcessorConfigurator;
+
 import org.apache.synapse.axis2.Axis2SynapseEnvironment;
 import org.apache.synapse.axis2.Axis2SynapseMessage;
 import org.apache.synapse.util.Axis2EvnSetup;

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/environment/EnvironmentAwareTest.java
Thu Jan 12 15:14:26 2006
@@ -3,12 +3,12 @@
 import org.apache.axis2.transport.http.SimpleHTTPServer;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.client.Options;
-import org.apache.axis2.client.MessageSender;
+
 import org.apache.axis2.client.ServiceClient;
 import org.apache.synapse.util.Axis2EvnSetup;
 import junit.framework.TestCase;
 
-import javax.xml.namespace.QName;
+
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/mediators/MediatorFalseReturnTest.java
Thu Jan 12 15:14:26 2006
@@ -1,16 +1,3 @@
-package org.apache.synapse.mediators;
-
-import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.om.OMElement;
-import org.apache.synapse.SynapseEnvironment;
-import org.apache.synapse.SynapseMessage;
-import org.apache.synapse.Processor;
-import org.apache.synapse.processors.mediatortypes.ClassMediatorProcessor;
-import org.apache.synapse.xml.ClassMediatorProcessorConfigurator;
-import org.apache.synapse.axis2.Axis2SynapseEnvironment;
-import org.apache.synapse.axis2.Axis2SynapseMessage;
-import org.apache.synapse.util.Axis2EvnSetup;
-import junit.framework.TestCase;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *
@@ -27,6 +14,19 @@
 * limitations under the License.
 *
 */
+
+package org.apache.synapse.mediators;
+
+
+import org.apache.axis2.context.MessageContext;
+import org.apache.axis2.om.OMElement;
+import org.apache.synapse.SynapseEnvironment;
+import org.apache.synapse.SynapseMessage;
+import org.apache.synapse.axis2.Axis2SynapseEnvironment;
+import org.apache.synapse.axis2.Axis2SynapseMessage;
+import org.apache.synapse.util.Axis2EvnSetup;
+import junit.framework.TestCase;
+
 
 public class MediatorFalseReturnTest extends TestCase {
     private MessageContext msgCtx;

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/injection/SendOnProcessorWithRuleTest.java
Thu Jan 12 15:14:26 2006
@@ -70,7 +70,7 @@
             OMElement response =
                     serviceClient.sendReceive(Axis2EvnSetup.payload());
             assertEquals("Synapse Testing String_Response", response.getText());
-            serviceClient.finalizeInvoke();
+            //serviceClient.finalizeInvoke();
         }
     }
 

Modified: incubator/synapse/trunk/java/test/org/apache/synapse/spi/processors/FaultProcessorTest.java
URL: http://svn.apache.org/viewcvs/incubator/synapse/trunk/java/test/org/apache/synapse/spi/processors/FaultProcessorTest.java?rev=368512&r1=368511&r2=368512&view=diff
==============================================================================
--- incubator/synapse/trunk/java/test/org/apache/synapse/spi/processors/FaultProcessorTest.java
(original)
+++ incubator/synapse/trunk/java/test/org/apache/synapse/spi/processors/FaultProcessorTest.java
Thu Jan 12 15:14:26 2006
@@ -1,15 +1,3 @@
-package org.apache.synapse.spi.processors;
-
-import junit.framework.TestCase;
-import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.client.Call;
-import org.apache.axis2.client.Options;
-import org.apache.axis2.om.OMElement;
-import org.apache.axis2.AxisFault;
-import org.apache.synapse.util.Axis2EvnSetup;
-
-import javax.xml.namespace.QName;
 /*
 * Copyright 2004,2005 The Apache Software Foundation.
 *
@@ -26,6 +14,20 @@
 * limitations under the License.
 *
 */
+
+package org.apache.synapse.spi.processors;
+
+import junit.framework.TestCase;
+import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.client.Call;
+import org.apache.axis2.client.Options;
+
+import org.apache.axis2.AxisFault;
+import org.apache.synapse.util.Axis2EvnSetup;
+
+import javax.xml.namespace.QName;
+
 
 public class FaultProcessorTest extends TestCase {
 



---------------------------------------------------------------------
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