You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commons-dev@ws.apache.org by ve...@apache.org on 2008/09/27 00:15:02 UTC

svn commit: r699519 - in /webservices/commons/trunk/modules/transport/modules: http/ http/test-resources/ http/test-resources/META-INF/ http/test/ http/test/org/ http/test/org/apache/ http/test/org/apache/axis2/ http/test/org/apache/axis2/transport/ ht...

Author: veithen
Date: Fri Sep 26 15:15:01 2008
New Revision: 699519

URL: http://svn.apache.org/viewvc?rev=699519&view=rev
Log:
Moved the (blocking) HTTP transport tests from Synapse to ws-commons and implemented a different way to load the Axis2 repository during the tests, which is better suited for multi-module projects.

Added:
    webservices/commons/trunk/modules/transport/modules/http/test/
    webservices/commons/trunk/modules/transport/modules/http/test-resources/
    webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/
    webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/aop.xml   (contents, props changed)
      - copied, changed from r698316, synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml
    webservices/commons/trunk/modules/transport/modules/http/test/org/
    webservices/commons/trunk/modules/transport/modules/http/test/org/apache/
    webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/
    webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/
    webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/   (props changed)
      - copied from r698316, synapse/trunk/java/modules/transports/src/test/java/org/apache/axis2/transport/http/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml   (contents, props changed)
      - copied, changed from r698316, synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/__root__
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/modules/
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/modules/modules.list
Modified:
    webservices/commons/trunk/modules/transport/modules/http/pom.xml
    webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
    webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
    webservices/commons/trunk/modules/transport/modules/parent/pom.xml
    webservices/commons/trunk/modules/transport/modules/testkit/pom.xml
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java
    webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java

