You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2005/06/03 07:12:03 UTC

svn commit: r179731 - in /webservices/axis/trunk/java/modules: core/src/org/apache/axis/ core/src/org/apache/axis/engine/ samples/test/org/apache/axis/engine/ samples/test/org/apache/axis/integration/

Author: hemapani
Date: Thu Jun  2 22:12:01 2005
New Revision: 179731

URL: http://svn.apache.org/viewcvs?rev=179731&view=rev
Log:
fix the build

Modified:
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java
    webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/DependancyManager.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLLoadTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MailEchoRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/OneWayRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/TCPEchoRawXMLTest.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
    webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/Constants.java Thu Jun  2 22:12:01 2005
@@ -176,5 +176,9 @@
     public static final String VALUE_TRUE = "true";
     public static final String VALUE_FALSE = "false";
     public static final String CONTAINER_MANAGED = "ContainerManaged";
+    
+    public static final String TESTING_REPOSITORY = "target/test-resources/samples";
+     //public static final String TESTING_REPOSITORY = "modules/samples/target/test-resources/samples";
+
 
 }

Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/DependancyManager.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/DependancyManager.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/DependancyManager.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/engine/DependancyManager.java Thu Jun  2 22:12:01 2005
@@ -28,20 +28,19 @@
         throws AxisFault {
         try {
             Class classToLoad = obj.getClass();
-            Method method =
-                classToLoad.getMethod(
-                    MESSAGE_CONTEXT_INJECTION_METHOD,
-                    new Class[] { MessageContext.class });
-            if (method != null) {
-                method.invoke(obj, new Object[] { msgctx });
+            Method[] methods = classToLoad.getMethods(); 
+            
+            for(int i = 0;i< methods.length ; i++){
+                if(MESSAGE_CONTEXT_INJECTION_METHOD.equals(methods[i].getName()) && methods[i].getParameterTypes().length == 1 &&
+                methods[i].getParameterTypes()[0] == MessageContext.class){
+                    methods[i].invoke(obj, new Object[] { msgctx });
+                }
             }
         } catch (SecurityException e) {
             throw new AxisFault(e);
         } catch (IllegalArgumentException e) {
             throw new AxisFault(e);
-        } catch (NoSuchMethodException e) {
-            throw new AxisFault(e);
-        } catch (IllegalAccessException e) {
+        }catch (IllegalAccessException e) {
             throw new AxisFault(e);
         } catch (InvocationTargetException e) {
             throw new AxisFault(e);

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLLoadTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLLoadTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLLoadTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLLoadTest.java Thu Jun  2 22:12:01 2005
@@ -71,7 +71,7 @@
         UtilServer.start();
         service =
                 Utils.createSimpleService(serviceName,
-                        org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+                        Echo.class.getName(),
                         operationName);
         UtilServer.deployService(service);
         serviceContext =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsSyncTest.java Thu Jun  2 22:12:01 2005
@@ -73,10 +73,7 @@
             new QName("addressing"));
 
         ServiceDescription service =
-            Utils.createSimpleService(
-                serviceName,
-                org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
-                operationName);
+            Utils.createSimpleService(serviceName, Echo.class.getName(), operationName);
         UtilServer.deployService(service);
         serviceContext =
             UtilServer.getConfigurationContext().createServiceContext(service.getName());
@@ -99,13 +96,11 @@
         return reqEnv;
     }
 
-
-
     public void testEchoXMLCompleteSync() throws Exception {
         ServiceDescription service =
             Utils.createSimpleService(
                 serviceName,
-                org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                 operationName);
 
         ServiceContext serviceContext = UtilServer.createAdressedEnabledClientSide(service);
@@ -126,7 +121,5 @@
         result.serializeWithCache(XMLOutputFactory.newInstance().createXMLStreamWriter(System.out));
 
     }
-    
-    
 
 }

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLOnTwoChannelsTest.java Thu Jun  2 22:12:01 2005
@@ -78,7 +78,7 @@
         ServiceDescription service =
             Utils.createSimpleService(
                 serviceName,
-                org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                 operationName);
         UtilServer.deployService(service);
         serviceContext =
@@ -106,7 +106,7 @@
         ServiceDescription service =
             Utils.createSimpleService(
                 serviceName,
-                org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                 operationName);
 
         ServiceContext serviceContext = UtilServer.createAdressedEnabledClientSide(service);

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/EchoRawXMLTest.java Thu Jun  2 22:12:01 2005
@@ -74,7 +74,7 @@
         UtilServer.start();
         service =
                 Utils.createSimpleService(serviceName,
-                        org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                         operationName);
         UtilServer.deployService(service);
         serviceContext =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/HandlerFailureTest.java Thu Jun  2 22:12:01 2005
@@ -85,7 +85,7 @@
         Utils.addHandler(flow, culprit,PhaseMetadata.PHASE_POLICY_DETERMINATION);
         Utils.addHandler(flow, new SpeakingHandler(),PhaseMetadata.PHASE_POLICY_DETERMINATION);
         
