axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject svn commit: r551228 [4/23] - in /webservices/axis2/branches/java/jaxws21: ./ etc/ modules/adb-codegen/src/org/apache/axis2/schema/ modules/adb-codegen/src/org/apache/axis2/schema/template/ modules/adb-codegen/src/org/apache/axis2/schema/writer/ modules...
Date Wed, 27 Jun 2007 16:46:04 GMT
Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/chunking-enabled-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,12 +2,12 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
 
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
 
     <!-- ================================================= -->
@@ -20,20 +20,20 @@
     <!-- Transport Ins -->
     <!-- ================================================= -->
     <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
     </transportReceiver>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
-          <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
-          <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
-          <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.host">127.0.0.1</parameter>
+          <parameter name="transport.mail.pop3.user">axis2</parameter>
+          <parameter name="transport.mail.pop3.password">axis2</parameter>
+          <parameter name="transport.mail.pop3.port">110</parameter>
+          <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
       </transportReceiver> -->
 
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -41,8 +41,8 @@
     <!-- ================================================= -->
 
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
 
     <transportSender name="tcp" class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
@@ -50,10 +50,10 @@
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user">axis2</parameter>
+       <parameter name="transport.mail.smtp.password">axis2</parameter>
+       <parameter name="transport.mail.smtp.port">25</parameter>
    </transportSender>
    -->
 
@@ -72,26 +72,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -112,26 +112,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/commons-http-enabled-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,12 +2,12 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
 
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
 
     <!-- ================================================= -->
@@ -20,12 +20,12 @@
     <!-- Transport Ins -->
     <!-- ================================================= -->
     <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
     </transportReceiver>
 
 
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -36,7 +36,7 @@
     <transportSender name="local" class="org.apache.axis2.transport.local.LocalTransportSender"/>
 
     <transportSender name="http" class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
     </transportSender>
 
     <!-- ================================================= -->
@@ -54,26 +54,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -94,26 +94,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/engine/util/profiling/ContextMemoryHandlingUtil.java Wed Jun 27 09:45:37 2007
@@ -43,7 +43,7 @@
         options.setTransportInProtocol(Constants.TRANSPORT_HTTP);
         ConfigurationContext configContext =
                 ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                        "target/test-resources/integrationRepo", null);
+                        TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
         ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
         options.setTo(targetEPR);

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/groovy/GroovyServiceTest.java Wed Jun 27 09:45:37 2007
@@ -32,6 +32,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLStreamException;
@@ -59,7 +60,7 @@
     }
 
     public static Test suite() {
-        return getTestSetup2(new TestSuite(GroovyServiceTest.class), "target/groovyRepo");
+        return getTestSetup2(new TestSuite(GroovyServiceTest.class), TestingUtils.prefixBaseDirectory("target/groovyRepo"));
     }
 
     public void testServiceExists() throws Exception {
@@ -84,7 +85,7 @@
 
         ConfigurationContext configContext =
                 ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                        "target/test-resources/integrationRepo", null);
+                        TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
         ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
         OMElement result = sender.sendReceive(payload);

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/LocalTestCase.java Wed Jun 27 09:45:37 2007
@@ -28,7 +28,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.engine.AddressingBasedDispatcher;
+import org.apache.axis2.dispatchers.AddressingBasedDispatcher;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.engine.DispatchPhase;
 import org.apache.axis2.engine.Phase;

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/TestingUtils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/TestingUtils.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/TestingUtils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/TestingUtils.java Wed Jun 27 09:45:37 2007
@@ -22,6 +22,9 @@
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 
+import java.io.File;
+import java.io.IOException;
+
 public class TestingUtils {
     public static OMElement createDummyOMElement() {
         OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -53,4 +56,13 @@
         TestCase.assertEquals(textValue, "Isaac Asimov, The Foundation Trilogy");
     }
 
+    public static String prefixBaseDirectory(String path) {
+        String baseDir;
+        try {
+            baseDir = new File(System.getProperty("basedir", ".")).getCanonicalPath();
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        return baseDir + "/" + path;
+    }
 }

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilServer.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilServer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilServer.java Wed Jun 27 09:45:37 2007
@@ -65,7 +65,7 @@
     }
 
     public static synchronized void start() throws Exception {
-        start(org.apache.axis2.Constants.TESTING_REPOSITORY);
+        start(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY));
     }
 
 