Modified: webservices/commons/trunk/modules/transport/modules/http/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/http/pom.xml?rev=699519&r1=699518&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/http/pom.xml Fri Sep 26 15:15:01 2008
@@ -87,6 +87,18 @@
             <artifactId>axis2-transport-base</artifactId>
             <version>${axis2-transport-base.version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.axis2</groupId>
+            <artifactId>axis2-transport-testkit</artifactId>
+            <version>${pom.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     
     <build>
@@ -107,6 +119,45 @@
                 </excludes>
             </resource>
         </resources>
+        <testResources>
+            <testResource>
+                <directory>test-resources</directory>
+            </testResource>
+        </testResources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>generate-test-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <stripVersion>true</stripVersion>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.aspectj</groupId>
+                                    <artifactId>aspectjweaver</artifactId>
+                                    <outputDirectory>target/lib</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.3</version>
+                <configuration>
+                    <argLine>-javaagent:target/lib/aspectjweaver.jar -Xms64m -Xmx128m</argLine>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <properties>

Copied: webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/aop.xml (from r698316, synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/aop.xml?p2=webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/aop.xml&p1=synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml&r1=698316&r2=699519&rev=699519&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/aop.xml Fri Sep 26 15:15:01 2008
@@ -18,13 +18,7 @@
   ~  under the License.
   -->
 <aspectj>
-    <aspects>
-        <aspect name="org.apache.synapse.transport.jms.LogAspect"/>
-        <aspect name="org.apache.synapse.transport.mail.LogAspect"/>
-        <aspect name="org.apache.synapse.transport.testkit.axis2.client.LogAspect"/>
-    </aspects>
     <weaver options="-showWeaveInfo">
-        <include within="org.apache.synapse.transport..*"/>
-        <include within="org.apache.axis2.transport..*"/>
+        <include within="org.apache.axis2.transport.http..*"/>
     </weaver>
 </aspectj>
\ No newline at end of file

Propchange: webservices/commons/trunk/modules/transport/modules/http/test-resources/META-INF/aop.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java?rev=699519&r1=698316&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java (original)
+++ webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java Fri Sep 26 15:15:01 2008
@@ -22,8 +22,8 @@
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
-import org.apache.synapse.transport.testkit.axis2.TransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.util.LifecycleFixTransportListenerProxy;
+import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.util.LifecycleFixTransportListenerProxy;
 
 public class HttpTransportDescriptionFactory implements TransportDescriptionFactory {
     private final int port;

Modified: webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java?rev=699519&r1=698316&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java (original)
+++ webservices/commons/trunk/modules/transport/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java Fri Sep 26 15:15:01 2008
@@ -22,9 +22,9 @@
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.apache.synapse.transport.testkit.TransportTestSuite;
-import org.apache.synapse.transport.testkit.axis2.TransportDescriptionFactory;
-import org.apache.synapse.transport.testkit.http.HttpTransportTestSuiteBuilder;
+import org.apache.axis2.transport.testkit.TransportTestSuite;
+import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.http.HttpTransportTestSuiteBuilder;
 
 public class SimpleHTTPServerTest extends TestCase {
     public static TestSuite suite() throws Exception {

Modified: webservices/commons/trunk/modules/transport/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/parent/pom.xml?rev=699519&r1=699518&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/parent/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/parent/pom.xml Fri Sep 26 15:15:01 2008
@@ -207,6 +207,12 @@
                 <version>SNAPSHOT</version>
             </dependency>
             <dependency>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>addressing</artifactId>
+                <version>SNAPSHOT</version>
+                <type>mar</type>
+            </dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
                 <version>1.1.2</version>
@@ -260,6 +266,16 @@
                 <artifactId>junit</artifactId>
                 <version>3.8.2</version>
             </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjrt</artifactId>
+                <version>1.6.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.aspectj</groupId>
+                <artifactId>aspectjweaver</artifactId>
+                <version>1.6.1</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>

Modified: webservices/commons/trunk/modules/transport/modules/testkit/pom.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/pom.xml?rev=699519&r1=699518&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/pom.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/pom.xml Fri Sep 26 15:15:01 2008
@@ -52,9 +52,13 @@
             <version>0.9.11</version>
         </dependency>
         <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <version>1.3.0</version>
+        </dependency>
+        <dependency>
             <groupId>org.aspectj</groupId>
             <artifactId>aspectjrt</artifactId>
-            <version>1.6.1</version>
         </dependency>
         <dependency>
             <groupId>log4j</groupId>
@@ -69,6 +73,14 @@
     </dependencies>
     
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>target/generated-resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -77,7 +89,32 @@
                     <source>1.5</source>
                     <target>1.5</target>
                 </configuration>
-             </plugin>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.0</version>
+                <executions>
+                    <execution>
+                        <id>copy</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <stripVersion>true</stripVersion>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.apache.axis2</groupId>
+                                    <artifactId>addressing</artifactId>
+                                    <type>mar</type>
+                                    <outputDirectory>target/generated-resources/org/apache/axis2/transport/repo/modules</outputDirectory>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>

Added: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java?rev=699519&view=auto
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java (added)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/CustomAxisConfigurator.java Fri Sep 26 15:15:01 2008
@@ -0,0 +1,61 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.axis2.transport;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.deployment.DeploymentEngine;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.engine.AxisConfigurator;
+import org.apache.axis2.util.Loader;
+
+public class CustomAxisConfigurator extends DeploymentEngine implements AxisConfigurator {
+    public AxisConfiguration getAxisConfiguration() throws AxisFault {
+        InputStream configStream = Loader.getResourceAsStream("org/apache/axis2/transport/axis2.xml");
+        try {
+            axisConfig = populateAxisConfiguration(configStream);
+        } finally {
+            try {
+                configStream.close();
+            } catch (IOException ex) {
+                throw AxisFault.makeFault(ex);
+            }
+        }
+        try {
+            loadRepositoryFromURL(new URL(Loader.getResource("org/apache/axis2/transport/repo/__root__"), "."));
+        } catch (MalformedURLException ex) {
+            throw AxisFault.makeFault(ex);
+        }
+        axisConfig.setConfigurator(this);
+        return axisConfig;
+    }
+
+    public void loadServices() {
+        // We don't have any services.
+    }
+
+    public void engageGlobalModules() throws AxisFault {
+        engageModules();
+    }
+}

Modified: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java?rev=699519&r1=699518&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/UtilsTransportServer.java Fri Sep 26 15:15:01 2008
@@ -19,7 +19,6 @@
 
 package org.apache.axis2.transport;
 
-import java.io.File;
 import java.util.List;
 
 import javax.xml.namespace.QName;
@@ -51,11 +50,8 @@
     private final ConfigurationContext cfgCtx;
 
     public UtilsTransportServer() throws AxisFault {
-        // Create a configuration context using the test repository in target/test_rep. This
-        // repository is set up using maven-dependency-plugin (see pom.xml) to contain the
-        // addressing module which can be engaged using the enableAddressing method.
         cfgCtx = ConfigurationContextFactory.
-            createConfigurationContextFromFileSystem(new File("target/test_rep").getAbsolutePath());
+                    createConfigurationContext(new CustomAxisConfigurator());
         AxisConfiguration axisConfiguration = cfgCtx.getAxisConfiguration();
 
         // remove http transport

Modified: webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java?rev=699519&r1=699518&r2=699519&view=diff
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClientContext.java Fri Sep 26 15:15:01 2008
@@ -19,14 +19,13 @@
 
 package org.apache.axis2.transport.testkit.axis2.client;
 
-import java.io.File;
-
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.context.ConfigurationContextFactory;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
 import org.apache.axis2.format.BinaryFormatter;
 import org.apache.axis2.format.PlainTextFormatter;
+import org.apache.axis2.transport.CustomAxisConfigurator;
 import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
 
 public class AxisTestClientContext {
@@ -39,9 +38,7 @@
     
     @SuppressWarnings("unused")
     private void setUp(TransportDescriptionFactory tdf) throws Exception {
-        cfgCtx =
-            ConfigurationContextFactory.createConfigurationContextFromFileSystem(
-                    new File("target/test_rep").getAbsolutePath());
+        cfgCtx = ConfigurationContextFactory.createConfigurationContext(new CustomAxisConfigurator());
         AxisConfiguration axisCfg = cfgCtx.getAxisConfiguration();
 
         trpOutDesc = tdf.createTransportOutDescription();

Copied: webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml (from r698316, synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml)
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml?p2=webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml&p1=synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml&r1=698316&r2=699519&rev=699519&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/resources/META-INF/aop.xml (original)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml Fri Sep 26 15:15:01 2008
@@ -19,12 +19,6 @@
   -->
 <aspectj>
     <aspects>
-        <aspect name="org.apache.synapse.transport.jms.LogAspect"/>
-        <aspect name="org.apache.synapse.transport.mail.LogAspect"/>
-        <aspect name="org.apache.synapse.transport.testkit.axis2.client.LogAspect"/>
+        <aspect name="org.apache.axis2.transport.testkit.axis2.client.LogAspect"/>
     </aspects>
-    <weaver options="-showWeaveInfo">
-        <include within="org.apache.synapse.transport..*"/>
-        <include within="org.apache.axis2.transport..*"/>
-    </weaver>
 </aspectj>
\ No newline at end of file

Propchange: webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/META-INF/aop.xml
------------------------------------------------------------------------------
    svn:mergeinfo = 

Added: webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml?rev=699519&view=auto
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml (added)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/axis2.xml Fri Sep 26 15:15:01 2008
@@ -0,0 +1,236 @@
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements. See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership. The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License. You may obtain a copy of the License at
+  ~
+  ~ http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied. See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+
+<axisconfig name="AxisJava2.0">
+    <!-- ================================================= -->
+    <!-- Parameters -->
+    <!-- ================================================= -->
+    <parameter name="hotdeployment">true</parameter>
+    <parameter name="hotupdate">false</parameter>
+    <parameter name="enableMTOM">false</parameter>
+
+    <!--If turned on with use the Accept header of the request to determine the contentType of the
+    response-->
+    <parameter name="httpContentNegotiation">false</parameter>
+
+    <!--During a fault, stacktrace can be sent with the fault message. The following flag will control -->
+    <!--that behaviour.-->
+    <parameter name="sendStacktraceDetailsWithFaults">true</parameter>
+
+    <!--If there aren't any information available to find out the fault reason, we set the message of the exception-->
+    <!--as the faultreason/Reason. But when a fault is thrown from a service or some where, it will be -->
+    <!--wrapped by different levels. Due to this the initial exception message can be lost. If this flag-->
+    <!--is set then, Axis2 tries to get the first exception and set its message as the faultreason/Reason.-->
+    <parameter name="DrillDownToRootCauseForFaultReason">false</parameter>
+
+    <!--This is the user name and password of admin console-->
+    <parameter name="userName">admin</parameter>
+    <parameter name="password">axis2</parameter>
+
+    <!--To override repository/services you need to uncomment following parameter and value SHOULD be absolute file path.-->
+    <!--ServicesDirectory only works on the following cases-->
+    <!---File based configurator and in that case the value should be a file URL (http:// not allowed)-->
+    <!---When creating URL Based configurator with URL “file://”  -->
+    <!--- War based configurator with expanded case , -->
+
+    <!--All the other scenarios it will be ignored.-->
+    <!--<parameter name="ServicesDirectory">service</parameter>-->
+    <!--To override repository/modules you need to uncomment following parameter and value SHOULD be absolute file path-->
+    <!--<parameter name="ModulesDirectory">modules</parameter>-->
+
+    <!--Following params will set the proper context paths for invocations. All the endpoints will have a commons context-->
+    <!--root which can configured using the following contextRoot parameter-->
+    <!--<parameter name="contextRoot">axis2</parameter>-->
+
+    <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distinguish those endpoints-->
+    <!--<parameter name="servicePath">services</parameter>-->
+    <!--<parameter name="restPath">rest</parameter>-->
+
+    <!-- Following parameter will completely disable REST handling in Axis2-->
+    <parameter name="disableREST" locked="false">false</parameter>
+
+    <!--POJO deployer , this will alow users to drop .class file and make that into a service-->
+    <deployer extension=".class" directory="pojo" class="org.apache.axis2.deployment.POJODeployer"/>
+    <deployer extension=".jar" directory="transports" class="org.apache.axis2.deployment.TransportDeployer"/>
+
+    <!-- Following parameter will set the host name for the epr-->
+    <!--<parameter name="hostname" locked="true">myhost.com</parameter>-->
+
+    <!-- ================================================= -->
+    <!-- Message Receivers -->
+    <!-- ================================================= -->
+    <!--This is the Default Message Receiver for the system , if you want to have MessageReceivers for -->
+    <!--all the other MEP implement it and add the correct entry to here , so that you can refer from-->
+    <!--any operation -->
+    <!--Note : You can override this for particular service by adding the same element with your requirement-->
+    <messageReceivers>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-only"
+                         class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/>
+        <messageReceiver mep="http://www.w3.org/2006/01/wsdl/in-out"
+                         class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+    </messageReceivers>
+
+    <!-- ================================================= -->
+    <!-- Message Formatter -->
+    <!-- ================================================= -->
+    <!--Following content type to message formatter mapping can be used to implement support for different message -->
+    <!--format  serialization in Axis2. These message formats are expected to be resolved based on the content type. -->
+    <messageFormatters>
+        <messageFormatter contentType="application/x-www-form-urlencoded"
+                         class="org.apache.axis2.transport.http.XFormURLEncodedFormatter"/>
+        <messageFormatter contentType="multipart/form-data"
+                         class="org.apache.axis2.transport.http.MultipartFormDataFormatter"/>
+        <messageFormatter contentType="application/xml"
+                         class="org.apache.axis2.transport.http.ApplicationXMLFormatter"/>
+        <messageFormatter contentType="text/xml"
+                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+        <messageFormatter contentType="application/soap+xml"
+                         class="org.apache.axis2.transport.http.SOAPMessageFormatter"/>
+    </messageFormatters>
+
+    <!-- ================================================= -->
+    <!-- Message Builders -->
+    <!-- ================================================= -->
+    <!--Following content type to builder mapping can be used to implement support for different message -->
+    <!--formats in Axis2. These message formats are expected to be resolved based on the content type. -->
+    <messageBuilders>
+        <messageBuilder contentType="application/xml"
+                         class="org.apache.axis2.builder.ApplicationXMLBuilder"/>
+        <messageBuilder contentType="application/x-www-form-urlencoded"
+                         class="org.apache.axis2.builder.XFormURLEncodedBuilder"/>
+        <!--Left commented because it adds the depandancy of servlet-api to other modules.
+        Please uncomment to Receive messages in multipart/form-data format-->
+        <!--<messageBuilder contentType="multipart/form-data"-->
+                         <!--class="org.apache.axis2.builder.MultipartFormDataBuilder"/>-->
+    </messageBuilders>
+
+    <!-- ================================================= -->
+    <!-- Target Resolvers -->
+    <!-- ================================================= -->
+    <!-- Uncomment the following and specify the class name for your TargetResolver to add -->
+    <!-- a TargetResolver. TargetResolvers are used to process the To EPR for example to -->
+    <!-- choose a server in a cluster -->
+    <!--<targetResolvers>-->
+    <!--<targetResolver class="" />-->
+    <!--</targetResolvers>-->
+
+
+    <!-- ================================================= -->
+    <!--  SOAP Role Configuration                          -->
+    <!-- ================================================= -->
+    <!-- Use the following pattern to configure this axis2
+         instance to act in particular roles. Note that in
+         the absence of any configuration, Axis2 will act 
+         only in the ultimate receiver role -->
+    <!--
+    <SOAPRoleConfiguration isUltimateReceiver="true">
+    	<role>http://my/custom/role</role>
+    </SOAPRoleConfiguration>
+	-->
+
+    <!-- ================================================= -->
+    <!-- Phases  -->
+    <!-- ================================================= -->
+    <phaseOrder type="InFlow">
+        <!--  System pre-defined phases       -->
+         <phase name="Transport">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher">
+                <order phase="Transport"/>
+            </handler>
+         </phase>
+        <phase name="Addressing">
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+        </phase>
+        <phase name="RMPhase"/>
+        <!--  System pre defined phases       -->
+        <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
+        <phase name="OperationInPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFlow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutPhase"/>
+        <!--system predefined phase-->
+        <!--these phase will run irrespective of the service-->
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+    </phaseOrder>
+    <phaseOrder type="InFaultFlow">
+        <phase name="Addressing">
+             <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.AddressingBasedDispatcher">
+                 <order phase="Addressing"/>
+            </handler>
+        </phase>
+        <phase name="Security"/>
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIBasedDispatcher"/>
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPActionBasedDispatcher"/>
+            <handler name="RequestURIOperationDispatcher"
+                     class="org.apache.axis2.dispatchers.RequestURIOperationDispatcher"/>
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.SOAPMessageBodyBasedDispatcher"/>
+
+            <handler name="HTTPLocationBasedDispatcher"
+                     class="org.apache.axis2.dispatchers.HTTPLocationBasedDispatcher"/>
+        </phase>
+        <phase name="RMPhase"/>
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationInFaultPhase"/>
+    </phaseOrder>
+    <phaseOrder type="OutFaultFlow">
+        <!--      user can add his own phases to this area  -->
+        <phase name="OperationOutFaultPhase"/>
+        <phase name="RMPhase"/>
+        <phase name="PolicyDetermination"/>
+        <phase name="MessageOut"/>
+        <phase name="Security"/>
+    </phaseOrder>
+</axisconfig>
\ No newline at end of file

Added: webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/__root__
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/__root__?rev=699519&view=auto
==============================================================================
    (empty)

Added: webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/modules/modules.list
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/modules/modules.list?rev=699519&view=auto
==============================================================================
--- webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/modules/modules.list (added)
+++ webservices/commons/trunk/modules/transport/modules/testkit/src/main/resources/org/apache/axis2/transport/repo/modules/modules.list Fri Sep 26 15:15:01 2008
@@ -0,0 +1 @@
+addressing.mar