Update to clean up numerous dependencies, many i think left over from previous Axis releases. Also take out the JMS and rampart function for now as it doesn't appear to work anymore and there are no testcase or samples for those in 2.x

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1044598 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 1 insertions, 62 deletions

diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
index a8d35c3381..9827f62abb 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2EngineIntegration.java
@@ -59,7 +59,6 @@ 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.transport.local.LocalResponder;
 import org.apache.tuscany.sca.assembly.AbstractContract;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
 import org.apache.tuscany.sca.common.xml.XMLDocumentHelper;
@@ -141,9 +140,8 @@ public class Axis2EngineIntegration {
                         // document builder. 
                         ClassLoader wsBindingCL = getClass().getClassLoader();
                         ClassLoader axis2CL = URLBasedAxisConfigurator.class.getClassLoader();
-                        ClassLoader localtransportCL = LocalResponder.class.getClassLoader();
                         ClassLoaderContext classLoaderContext =
-                            new ClassLoaderContext(wsBindingCL, axis2CL, localtransportCL);
+                            new ClassLoaderContext(wsBindingCL, axis2CL);
 
                         classLoaderContext =
                             new ClassLoaderContext(classLoaderContext.getClassLoader(), serviceDiscovery,
diff --git a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
index e327be86be..e38b97284a 100644
--- a/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-ws-runtime-axis2/src/main/java/org/apache/tuscany/sca/binding/ws/axis2/provider/Axis2ServiceBindingProvider.java
@@ -34,8 +34,6 @@ import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.ListenerManager;
-import org.apache.axis2.transport.jms.JMSListener;
-import org.apache.axis2.transport.jms.JMSSender;
 import org.apache.tuscany.sca.assembly.AssemblyFactory;
 import org.apache.tuscany.sca.assembly.xml.Constants;
 import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
@@ -70,10 +68,6 @@ public class Axis2ServiceBindingProvider extends Axis2BaseBindingProvider implem
     private String deployedURI;
     private InterfaceContract contract;
        
-    // The Axis2 configuration that the binding creates
-    private JMSSender jmsSender;
-    private JMSListener jmsListener;    
-       
     public Axis2ServiceBindingProvider(ExtensionPointRegistry extensionPoints,
                                        RuntimeEndpoint endpoint,
                                        ServletHost servletHost ) {
@@ -203,49 +197,6 @@ public class Axis2ServiceBindingProvider extends Axis2BaseBindingProvider implem
                 } else {
                     deployedURI = servletHost.addServletMapping(endpointURI, servlet);
                 }
-            } else if (deployedURI.startsWith("jms")) {
-                logger.log(Level.INFO, "Axis2 JMS URL=" + deployedURI);
-
-                jmsListener = new JMSListener();
-                jmsSender = new JMSSender();
-                ListenerManager listenerManager = configContext.getListenerManager();
-                TransportInDescription trsIn =
-                    configContext.getAxisConfiguration().getTransportIn(org.apache.axis2.Constants.TRANSPORT_JMS);
-
-                // get JMS transport parameters from the computed URL
-//not in Axis2 1.5.1                    
-//                Map<String, String> jmsProps = JMSUtils.getProperties(endpointURL);
-
-                // collect the parameters used to configure the JMS transport
-                OMFactory fac = OMAbstractFactory.getOMFactory();
-                OMElement parms = fac.createOMElement(DEFAULT_QUEUE_CONNECTION_FACTORY, null);
-/*
-                for (String key : jmsProps.keySet()) {
-                    OMElement param = fac.createOMElement("parameter", null);
-                    param.addAttribute("name", key, null);
-                    param.addChild(fac.createOMText(param, jmsProps.get(key)));
-                    parms.addChild(param);
-                }
-*/
-                Parameter queueConnectionFactory = new Parameter(DEFAULT_QUEUE_CONNECTION_FACTORY, parms);
-                trsIn.addParameter(queueConnectionFactory);
-
-                trsIn.setReceiver(jmsListener);
-
-                configContext.getAxisConfiguration().addTransportIn(trsIn);
-                TransportOutDescription trsOut =
-                    configContext.getAxisConfiguration().getTransportOut(org.apache.axis2.Constants.TRANSPORT_JMS);
-                //configContext.getAxisConfiguration().addTransportOut( trsOut );
-                trsOut.setSender(jmsSender);
-
-                if (listenerManager == null) {
-                    listenerManager = new ListenerManager();
-                    listenerManager.init(configContext);
-                }
-                listenerManager.addListener(trsIn, true);
-                jmsSender.init(configContext, trsOut);
-                jmsListener.init(configContext, trsIn);
-                jmsListener.start();
             }
         } catch (AxisFault e) {
             throw new RuntimeException(e);
@@ -254,17 +205,7 @@ public class Axis2ServiceBindingProvider extends Axis2BaseBindingProvider implem
 
     public void stop() {
         try {
-            if (jmsListener != null) {
-                jmsListener.stop();
-                jmsListener.destroy();
-            } else {
                 servletHost.removeServletMapping(endpointURI);
-            }
-            
-            if (jmsSender != null) {
-                jmsSender.stop();
-            }
-    
             servletHost = null;
 
             // get the path to the service