@@ -141,7 +141,7 @@
 
     public static ConfigurationContext getNewConfigurationContext(
             String repository, String axis2xml) throws Exception {
-        File file = new File(repository);
+        File file = new File(TestingUtils.prefixBaseDirectory(repository));
         if (!file.exists()) {
             throw new Exception("repository directory "
                     + file.getAbsolutePath() + " does not exists");
@@ -180,7 +180,7 @@
         TestCase.assertTrue(file.exists());
         ConfigurationContext configContext = ConfigurationContextFactory
                 .createConfigurationContextFromFileSystem(
-                        "target/test-resources/integrationRepo", null);
+                        TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
         AxisModule axisModule = DeploymentEngine.buildModule(file,
                                                              configContext.getAxisConfiguration());
         configContext.getAxisConfiguration().addModule(axisModule);
@@ -200,7 +200,7 @@
     }
 
     private static File getAddressingMARFile() {
-        File dir = new File(org.apache.axis2.Constants.TESTING_REPOSITORY + "/modules");
+        File dir = new File(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY + "/modules"));
         File[] files = dir.listFiles(new AddressingFilter());
         TestCase.assertTrue(files.length == 1);
         File file = files[0];
@@ -214,8 +214,8 @@
 
         ConfigurationContext configContext =
                 ConfigurationContextFactory .createConfigurationContextFromFileSystem(
-                        "target/test-resources/integrationRepo",
-                        "target/test-resources/integrationRepo/conf/axis2.xml");
+                        TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH +"/integrationRepo"),
+                        TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "/integrationRepo/conf/axis2.xml"));
         AxisModule axisModule = DeploymentEngine.buildModule(file,
                                                              configContext.getAxisConfiguration());
         configContext.getAxisConfiguration().addModule(axisModule);

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsJMSServer.java Wed Jun 27 09:45:37 2007
@@ -57,7 +57,7 @@
 
     public static synchronized void start() throws Exception {
         // start JMS Listener
-        File file = new File(REPOSITORY_JMS);
+        File file = new File(TestingUtils.prefixBaseDirectory(REPOSITORY_JMS));
         System.out.println(file.getAbsoluteFile());
         if (!file.exists()) {
             throw new Exception("Repository directory does not exist");

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/integration/UtilsTCPServer.java Wed Jun 27 09:45:37 2007
@@ -17,6 +17,7 @@
 package org.apache.axis2.integration;
 
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.Constants;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.description.AxisService;
@@ -58,7 +59,7 @@
 
             // start tcp server
 
-            File file = new File(org.apache.axis2.Constants.TESTING_REPOSITORY);
+            File file = new File(TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY));
             System.out.println(file.getAbsoluteFile());
             if (!file.exists()) {
                 throw new Exception("Repository directory does not exist");

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/JMSEchoRawXMLTest.java Wed Jun 27 09:45:37 2007
@@ -44,6 +44,7 @@
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilsJMSServer;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.transport.jms.JMSConstants;
 import org.apache.axis2.util.Utils;
 import org.apache.axis2.wsdl.WSDLConstants;
@@ -182,7 +183,7 @@
 
     public void testEchoXMLCompleteSync() throws Exception {
         ConfigurationContext configContext = UtilServer.createClientConfigurationContext(
-                "target/test-resources/jms-enabled-client-repository");
+                TestingUtils.prefixBaseDirectory("target/test-resources/jms-enabled-client-repository"));
 
         OMElement payload = createPayload();
 
@@ -205,8 +206,8 @@
     public void testEchoXMLSyncMC() throws Exception {
         ConfigurationContext configContext =
                 ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                        Constants.TESTING_REPOSITORY,
-                        Constants.TESTING_REPOSITORY + "/conf/axis2.xml");
+                        TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY),
+                        TestingUtils.prefixBaseDirectory(Constants.TESTING_REPOSITORY + "/conf/axis2.xml"));
 
         AxisOperation opdesc = new OutInAxisOperation(new QName("echoOMElement"));
         Options options = new Options();

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-client-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,17 +2,17 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
     <!--    The way of adding listener to the system-->
     <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
     <!-- ================================================= -->
@@ -33,34 +33,34 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <!--Uncomment if you want to have SMTP transport support-->
     <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
+    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
     <!--</transportReceiver>-->
 
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="default" locked="false">        	        	
-        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>        	
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+        <parameter name="default">
+        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
         </parameter>
     </transportReceiver>
 
@@ -77,21 +77,21 @@
                      class="org.apache.axis2.transport.jms.JMSSender"/>
     <transportSender name="http"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <transportSender name="https"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user">axis2</parameter>
