axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chinth...@apache.org
Subject svn commit: r355644 - in /webservices/axis2/trunk/java/modules: core/src/org/apache/axis2/transport/http/ core/src/org/apache/axis2/util/ integration/test/org/apache/axis2/engine/ integration/test/org/apache/axis2/integration/ integration/test/org/apac...
Date Fri, 09 Dec 2005 23:27:41 GMT
Author: chinthaka
Date: Fri Dec  9 15:27:20 2005
New Revision: 355644

URL: http://svn.apache.org/viewcvs?rev=355644&view=rev
Log:
Fixing some small stuff, especially spelling mistakes, during the hackathon.

Modified:
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
    webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
    webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
(original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/transport/http/SimpleHTTPServer.java
Fri Dec  9 15:27:20 2005
@@ -192,7 +192,7 @@
      *
      * @return the system context
      */
-    public ConfigurationContext getSystemContext() {
+    public ConfigurationContext getConfigurationContext() {
         return configurationContext;
     }
 

Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/util/Utils.java Fri Dec
 9 15:27:20 2005
@@ -30,7 +30,6 @@
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.Handler;
 import org.apache.axis2.engine.MessageReceiver;
-import org.apache.axis2.phaseresolver.PhaseException;
 import org.apache.axis2.receivers.AbstractMessageReceiver;
 import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
 import org.apache.wsdl.WSDLService;
@@ -123,23 +122,6 @@
                 opName);
     }
 