-        ServiceDescription service = Utils.createSimpleService(serviceName,org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),operationName);
+        ServiceDescription service = Utils.createSimpleService(serviceName,Echo.class.getName(),operationName);
         service.setInFlow(flow);
         
         UtilServer.start();

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MailEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MailEchoRawXMLTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MailEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MailEchoRawXMLTest.java Thu Jun  2 22:12:01 2005
@@ -70,7 +70,7 @@
         UtilServer.start();
         service =
                 Utils.createSimpleService(serviceName,
-                        org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                         operationName);
         UtilServer.deployService(service);
         serviceContext =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/MessageWithServerTest.java Thu Jun  2 22:12:01 2005
@@ -58,7 +58,7 @@
 
     protected void setUp() throws Exception {
         UtilServer.start();
-        ServiceDescription service = Utils.createSimpleService(serviceName,org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),operationName);
+        ServiceDescription service = Utils.createSimpleService(serviceName,Echo.class.getName(),operationName);
         
         
         service.setInFlow(new MockFlow("service inflow", 4));

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/OneWayRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/OneWayRawXMLTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/OneWayRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/OneWayRawXMLTest.java Thu Jun  2 22:12:01 2005
@@ -74,7 +74,7 @@
         SimpleMailListener ml = new SimpleMailListener();
         ConfigurationContextFactory builder = new ConfigurationContextFactory();
         ConfigurationContext configContext =
-            builder.buildEngineContext(UtilServer.TESTING_REPOSITORY);
+            builder.buildEngineContext(org.apache.axis.Constants.TESTING_REPOSITORY);
         ml.init(
             configContext,
             configContext.getAxisConfiguration().getTransportIn(

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/RESTBasedEchoRawXMLTest.java Thu Jun  2 22:12:01 2005
@@ -87,7 +87,7 @@
         ((AxisConfigurationImpl)UtilServer.getConfigurationContext().getAxisConfiguration()).addParameter(parameter);
         service =
                 Utils.createSimpleService(serviceName,
-                        org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                         operationName);
         UtilServer.deployService(service);
         serviceContext =

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/TCPEchoRawXMLTest.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/TCPEchoRawXMLTest.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/TCPEchoRawXMLTest.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/engine/TCPEchoRawXMLTest.java Thu Jun  2 22:12:01 2005
@@ -74,14 +74,14 @@
         //create and deploy the service
         service =
                 Utils.createSimpleService(serviceName,
-                        org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+        Echo.class.getName(),
                         operationName);
         UtilsTCPServer.deployService(service);
         
         ServiceDescription service =
                    Utils.createSimpleService(
                        serviceName,
-                       org.apache.axis.engine.MessageContextEnabledEcho.class.getName(),
+                       org.apache.axis.engine.Echo.class.getName(),
                        operationName);
                serviceContext = UtilServer.createAdressedEnabledClientSide(service);
     }

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilServer.java Thu Jun  2 22:12:01 2005
@@ -23,6 +23,7 @@
 
 import junit.framework.TestCase;
 
+
 import org.apache.axis.context.ConfigurationContext;
 import org.apache.axis.context.ConfigurationContextFactory;
 import org.apache.axis.context.ServiceContext;
@@ -38,8 +39,6 @@
     private static SimpleHTTPServer reciver;
     public static final int TESTING_PORT = 5555;
     public static final String FAILURE_MESSAGE = "Intentional Faliure";
-   public static final String TESTING_REPOSITORY = "target/test-resources/samples";
-    //public static final String TESTING_REPOSITORY = "modules/samples/target/test-resources/samples";
 
     public static synchronized void deployService(ServiceDescription service) throws AxisFault {
         reciver.getSystemContext().getAxisConfiguration().addService(service);
@@ -53,7 +52,7 @@
     public static synchronized void start() throws Exception {
         if (count == 0) {
             ConfigurationContextFactory erfac = new ConfigurationContextFactory();
-            File file = new File(TESTING_REPOSITORY);
+            File file = new File(org.apache.axis.Constants.TESTING_REPOSITORY);
             if (!file.exists()) {
                 throw new Exception("repository directory does not exists");
             }
@@ -97,7 +96,7 @@
     public static ServiceContext createAdressedEnabledClientSide(ServiceDescription service)
         throws AxisFault {
         DeploymentEngine deploymentEngine = new DeploymentEngine();
-        File file = new File(UtilServer.TESTING_REPOSITORY + "/modules/addressing.mar");
+        File file = new File(org.apache.axis.Constants.TESTING_REPOSITORY + "/modules/addressing.mar");
         TestCase.assertTrue(file.exists());
         ModuleDescription moduleDesc = deploymentEngine.buildModule(file);
 

Modified: webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java?rev=179731&r1=179730&r2=179731&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java (original)
+++ webservices/axis/trunk/java/modules/samples/test/org/apache/axis/integration/UtilsTCPServer.java Thu Jun  2 22:12:01 2005
@@ -52,7 +52,7 @@
 
             ConfigurationContextFactory erfac =
                 new ConfigurationContextFactory();
-            File file = new File(UtilServer.TESTING_REPOSITORY);
+            File file = new File(org.apache.axis.Constants.TESTING_REPOSITORY);
             System.out.println(file.getAbsoluteFile());
             if (!file.exists()) {
                 throw new Exception("repository directory does not exists");