+       <parameter name="transport.mail.smtp.password">axis2</parameter>
+       <parameter name="transport.mail.smtp.port">25</parameter>
    </transportSender>
    -->
 
@@ -103,7 +103,7 @@
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
     <!--</moduleConfig>-->
 
     <!--
@@ -126,11 +126,11 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -138,16 +138,16 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -168,26 +168,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/jms/jms-enabled-server-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,17 +2,17 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
     <!--    The way of adding listener to the system-->
     <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
     <!-- ================================================= -->
@@ -33,34 +33,34 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <!--Uncomment if you want to have SMTP transport support-->
     <!--<transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">-->
-    <!--<parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>-->
-    <!--<parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>-->
-    <!--<parameter name="transport.mail.pop3.port" locked="false">110</parameter>-->
-    <!--<parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.host">127.0.0.1</parameter>-->
+    <!--<parameter name="transport.mail.pop3.user">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.password">axis2</parameter>-->
+    <!--<parameter name="transport.mail.pop3.port">110</parameter>-->
+    <!--<parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>-->
     <!--</transportReceiver>-->
 
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="default" locked="false">        	        	
-        	<parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        	<parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>        	
-        	<parameter name="transport.jms.ConnectionFactoryJNDIName" locked="false">QueueConnectionFactory</parameter>
+        <parameter name="default">
+        	<parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
+        	<parameter name="java.naming.provider.url">tcp://localhost:61616</parameter>
+        	<parameter name="transport.jms.ConnectionFactoryJNDIName">QueueConnectionFactory</parameter>
         </parameter>
     </transportReceiver>
 
@@ -76,21 +76,21 @@
                      class="org.apache.axis2.transport.jms.JMSSender"/>
     <transportSender name="http"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <transportSender name="https"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
 
     <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
    <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
+       <parameter name="transport.mail.smtp.host">127.0.0.1</parameter>
+       <parameter name="transport.mail.smtp.user">axis2</parameter>
+       <parameter name="transport.mail.smtp.password">axis2</parameter>
+       <parameter name="transport.mail.smtp.port">25</parameter>
    </transportSender>
    -->
 
@@ -102,7 +102,7 @@
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
     <!--</moduleConfig>-->
 
     <!--
@@ -122,11 +122,11 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Transport"/>
             </handler>
         </phase>
@@ -134,16 +134,16 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -164,26 +164,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/UtilsMailServer.java Wed Jun 27 09:45:37 2007
@@ -18,6 +18,7 @@
 
 import junit.framework.TestCase;
 import org.apache.axis2.AxisFault;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.transport.mail.Constants;