-    //    public static void addHandlers(Flow flow, Phase phase) throws AxisFault {
-    //        if (flow != null) {
-    //            int handlerCount = flow.getHandlerCount();
-    //            for (int i = 0; i < handlerCount; i++) {
-    //                phase.addHandler(flow.getHandler(i).getHandler());
-    //            }
-    //        }
-    //    }
-    public static void resolvePhases(AxisConfiguration axisconfig,
-                                     AxisService axisService)
-            throws AxisFault, PhaseException {
-        //todo we do not need this
-//        PhaseResolver pr = new PhaseResolver(axisconfig, axisService);
-//        pr.buildchains();
-        // fixing the BUG AXIS2-278
-        // we do not need to  do this , since when adding a service this automatically done
-    }
 
     public static String getParameterValue(Parameter param) {
         if (param == null) {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/EchoRawXMLTest.java
Fri Dec  9 15:27:20 2005
@@ -80,8 +80,8 @@
     public void testEchoXMLASync() throws Exception {
         OMElement payload = TestingUtils.createDummyOMElement();
 
-        org.apache.axis2.client.Call call =
-                new org.apache.axis2.client.Call("target/test-resources/integrationRepo");
+        Call call =
+                new Call("target/test-resources/integrationRepo");
 
         Options options = new Options();
         call.setClientOptions(options);
@@ -124,8 +124,8 @@
 
         OMElement payload = TestingUtils.createDummyOMElement();
 
-        org.apache.axis2.client.Call call =
-                new org.apache.axis2.client.Call("target/test-resources/integrationRepo");
+        Call call =
+                new Call("target/test-resources/integrationRepo");
 
         Options options = new Options();
         call.setClientOptions(options);

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/engine/MessageContextInjectionTest.java
Fri Dec  9 15:27:20 2005
@@ -40,7 +40,6 @@
 import org.apache.axis2.soap.SOAPFactory;
 import org.apache.axis2.transport.local.LocalTransportReceiver;
 import org.apache.axis2.transport.local.LocalTransportSender;
-import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -91,9 +90,6 @@
         service.setClassLoader(Thread.currentThread().getContextClassLoader());
         LocalTransportReceiver.CONFIG_CONTEXT.getAxisConfiguration()
                 .addService(service);
-        Utils.resolvePhases(
-                LocalTransportReceiver.CONFIG_CONTEXT.getAxisConfiguration(),
-                service);
     }
 
     protected void tearDown() throws Exception {

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilServer.java
Fri Dec  9 15:27:20 2005
@@ -25,7 +25,6 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.ModuleDescription;
 import org.apache.axis2.transport.http.SimpleHTTPServer;
-import org.apache.axis2.util.Utils;
 import org.apache.axis2.util.threadpool.ThreadPool;
 
 import javax.xml.namespace.QName;
@@ -40,20 +39,17 @@
     private static ThreadPool tp = null;
                                             
     public static synchronized void deployService(AxisService service) throws AxisFault {
-        receiver.getSystemContext().getAxisConfiguration().addService(service);
-        Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
-                service);
-//        ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(receiver.getConfigurationContext());
+        receiver.getConfigurationContext().getAxisConfiguration().addService(service);
     }
 
     public static synchronized void unDeployService(QName service) throws AxisFault {
-        receiver.getSystemContext().getAxisConfiguration().removeService(
+        receiver.getConfigurationContext().getAxisConfiguration().removeService(
                 service.getLocalPart());
     }
 
     public static synchronized void unDeployClientService() throws AxisFault {
-        if(receiver.getSystemContext().getAxisConfiguration() !=null){
-            receiver.getSystemContext().getAxisConfiguration().removeService("AnonymousService");
+        if(receiver.getConfigurationContext().getAxisConfiguration() !=null){
+            receiver.getConfigurationContext().getAxisConfiguration().removeService("AnonymousService");
         }
     }
 
@@ -61,10 +57,10 @@
         start(org.apache.axis2.Constants.TESTING_REPOSITORY);
     }
 
-    public static synchronized void start(String repositry) throws Exception {
+    public static synchronized void start(String repository) throws Exception {
         if (count == 0) {
         	tp = new ThreadPool();
-            ConfigurationContext er = getNewConfigurationContext(repositry);
+            ConfigurationContext er = getNewConfigurationContext(repository);
 
             receiver = new SimpleHTTPServer(er, Constants.TESTING_PORT);
 
@@ -87,9 +83,9 @@
         count++;
     }
 
-    public static ConfigurationContext getNewConfigurationContext(String repositry) throws
Exception {
+    public static ConfigurationContext getNewConfigurationContext(String repository) throws
Exception {
         ConfigurationContextFactory erfac = new ConfigurationContextFactory();
-        File file = new File(repositry);
+        File file = new File(repository);
         if (!file.exists()) {
             throw new Exception(
                     "repository directory " + file.getAbsolutePath() +
@@ -117,7 +113,7 @@
     }
 
     public static ConfigurationContext getConfigurationContext() {
-        return receiver.getSystemContext();
+        return receiver.getConfigurationContext();
     }
 
     public static ServiceContext createAdressedEnabledClientSide(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
Fri Dec  9 15:27:20 2005
@@ -17,14 +17,12 @@
 package org.apache.axis2.integration;
 
 import org.apache.axis2.AxisFault;
-import org.apache.axis2.transport.jms.SimpleJMSListener;
-import org.apache.axis2.transport.jms.JMSConstants;
-import org.apache.axis2.transport.jms.JNDIVendorAdapter;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.context.ServiceGroupContext;
 import org.apache.axis2.description.AxisService;
-import org.apache.axis2.util.Utils;
+import org.apache.axis2.transport.jms.JNDIVendorAdapter;
+import org.apache.axis2.transport.jms.SimpleJMSListener;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -45,8 +43,6 @@
 
         receiver.getSystemContext().getAxisConfiguration().addService(service);
 
-        Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
-                service);
         ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(receiver.getSystemContext());
 
     }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
Fri Dec  9 15:27:20 2005
@@ -22,7 +22,6 @@
 import org.apache.axis2.context.ServiceGroupContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.transport.tcp.TCPServer;
-import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -41,9 +40,6 @@
             throws AxisFault {
 
         receiver.getSystemContext().getAxisConfiguration().addService(service);
-
-        Utils.resolvePhases(receiver.getSystemContext().getAxisConfiguration(),
-                service);
         ServiceGroupContext serviceGroupContext = service.getParent().getServiceGroupContext(receiver.getSystemContext());
 
     }

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailCharSetEncodingTest.java
Fri Dec  9 15:27:20 2005
@@ -88,7 +88,6 @@
         AxisService service = Utils.createSimpleService(serviceName,
                 Echo.class.getName(), operationName);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
 
         SimpleMailListener ml = new SimpleMailListener();
 
@@ -121,7 +120,6 @@
             engineRegistry.removeService(serviceName.getLocalPart());
             clientService.addOperation(clientOperation);
             engineRegistry.addService(clientService);
-            Utils.resolvePhases(engineRegistry, clientService);
             clientServiceContext = Utils.fillContextInformation(clientOperation,  clientService,
clientConfigContext);
 
             org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailOneWayRawXMLTest.java
Fri Dec  9 15:27:20 2005
@@ -87,7 +87,6 @@
         });
         service.addOperation(axisOperation);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
         ServiceContext serviceContext = Utils.fillContextInformation(axisOperation,  service,
configContext);
     }
 
@@ -118,7 +117,6 @@
         });
         service.addOperation(axisOperation);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
         ServiceContext serviceContext = Utils.fillContextInformation(axisOperation,  service,
configContext);
 
         SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailRequestResponseRawXMLTest.java
Fri Dec  9 15:27:20 2005
@@ -91,7 +91,6 @@
                         Echo.class.getName(),
                         operationName);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
         ServiceContext serviceContext = service.getParent().getServiceGroupContext(configContext).getServiceContext(service.getName().getLocalPart());
     }
 
@@ -124,7 +123,6 @@
         });
         service.addOperation(axisOperation);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
         ServiceContext serviceContext = service.getParent().getServiceGroupContext(configContext).getServiceContext(service.getName().getLocalPart());
 
         org.apache.axis2.client.Call call = new org.apache.axis2.client.Call(

Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java?rev=355644&r1=355643&r2=355644&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
(original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/mail/MailetRequestResponceRawXMLTest.java
Fri Dec  9 15:27:20 2005
@@ -85,7 +85,6 @@
                         Echo.class.getName(),
                         operationName);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
     }
 
     protected void tearDown() throws Exception {
@@ -118,7 +117,6 @@
         });
         service.addOperation(axisOperation);
         configContext.getAxisConfiguration().addService(service);
-        Utils.resolvePhases(configContext.getAxisConfiguration(), service);
 
 
         ServiceContext serviceContext = Utils.fillContextInformation(axisOperation, service,
configContext);



Mime
View raw message