@@ -53,7 +54,7 @@
 
     public static ConfigurationContext createServerConfigurationContext() throws Exception {
         if (SERVER_CONFIG_CONTEXT == null) {
-            File file = new File(MAIL_TRANSPORT_SERVER_ENABLED_REPO_PATH);
+            File file = new File(TestingUtils.prefixBaseDirectory(MAIL_TRANSPORT_SERVER_ENABLED_REPO_PATH));
             TestCase.assertTrue(
                     "Mail repository directory " + file.getAbsolutePath() + " does not exsist",
                     file.exists());
@@ -67,7 +68,7 @@
 
     public static ConfigurationContext createClientConfigurationContext() throws Exception {
         if (CLIENT_CONFIG_CONTEXT == null) {
-            File file = new File(MAIL_TRANSPORT_CLIENT_ENABLED_REPO_PATH);
+            File file = new File(TestingUtils.prefixBaseDirectory(MAIL_TRANSPORT_CLIENT_ENABLED_REPO_PATH));
             TestCase.assertTrue(
                     "Mail repository directory " + file.getAbsolutePath() + " does not exsist",
                     file.exists());

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,12 +2,12 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
 
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
 
 
@@ -21,19 +21,19 @@
     <!-- Transport Ins -->
     <!-- ================================================= -->
     <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
     </transportReceiver>
 
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-        <parameter name="mail.pop3.host" locked="false">127.0.0.1</parameter>
-        <parameter name="mail.pop3.user" locked="false">axis2@127.0.0.1</parameter>
-        <parameter name="mail.pop3.port" locked="false">1134</parameter>
-        <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
-        <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
+        <parameter name="mail.pop3.host">127.0.0.1</parameter>
+        <parameter name="mail.pop3.user">axis2@127.0.0.1</parameter>
+        <parameter name="mail.pop3.port">1134</parameter>
+        <parameter name="transport.mail.pop3.password">axis2</parameter>
+        <parameter name="transport.mail.replyToAddress">axis2@127.0.0.1</parameter>
     </transportReceiver>
 
     <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -46,10 +46,10 @@
 
 
     <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-        <parameter name="mail.smtp.host" locked="false">127.0.0.1</parameter>
-        <parameter name="mail.smtp.user" locked="false">axis2</parameter>
-        <parameter name="mail.smtp.port" locked="false">1049</parameter>
-        <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
+        <parameter name="mail.smtp.host">127.0.0.1</parameter>
+        <parameter name="mail.smtp.user">axis2</parameter>
+        <parameter name="mail.smtp.port">1049</parameter>
+        <parameter name="transport.mail.smtp.password">axis2</parameter>
     </transportSender>
 
     <!-- ================================================= -->
@@ -67,26 +67,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-client-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,22 +2,22 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
     <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
     <!-- use this parameter to override autodetected url -->
-    <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
 
 
     <!--    The way of adding listener to the system-->
     <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
     <!-- ================================================= -->
@@ -38,26 +38,26 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-        <parameter name="mail.pop3.host" locked="false">127.0.0.1</parameter>
-        <parameter name="mail.pop3.user" locked="false">bar@127.0.0.1</parameter>
-        <parameter name="mail.pop3.port" locked="false">1134</parameter>
-        <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
-        <parameter name="transport.mail.replyToAddress" locked="false">bar@127.0.0.1</parameter>
+        <parameter name="mail.pop3.host">127.0.0.1</parameter>
+        <parameter name="mail.pop3.user">bar@127.0.0.1</parameter>
+        <parameter name="mail.pop3.port">1134</parameter>
+        <parameter name="transport.mail.pop3.password">axis2</parameter>
+        <parameter name="transport.mail.replyToAddress">bar@127.0.0.1</parameter>
     </transportReceiver>
 
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -70,20 +70,20 @@
                      class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <transportSender name="https"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
 
     <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-        <parameter name="mail.smtp.host" locked="false">127.0.0.1</parameter>
-        <parameter name="mail.smtp.user" locked="false">bar</parameter>
-        <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-        <parameter name="transport.mail.smtp.port" locked="false">1049</parameter>
+        <parameter name="mail.smtp.host">127.0.0.1</parameter>
+        <parameter name="mail.smtp.user">bar</parameter>
+        <parameter name="transport.mail.smtp.password">axis2</parameter>
+        <parameter name="transport.mail.smtp.port">1049</parameter>
     </transportSender>
 
     <!-- ================================================= -->
@@ -94,7 +94,7 @@
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
     <!--</moduleConfig>-->
 
     <!-- ================================================= -->
@@ -104,11 +104,11 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -116,16 +116,16 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -145,26 +145,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mail/mail-enabled-server-axis2.xml Wed Jun 27 09:45:37 2007
@@ -2,22 +2,22 @@
     <!-- ================================================= -->
     <!-- Parameters -->
     <!-- ================================================= -->
-    <parameter name="hotdeployment" locked="false">true</parameter>
-    <parameter name="hotupdate" locked="false">false</parameter>
-    <parameter name="enableMTOM" locked="false">false</parameter>
-    <parameter name="sendStacktraceDetailsWithFaults" locked="false">true</parameter>
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
 
-    <parameter name="userName" locked="false">admin</parameter>
-    <parameter name="password" locked="false">axis2</parameter>
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
 
     <!-- If you have a frontend host which exposes this webservice using a different public URL  -->
     <!-- use this parameter to override autodetected url -->
-    <!--<parameter name="httpFrontendHostUrl" locked="false">https://someotherhost/context</parameter>-->
+    <!--<parameter name="httpFrontendHostUrl">https://someotherhost/context</parameter>-->
 
 
     <!--    The way of adding listener to the system-->
     <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
+    <!--        <parameter name="RSS_URL">http://127.0.0.1/rss</parameter>-->
     <!--    </listener>-->
 
     <!-- ================================================= -->
@@ -38,26 +38,26 @@
     <!-- ================================================= -->
     <transportReceiver name="http"
                        class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-        <parameter name="mail.pop3.host" locked="false">127.0.0.1</parameter>
-        <parameter name="mail.pop3.user" locked="false">foo@127.0.0.1</parameter>
-        <parameter name="mail.pop3.port" locked="false">1134</parameter>
-        <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
-        <parameter name="transport.mail.replyToAddress" locked="false">foo@127.0.0.1</parameter>
+        <parameter name="mail.pop3.host">127.0.0.1</parameter>
+        <parameter name="mail.pop3.user">foo@127.0.0.1</parameter>
+        <parameter name="mail.pop3.port">1134</parameter>
+        <parameter name="transport.mail.pop3.password">axis2</parameter>
+        <parameter name="transport.mail.replyToAddress">foo@127.0.0.1</parameter>
     </transportReceiver>
 
     <transportReceiver name="tcp"
                        class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+        <parameter name="port">6060</parameter>
         <!--If you want to give your own host address for EPR generation-->
         <!--uncommet following paramter , and set as you required.-->
-        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
+        <!--<parameter name="hostname">tcp://myApp.com/ws</parameter>-->
     </transportReceiver>
 
     <!-- ================================================= -->
@@ -70,20 +70,20 @@
                      class="org.apache.axis2.transport.local.LocalTransportSender"/>
     <transportSender name="http"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
     <transportSender name="https"
                      class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
-        <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+        <parameter name="PROTOCOL">HTTP/1.1</parameter>
+        <parameter name="Transfer-Encoding">chunked</parameter>
     </transportSender>
 
     <transportSender name="mail" class="org.apache.axis2.transport.mail.MailTransportSender">
-        <parameter name="mail.smtp.host" locked="false">127.0.0.1</parameter>
-        <parameter name="mail.smtp.user" locked="false">foo</parameter>
-        <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-        <parameter name="transport.mail.smtp.port" locked="false">1049</parameter>
+        <parameter name="mail.smtp.host">127.0.0.1</parameter>
+        <parameter name="mail.smtp.user">foo</parameter>
+        <parameter name="transport.mail.smtp.password">axis2</parameter>
+        <parameter name="transport.mail.smtp.port">1049</parameter>
     </transportSender>
 
     <!-- ================================================= -->
@@ -94,7 +94,7 @@
 
     <!--Configuring module , providing parameters for modules whether they refer or not-->
     <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
+    <!--<parameter name="addressingPara">N/A</parameter>-->
     <!--</moduleConfig>-->
 
     <!-- ================================================= -->
@@ -104,11 +104,11 @@
         <!--  System pre defined phases       -->
          <phase name="Transport">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -116,16 +116,16 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>
@@ -145,26 +145,26 @@
         <phase name="PreDispatch"/>
         <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
             <handler name="RequestURIBasedDispatcher"
-                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPActionBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="AddressingBasedDispatcher"
-                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
             <handler name="RequestURIOperationDispatcher"
-                     class="org.apache.axis2.engine.RequestURIOperationDispatcher">
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher">
                 <order phase="Dispatch"/>
             </handler>
 
             <handler name="SOAPMessageBodyBasedDispatcher"
-                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
         </phase>

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMCommonsChunkingTest.java Wed Jun 27 09:45:37 2007
@@ -36,17 +36,17 @@
 import org.apache.axis2.engine.util.TestConstants;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.util.Utils;
 
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
-import java.net.URL;
 
 public class EchoRawMTOMCommonsChunkingTest extends UtilServerBasedTestCase
         implements TestConstants {
 
     private OMElement data;
-    private String fileName = "test-resources/mtom/test.jpg";
+    private String fileName = TestingUtils.prefixBaseDirectory("test-resources/mtom/test.jpg");
 
     public EchoRawMTOMCommonsChunkingTest() {
         super(EchoRawMTOMCommonsChunkingTest.class.getName());
@@ -58,7 +58,7 @@
 
     public static Test suite() {
         return getTestSetup2(new TestSuite(EchoRawMTOMCommonsChunkingTest.class),
-                             Constants.TESTING_PATH + "MTOM-enabledRepository");
+                             TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
     }
 
     protected void setUp() throws Exception {
@@ -102,26 +102,22 @@
 
         ConfigurationContext configContext =
                 ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                        Constants.TESTING_PATH + "commons-http-enabledRepository", null);
+                        TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "commons-http-enabledRepository"), null);
         ServiceClient sender = new ServiceClient(configContext, null);
         sender.setOptions(options);
         options.setTo(targetEPR);
 
-        sender.sendReceive(payload);
-        this.campareWithCreatedOMElement(data);
+        OMElement ret = sender.sendReceive(payload);
+        ret.build();
+        this.compareWithCreatedOMElement(ret);
 
     }
 
-    private URL getResourceAsStream(String path) {
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        return cl.getResource(path);
-    }
-
-    private void campareWithCreatedOMElement(OMElement element) {
+    private void compareWithCreatedOMElement(OMElement element) {
         OMElement firstChild = element.getFirstElement();
         TestCase.assertNotNull(firstChild);
         String originalTextValue = data.getFirstElement().getText();
-        String returnedTextValue = firstChild.getText();
+        String returnedTextValue = firstChild.getFirstElement().getText();
         TestCase.assertEquals(returnedTextValue, originalTextValue);
     }
 

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFaultReportTest.java Wed Jun 27 09:45:37 2007
@@ -25,6 +25,7 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.receivers.RawXMLINOutMessageReceiver;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.httpclient.HttpClient;
@@ -56,7 +57,7 @@
 
     public static Test suite() {
         return getTestSetup2(new TestSuite(EchoRawMTOMFaultReportTest.class),
-                             Constants.TESTING_PATH + "MTOM-enabledRepository");
+                             TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
     }
 
 
@@ -104,7 +105,7 @@
         httppost.getParams().setParameter(HttpMethodParams.RETRY_HANDLER,
                                           myretryhandler);
         httppost.setRequestEntity(new InputStreamRequestEntity(
-                new FileInputStream("test-resources/mtom/wmtom.bin")));
+                new FileInputStream(TestingUtils.prefixBaseDirectory("test-resources/mtom/wmtom.bin"))));
 
         httppost.setRequestHeader("Content-Type",
                                   "multipart/related; boundary=--MIMEBoundary258DE2D105298B756D; type=\"application/xop+xml\"; start=\"<0.15B50EF49317518B01@apache.org>\"; start-info=\"application/soap+xml\"");

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheLoadTest.java Wed Jun 27 09:45:37 2007
@@ -22,6 +22,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.util.Utils;
 
 import javax.xml.namespace.QName;
@@ -44,7 +45,7 @@
 
     public static Test suite() {
         return getTestSetup2(new TestSuite(EchoRawMTOMFileCacheLoadTest.class),
-                             Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
+                             TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository"));
     }
 
     protected void setUp() throws Exception {

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMFileCacheTest.java Wed Jun 27 09:45:37 2007
@@ -22,6 +22,7 @@
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.engine.Echo;
 import org.apache.axis2.integration.UtilServer;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.util.Utils;
 
 public class EchoRawMTOMFileCacheTest extends EchoRawMTOMTest {
@@ -39,7 +40,7 @@
 
     public static Test suite() {
         return getTestSetup2(new TestSuite(EchoRawMTOMFileCacheTest.class),
-                             Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository");
+                             TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-fileCache-enabledRepository"));
     }
 
     protected void setUp() throws Exception {

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMLoadTest.java Wed Jun 27 09:45:37 2007
@@ -36,6 +36,7 @@
 import org.apache.axis2.engine.util.TestConstants;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.util.Utils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -65,7 +66,7 @@
 
     public static Test suite() {
         return getTestSetup2(new TestSuite(EchoRawMTOMLoadTest.class),
-                             Constants.TESTING_PATH + "MTOM-enabledRepository");
+                             TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
     }
 
     protected void setUp() throws Exception {
@@ -113,7 +114,7 @@
             options.setSoapVersionURI(SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
             ConfigurationContext configContext =
                     ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                            "target/test-resources/integrationRepo", null);
+                            TestingUtils.prefixBaseDirectory("target/test-resources/integrationRepo"), null);
             ServiceClient sender = new ServiceClient(configContext, null);
             sender.setOptions(options);
             OMElement result = sender.sendReceive(payload);

Modified: webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java?view=diff&rev=551228&r1=551227&r2=551228
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMStreamingTest.java Wed Jun 27 09:45:37 2007
@@ -37,6 +37,7 @@
 import org.apache.axis2.engine.util.TestConstants;
 import org.apache.axis2.integration.UtilServer;
 import org.apache.axis2.integration.UtilServerBasedTestCase;
+import org.apache.axis2.integration.TestingUtils;
 import org.apache.axis2.util.Utils;
 
 import javax.activation.DataHandler;
@@ -66,7 +67,7 @@
 
     public static Test suite() {
         return getTestSetup2(new TestSuite(EchoRawMTOMStreamingTest.class),
-                             Constants.TESTING_PATH + "MTOM-enabledRepository");
+                             TestingUtils.prefixBaseDirectory(Constants.TESTING_PATH + "MTOM-enabledRepository"));
     }
 
     protected void setUp() throws Exception {



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


Mime
View raw message