From 0466c15606e9100b3196777609d56083df116d51 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 7 Dec 2012 16:40:06 +0000
Subject: [PATCH 001/133] Prevent the echo-sample tests from creating a
 server-config.wsdd file in the source tree without changing the working
 directory.

---
 .../tools/maven/wsdd/GenerateWSDDMojo.java    | 23 +++++++++++--------
 samples/echo-sample/pom.xml                   | 23 +++++++++++++++++--
 2 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java b/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
index f05434d82..f2fba7d46 100644
--- a/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
+++ b/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
@@ -71,10 +71,11 @@ public class GenerateWSDDMojo extends AbstractMojo {
     private String type;
     
     /**
-     * 
+     * A set of WSDD files (typically generated by maven-wsdl2java-plugin) to be merged into the
+     * output WSDD. If this parameter is not set, then the plug-in will just generate a default
+     * configuration file.
      * 
      * @parameter
-     * @required
      */
     private File[] files;
     
@@ -148,14 +149,16 @@ public void execute() throws MojoExecutionException, MojoFailureException {
             }
         }
         
-        // Load WSDD files from plug-in configuration
-        for (int i=0; i<files.length; i++) {
-            File file = files[i];
-            getLog().info("Loading " + file);
-            try {
-                deployment.merge(WSDDUtil.load(new InputSource(file.toURL().toString())));
-            } catch (Exception ex) {
-                throw new MojoFailureException("Failed to process " + file, ex);
+        if (files != null) {
+            // Load WSDD files from plug-in configuration
+            for (int i=0; i<files.length; i++) {
+                File file = files[i];
+                getLog().info("Loading " + file);
+                try {
+                    deployment.merge(WSDDUtil.load(new InputSource(file.toURL().toString())));
+                } catch (Exception ex) {
+                    throw new MojoFailureException("Failed to process " + file, ex);
+                }
             }
         }
         
diff --git a/samples/echo-sample/pom.xml b/samples/echo-sample/pom.xml
index 71338f94a..a59dd24bf 100644
--- a/samples/echo-sample/pom.xml
+++ b/samples/echo-sample/pom.xml
@@ -69,14 +69,33 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>maven-wsdd-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <!-- We create a server-config.wsdd file to prevent Axis from creating a default one in the source tree -->
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>generate-wsdd</goal>
+                        </goals>
+                        <configuration>
+                            <type>server</type>
+                            <output>${project.build.directory}/server-config.wsdd</output>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <executions>
                     <execution>
                         <id>default-test</id>
                         <configuration>
-                            <!-- Prevent Axis from creating a server-config.wsdd file in the source tree -->
-                            <workingDirectory>${project.build.directory}/work</workingDirectory>
+                            <systemPropertyVariables>
+                                <axis.ServerConfigFile>${project.build.directory}/server-config.wsdd</axis.ServerConfigFile>
+                            </systemPropertyVariables>
                         </configuration>
                     </execution>
                 </executions>

From 9e16c3376ccf88df9dafa30b68e2ca7405355756 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 7 Dec 2012 17:02:31 +0000
Subject: [PATCH 002/133] Simplified unit tests. Surefire/failsafe correctly
 sets the current working directory by default, so that we don't need to check
 the basedir system property. Ensure that we use the default everywhere.

---
 .../ant/wsdl/CustomGeneratorFactoryTest.java  |  2 +-
 .../test/wsdl/clash/VerifyFilesTestCase.java  |  3 +--
 .../test/wsdl/extra/ExtraClassesTestCase.java |  3 +--
 .../test/wsdl/filegen/AllOptionTestCase.java  |  3 +--
 .../test/wsdl/filegen/FileGenTestCase.java    |  3 +--
 .../java/test/wsdl/groups/GroupsTestCase.java |  3 +--
 .../test/wsdl/header/VerifyFilesTestCase.java |  3 +--
 .../SalesRankNPrice_ServiceTestCase.java      |  3 +--
 .../multibinding/VerifyFilesTestCase.java     |  3 +--
 .../schemaImport/SchemaImportTestCase.java    |  3 +--
 .../java/test/wsdl/split/SplitTestCase.java   |  3 +--
 .../test/java/test/utils/TestMessages.java    |  3 +--
 .../test/java/test/utils/TestSrcContent.java  |  3 +--
 .../test/java/test/utils/TestXMLUtils.java    |  2 +-
 .../java/test/functional/TestAutoTypes.java   |  4 ++--
 .../wsdl/query/FileGenWrappedTestCase.java    |  3 +--
 .../test/wsdl/types/DynamicProxyTestCase.java |  4 +++-
 .../functional/TestAttachmentsSample.java     | 10 ++++-----
 .../java/test/functional/TestEchoSample.java  |  2 +-
 .../example1/VerifyFilesTest.java             |  2 +-
 .../example2/VerifyFilesTest.java             |  2 +-
 samples/transport-sample/pom.xml              | 21 +++++++++++++++++--
 .../functional/TestTCPTransportSample.java    |  2 +-
 .../test/functional/TestTransportSample.java  |  2 +-
 24 files changed, 49 insertions(+), 43 deletions(-)

diff --git a/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java b/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
index d76c49616..e73afa950 100644
--- a/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
+++ b/axis-ant/src/test/java/org/apache/axis/tools/ant/wsdl/CustomGeneratorFactoryTest.java
@@ -26,7 +26,7 @@
 
 public class CustomGeneratorFactoryTest extends TestCase {
     public void test() throws Exception {
-        File file = new File(System.getProperty("basedir", "."), "target/work/com/example/stockquote_wsdl/StockQuoteServiceLocator.java");
+        File file = new File("target/work/com/example/stockquote_wsdl/StockQuoteServiceLocator.java");
         assertTrue(FileUtils.readFileToString(file).contains("My header comment"));
     }
 }
\ No newline at end of file
diff --git a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
index 29983c463..5b5e8f790 100644
--- a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
@@ -66,8 +66,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "clash";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java b/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
index 8216feb74..d4afa27a3 100644
--- a/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
@@ -59,8 +59,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator +
+        return "target" + File.separator + "work" + File.separator +
                 "test" + File.separator + "wsdl" + File.separator +
                 "extra";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
index 50ba645c0..c58244c42 100644
--- a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
@@ -48,8 +48,7 @@ protected Set shouldExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "filegenAll";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
index 6dae4483d..ec18f6fa4 100644
--- a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
@@ -62,8 +62,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "filegen";
     }
diff --git a/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java b/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
index 3bee29918..adfcb75a0 100644
--- a/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
@@ -56,8 +56,7 @@ protected Set shouldNotExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "groups";
     }
diff --git a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
index 4d3edb471..e4a1db31d 100644
--- a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
@@ -58,8 +58,7 @@ protected Set shouldExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "header";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java b/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
index 33eec8267..64bbdb9e5 100644
--- a/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
@@ -54,8 +54,7 @@ public class SalesRankNPrice_ServiceTestCase extends junit.framework.TestCase {
     };
 
     public void testFileGen() throws IOException {
-        String rootDir = System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        String rootDir = "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator + "literal";
         // open up the output directory and check what files exist.
         File outputDir = new File(rootDir);
diff --git a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
index 9521f6a49..ad40882b3 100644
--- a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
@@ -58,8 +58,7 @@ protected Set shouldExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator + 
+        return "target" + File.separator + "work" + File.separator + 
                 "test" + File.separator + "wsdl" + File.separator +
                 "multibinding";
     } // rootDir
diff --git a/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java b/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
index 689bc1889..cb82eec65 100644
--- a/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/schemaImport/SchemaImportTestCase.java
@@ -42,8 +42,7 @@ public SchemaImportTestCase(String name) {
     }
 
     public void testSchemaImport() {
-        String path = System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "work" + File.separator +
+        String path = "target" + File.separator + "work" + File.separator +
                 "test" + File.separator + "wsdl" + File.separator +
                 "schemaImport" + File.separator + "foo.wsdl";
         Document doc = null;
diff --git a/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java b/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
index 784aab8f9..bc6fe1e04 100644
--- a/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/split/SplitTestCase.java
@@ -33,8 +33,7 @@
 public class SplitTestCase extends TestCase {
     public void testValidateWSDL() throws Exception {
         WSDLReader reader = WSDLFactory.newInstance().newWSDLReader();
-        Definition definition = reader.readWSDL(new File(System.getProperty("basedir", ".")
-                + "/target/work/test/wsdl/split/SplitTestImpl.wsdl").toURI().toString());
+        Definition definition = reader.readWSDL(new File("target/work/test/wsdl/split/SplitTestImpl.wsdl").getAbsoluteFile().toURI().toString());
         Service service = definition.getService(new QName("http://split.wsdl.test", "MyPortTypeService"));
         Port port = service.getPort("SplitTest");
         // This is the critical part: the binding is defined in the imported WSDL
diff --git a/axis-rt-core/src/test/java/test/utils/TestMessages.java b/axis-rt-core/src/test/java/test/utils/TestMessages.java
index 8ffcd473a..dc32db794 100644
--- a/axis-rt-core/src/test/java/test/utils/TestMessages.java
+++ b/axis-rt-core/src/test/java/test/utils/TestMessages.java
@@ -125,9 +125,8 @@ public void testTestExtendedMessages() {
      *     matches the excpected number of parameters (in the source code).
      */
     public void testForMissingMessages() {
-        String baseDir = System.getProperty("basedir");
         char sep = File.separatorChar;
-        String srcDirStr = baseDir + sep + "src" + sep + "main" + sep + "java";
+        String srcDirStr = "src" + sep + "main" + sep + "java";
 
         File srcDir = new File(srcDirStr);
         if (srcDir.exists()) {
diff --git a/axis-rt-core/src/test/java/test/utils/TestSrcContent.java b/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
index a9e731552..89c29b4fd 100644
--- a/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
+++ b/axis-rt-core/src/test/java/test/utils/TestSrcContent.java
@@ -44,8 +44,7 @@ public class TestSrcContent extends TestCase {
      * tree (xml-axis/java/src), calling checkFile for each file.
      */
     public void testSourceFiles() {
-        String baseDir = System.getProperty("basedir");
-        File   srcDir = new File(baseDir, "src/main/java");
+        File   srcDir = new File("src/main/java");
 
         if (srcDir.exists()) {
             walkTree(srcDir);
diff --git a/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java b/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
index fe38606bc..4f0e9bb36 100644
--- a/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
+++ b/axis-rt-core/src/test/java/test/utils/TestXMLUtils.java
@@ -303,7 +303,7 @@ public void testDOMXXE() throws Exception
 
     String msg = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" +
         "<!DOCTYPE project [" +
-        "<!ENTITY buildxml SYSTEM \"file:" + System.getProperty("basedir") + "/pom.xml\">" +
+        "<!ENTITY buildxml SYSTEM \"file:pom.xml\">" +
         "]>" +
         "<SOAP-ENV:Envelope " +
         "xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
diff --git a/integration/src/test/java/test/functional/TestAutoTypes.java b/integration/src/test/java/test/functional/TestAutoTypes.java
index d3d3f914b..a0996d5c0 100644
--- a/integration/src/test/java/test/functional/TestAutoTypes.java
+++ b/integration/src/test/java/test/functional/TestAutoTypes.java
@@ -32,13 +32,13 @@ public class TestAutoTypes extends TestCase {
 
     protected void setUp() throws java.lang.Exception {
         AxisProperties.setProperty("axis.doAutoTypes", "true");
-        String[] args = { System.getProperty("basedir") + "/src/test/wsdd/functional/auto-deploy.wsdd" };
+        String[] args = { "src/test/wsdd/functional/auto-deploy.wsdd" };
         AdminClient.main(args);
     }
 
     protected void tearDown() throws java.lang.Exception {
         AxisProperties.setProperty("axis.doAutoTypes", "false");
-        String[] args = { System.getProperty("basedir") + "/src/test/wsdd/functional/auto-undeploy.wsdd" };
+        String[] args = { "/src/test/wsdd/functional/auto-undeploy.wsdd" };
         AdminClient.main(args);
     }
 
diff --git a/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java b/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
index 25a894830..66cc4555e 100644
--- a/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
+++ b/integration/src/test/java/test/wsdl/query/FileGenWrappedTestCase.java
@@ -59,8 +59,7 @@ protected Set mayExist() {
      * The directory containing the files that should exist.
      */
     protected String rootDir() {
-        return System.getProperty("basedir", ".") + File.separator +
-                "target" + File.separator + "generated-test-sources" + File.separator +
+        return "target" + File.separator + "generated-test-sources" + File.separator +
                 "wsdl2java" + File.separator +
                 "test" + File.separator + "wsdl" + File.separator +
                 "query";
diff --git a/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java b/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
index 9f75ee2c6..078f24e58 100644
--- a/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
+++ b/integration/src/test/java/test/wsdl/types/DynamicProxyTestCase.java
@@ -66,6 +66,8 @@
 import javax.xml.rpc.holders.ShortHolder;
 import javax.xml.rpc.holders.ShortWrapperHolder;
 import javax.xml.rpc.holders.StringHolder;
+
+import java.io.File;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.net.MalformedURLException;
@@ -81,7 +83,7 @@ public DynamicProxyTestCase(String name) {
     private TypeTest getProxyWithWSDL() {
         try {
             Service service = ServiceFactory.newInstance().createService(
-                new URL("file", "", System.getProperty("basedir", ".") + "/src/test/wsdl/types/ComprehensiveTypes.wsdl"),
+                new File("src/test/wsdl/types/ComprehensiveTypes.wsdl").getAbsoluteFile().toURL(),
                 new QName("urn:comprehensive-service.types.wsdl.test",
                         "TypeTestService"));
             Stub stub = (Stub)service.getPort(
diff --git a/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java b/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
index bd02ae7db..c821c47cc 100644
--- a/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
+++ b/samples/attachments-sample/src/test/java/test/functional/TestAttachmentsSample.java
@@ -31,27 +31,27 @@ protected void setUp() throws Exception {
     }
 
     public void testAttachments1() throws Exception {
-        boolean res = new EchoAttachment(opts).echo(false, System.getProperty("basedir") + "/pom.xml");
+        boolean res = new EchoAttachment(opts).echo(false, "pom.xml");
        assertEquals("Didn't process attachment correctly", res, true) ;
     }
 
     public void testAttachmentsD1() throws Exception {
-        boolean res = new EchoAttachment(opts).echo(true, System.getProperty("basedir") + "/pom.xml");
+        boolean res = new EchoAttachment(opts).echo(true, "pom.xml");
        assertEquals("Didn't process attachment correctly", res, true) ;
     }
     
     public void testAttachmentsDimeLeaveEmpty() throws Exception {
-        boolean res = new EchoAttachment(opts).echo(true, System.getProperty("basedir") + "/src/test/files/leaveempty.txt");
+        boolean res = new EchoAttachment(opts).echo(true, "src/test/files/leaveempty.txt");
        assertEquals("Didn't process attachment correctly", res, true) ;
     }
 
     public void testAttachments2() throws Exception {
-        boolean res = new EchoAttachment(opts).echoDir(false, System.getProperty("basedir") + "/src/main/java/samples/attachments");
+        boolean res = new EchoAttachment(opts).echoDir(false, "src/main/java/samples/attachments");
         assertEquals("Didn't process attachments correctly", res, true);
     }
 
     public void testAttachmentsD2() throws Exception {
-        boolean res = new EchoAttachment(opts).echoDir(true, System.getProperty("basedir") + "/src/main/java/samples/attachments");
+        boolean res = new EchoAttachment(opts).echoDir(true, "src/main/java/samples/attachments");
         assertEquals("Didn't process attachments correctly", res, true);
     }
 
diff --git a/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java b/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
index 5ea5ee918..770b3081d 100644
--- a/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
+++ b/samples/echo-sample/src/test/java/test/functional/TestEchoSample.java
@@ -43,7 +43,7 @@ public void testEchoService () throws Exception {
         // deploy the echo service
         String[] args = {"-l",
                          "local:///AdminService",
-                         System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd"};
+                         "src/main/wsdd/deploy.wsdd"};
         AdminClient.main(args);
 
         // define the tests using JUnit assert facilities, and tell client to
diff --git a/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java b/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
index fe05d2338..5ccea7209 100644
--- a/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
+++ b/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example1/VerifyFilesTest.java
@@ -26,7 +26,7 @@
 
 public class VerifyFilesTest extends TestCase {
     public void testDeployUseless() throws Exception {
-        File file = new File(System.getProperty("basedir", "."), "target/work/example1/com/examples/www/wsdl/HelloService_wsdl/Hello_Service.lst");
+        File file = new File("target/work/example1/com/examples/www/wsdl/HelloService_wsdl/Hello_Service.lst");
         assertTrue(file.exists());
         assertEquals("Hello_Port", FileUtils.readFileToString(file).trim());
     }
diff --git a/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java b/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
index fb1399896..18422ddb0 100644
--- a/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
+++ b/samples/integrationguide-sample/src/test/java/samples/integrationGuide/example2/VerifyFilesTest.java
@@ -26,7 +26,7 @@
 
 public class VerifyFilesTest extends TestCase {
     public void testDeployUseless() throws Exception {
-        File file = new File(System.getProperty("basedir", "."), "target/work/example2/com/examples/www/wsdl/HelloService_wsdl/deploy.useless");
+        File file = new File("target/work/example2/com/examples/www/wsdl/HelloService_wsdl/deploy.useless");
         assertTrue(file.exists());
         assertEquals("Hi ho!  Hi ho!  It's off to work we go.", FileUtils.readFileToString(file).trim());
     }
diff --git a/samples/transport-sample/pom.xml b/samples/transport-sample/pom.xml
index a6eaada7f..8d1b15524 100644
--- a/samples/transport-sample/pom.xml
+++ b/samples/transport-sample/pom.xml
@@ -103,6 +103,24 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>maven-wsdd-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <!-- We create a server-config.wsdd file to prevent Axis from creating a default one in the source tree -->
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>generate-wsdd</goal>
+                        </goals>
+                        <configuration>
+                            <type>server</type>
+                            <output>${project.build.directory}/server-config.wsdd</output>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-failsafe-plugin</artifactId>
                 <executions>
@@ -115,9 +133,8 @@
                             <includes>
                                 <include>**/Test*.java</include>
                             </includes>
-                            <!-- Prevent Axis from creating a server-config.wsdd file in the source tree -->
-                            <workingDirectory>${project.build.directory}/work</workingDirectory>
                             <systemPropertyVariables>
+                                <axis.ServerConfigFile>${project.build.directory}/server-config.wsdd</axis.ServerConfigFile>
                                 <test.functional.TCPListenerPort>${test.functional.TCPListenerPort}</test.functional.TCPListenerPort>
                             </systemPropertyVariables>
                         </configuration>
diff --git a/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java b/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
index 8de7b5e2f..da7c322e0 100644
--- a/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
+++ b/samples/transport-sample/src/test/java/test/functional/TestTCPTransportSample.java
@@ -48,7 +48,7 @@ public TestTCPTransportSample(String name) {
     }
 
     public void doTestDeploy () throws Exception {
-        String[] args = { "-l" + uri, System.getProperty("basedir", ".") + "/src/main/wsdd/deploy.wsdd" };
+        String[] args = { "-l" + uri, "src/main/wsdd/deploy.wsdd" };
         AdminClient.main(args);
     }
 
diff --git a/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java b/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
index 6ada54094..d45efde1f 100644
--- a/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
+++ b/samples/transport-sample/src/test/java/test/functional/TestTransportSample.java
@@ -35,7 +35,7 @@ public TestTransportSample(String name) {
     }
     
     public void doTestDeploy () throws Exception {
-        String[] args = { "-llocal:", System.getProperty("basedir") + "/src/main/wsdd/deploy.wsdd" };
+        String[] args = { "-llocal:", "src/main/wsdd/deploy.wsdd" };
         AdminClient.main(args);
     }
     

From 851431baa0235f4e1095ec272ccb8ae631e53268 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 7 Dec 2012 18:54:39 +0000
Subject: [PATCH 003/133] Added a Maven profile to make it easier to generate
 Eclipse project metadata and to work around an issue that occurs when
 maven-eclipse-plugin and maven-shade-plugin are used together.

---
 pom.xml | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pom.xml b/pom.xml
index c410f0c84..3029a347a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -227,6 +227,10 @@
                     <artifactId>maven-shade-plugin</artifactId>
                     <version>2.0</version>
                 </plugin>
+                <plugin>
+                    <artifactId>maven-eclipse-plugin</artifactId>
+                    <version>2.9</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -306,6 +310,38 @@
             </plugin>
         </plugins>
     </build>
+    <profiles>
+        <profile>
+            <!-- Profile to generate Eclipse project metadata -->
+            <id>eclipse</id>
+            <properties>
+                <skipTests>true</skipTests>
+            </properties>
+            <build>
+                <defaultGoal>install</defaultGoal>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-eclipse-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <!-- Since we configure the maven-shade-plugin with the dependencyReducedPomLocation
+                                     property, the basedir of the modules that use that plugin will change during
+                                     the build lifecycle. This is an issue for maven-eclipse-plugin. Therefore
+                                     we execute the eclipse goal in the prepare-package phase, i.e. before the shade goal. -->
+                                <phase>prepare-package</phase>
+                                <goals>
+                                    <goal>eclipse</goal>
+                                </goals>
+                                <configuration>
+                                    <downloadSources>true</downloadSources>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
     <reporting>
         <plugins>
             <plugin>

From e78e99fcdef2da3c2b1e2f8b36148b481b839470 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 8 Dec 2012 15:38:24 +0000
Subject: [PATCH 004/133] Mavenized the JMS sample and added the necessary
 stuff to perform an integration test with ActiveMQ.

---
 .../apache/axis/testutils/daemon/Daemon.java  |  24 +-
 .../axis/testutils/daemon/Launcher.java       |  56 +++++
 distribution/src/main/assembly/bin.xml        |  12 +
 .../server/AbstractStartProcessMojo.java      |   5 +-
 ...ion.java => AxisServerProcessControl.java} |  14 +-
 .../maven/server/DaemonProcessControl.java    |  74 ++++++
 .../maven/server/DefaultProcessManager.java   |  10 +-
 .../tools/maven/server/ManagedProcess.java    |  10 +-
 ...essStopAction.java => ProcessControl.java} |  32 ++-
 .../tools/maven/server/ProcessManager.java    |   2 +-
 .../tools/maven/server/StartDaemonMojo.java   |  77 +++++++
 .../tools/maven/server/StartProcessMojo.java  |  10 +-
 .../tools/maven/server/StartServerMojo.java   |   7 +-
 .../wsdl2java/AbstractWsdl2JavaMojo.java      |   9 +-
 samples/jms-sample/pom.xml                    | 213 ++++++++++++++++++
 .../src/main/java}/samples/jms/JMSTest.java   |   1 +
 .../java}/samples/jms/dii/JMSURLTest.java     |  29 +--
 .../samples/jms/stub/JMSURLStubTest.java      |  21 +-
 .../src/main/wsdd}/client-config.wsdd         |   0
 .../src/main/wsdd}/server-config.wsdd         |   0
 .../jms-sample/src/main/wsdl}/GetQuote.wsdl   |   0
 .../activemq-connection-factory.properties    |   3 +
 .../test/java/samples/jms/ActiveMQDaemon.java |  28 +--
 samples/pom.xml                               |   1 +
 24 files changed, 546 insertions(+), 92 deletions(-)
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStopAction.java => axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java (54%)
 create mode 100644 axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{AxisServerStartAction.java => AxisServerProcessControl.java} (82%)
 create mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{ProcessStopAction.java => ProcessControl.java} (62%)
 create mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
 create mode 100644 samples/jms-sample/pom.xml
 rename {distribution/src/main/files => samples/jms-sample/src/main/java}/samples/jms/JMSTest.java (99%)
 rename {distribution/src/main/files => samples/jms-sample/src/main/java}/samples/jms/dii/JMSURLTest.java (84%)
 rename {distribution/src/main/files => samples/jms-sample/src/main/java}/samples/jms/stub/JMSURLStubTest.java (87%)
 rename {distribution/src/main/files/samples/jms => samples/jms-sample/src/main/wsdd}/client-config.wsdd (100%)
 rename {distribution/src/main/files/samples/jms => samples/jms-sample/src/main/wsdd}/server-config.wsdd (100%)
 rename {distribution/src/main/files/samples/jms/stub => samples/jms-sample/src/main/wsdl}/GetQuote.wsdl (100%)
 create mode 100644 samples/jms-sample/src/test/conf/activemq-connection-factory.properties
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java => samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java (60%)

diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStopAction.java b/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java
similarity index 54%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStopAction.java
rename to axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java
index 51b08ce7b..4ac087046 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStopAction.java
+++ b/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java
@@ -16,25 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axis.tools.maven.server;
+package org.apache.axis.testutils.daemon;
 
-import java.io.File;
-
-import org.apache.axis.client.AdminClient;
-import org.codehaus.plexus.logging.Logger;
-
-public class AxisServerStopAction implements ProcessStopAction {
-    private final AdminClient adminClient;
-    private final File[] undeployments;
-
-    public AxisServerStopAction(AdminClient adminClient, File[] undeployments) {
-        this.adminClient = adminClient;
-        this.undeployments = undeployments;
-    }
-
-    public int execute(Logger logger) throws Exception {
-        AdminClientUtils.process(logger, adminClient, undeployments);
-        adminClient.quit();
-        return STOPPING;
-    }
+public interface Daemon {
+    void start(String[] args) throws Exception;
+    void stop() throws Exception;
 }
diff --git a/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java b/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java
new file mode 100644
index 000000000..36bb2c6eb
--- /dev/null
+++ b/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java
@@ -0,0 +1,56 @@
+/*
+ * 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.axis.testutils.daemon;
+
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+public class Launcher {
+    public static void main(String[] args) throws Exception {
+        String daemonClass = args[0];
+        int controlPort = Integer.parseInt(args[1]);
+        String[] daemonArgs = new String[args.length-2];
+        System.arraycopy(args, 2, daemonArgs, 0, args.length-2);
+        ServerSocket controlServerSocket = new ServerSocket();
+        controlServerSocket.bind(new InetSocketAddress(InetAddress.getByName("localhost"), controlPort));
+        Socket controlSocket = controlServerSocket.accept();
+        BufferedReader controlIn = new BufferedReader(new InputStreamReader(controlSocket.getInputStream(), "ASCII"));
+        Writer controlOut = new OutputStreamWriter(controlSocket.getOutputStream(), "ASCII");
+        Daemon daemon = (Daemon)Class.forName(daemonClass).newInstance();
+        daemon.start(daemonArgs);
+        controlOut.write("READY\r\n");
+        controlOut.flush();
+        String request = controlIn.readLine();
+        if (request == null) {
+            System.err.println("Control connection unexpectedly closed");
+        } else if (request.equals("STOP")) {
+            daemon.stop();
+            controlOut.write("STOPPED\r\n");
+            controlOut.flush();
+        } else {
+            System.err.println("Unexpected request: " + request);
+        }
+    }
+}
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index 175ad2588..49a7f3a18 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -112,6 +112,18 @@
             <directory>../samples/jaxrpc-sample/src/main/wsdd</directory>
             <outputDirectory>samples/jaxrpc</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>../samples/jms-sample/src/main/java</directory>
+            <outputDirectory>/</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../samples/jms-sample/src/main/wsdl</directory>
+            <outputDirectory>samples/jms/stub</outputDirectory>
+        </fileSet>
+        <fileSet>
+            <directory>../samples/jms-sample/src/main/wsdd</directory>
+            <outputDirectory>samples/jms</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>../samples/message-sample/src/main/java</directory>
             <outputDirectory>/</outputDirectory>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
index 7dd6f75e8..49bd75d32 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
@@ -102,7 +102,7 @@ protected boolean isDebug() {
         return debug;
     }
 
-    protected void startJavaProcess(String description, String mainClass, String[] args, File workDir, ProcessStartAction startAction, ProcessStopAction stopAction) throws MojoExecutionException, MojoFailureException {
+    protected void startJavaProcess(String description, String mainClass, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
         // Locate java executable to use
@@ -155,8 +155,7 @@ protected void startJavaProcess(String description, String mainClass, String[] a
                     description,
                     (String[])cmdline.toArray(new String[cmdline.size()]),
                     workDir,
-                    startAction,
-                    stopAction);
+                    processControl);
         } catch (Exception ex) {
             throw new MojoFailureException("Failed to start server", ex);
         }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStartAction.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
similarity index 82%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStartAction.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
index a937f8158..b4a8b147a 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerStartAction.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
@@ -28,20 +28,22 @@
 import org.apache.axis.client.Call;
 import org.codehaus.plexus.logging.Logger;
 
-public class AxisServerStartAction implements ProcessStartAction {
+public class AxisServerProcessControl implements ProcessControl {
     private final int port;
     private final AdminClient adminClient;
     private final File[] deployments;
+    private final File[] undeployments;
     private final int timeout;
     
-    public AxisServerStartAction(int port, AdminClient adminClient, File[] deployments, int timeout) {
+    public AxisServerProcessControl(int port, AdminClient adminClient, File[] deployments, File[] undeployments, int timeout) {
         this.port = port;
         this.adminClient = adminClient;
         this.deployments = deployments;
+        this.undeployments = undeployments;
         this.timeout = timeout;
     }
 
-    public void execute(Logger logger, Process process) throws Exception {
+    public void initializeProcess(Logger logger, Process process) throws Exception {
         // Wait for server to become ready
         String versionUrl = "http://localhost:" + port + "/axis/services/Version";
         Call call = new Call(new URL(versionUrl));
@@ -70,4 +72,10 @@ public void execute(Logger logger, Process process) throws Exception {
         // Deploy services
         AdminClientUtils.process(logger, adminClient, deployments);
     }
+
+    public int shutdownProcess(Logger logger) throws Exception {
+        AdminClientUtils.process(logger, adminClient, undeployments);
+        adminClient.quit();
+        return STOPPING;
+    }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java
new file mode 100644
index 000000000..2e0767239
--- /dev/null
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java
@@ -0,0 +1,74 @@
+/*
+ * 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.axis.tools.maven.server;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.InetAddress;
+import java.net.Socket;
+
+import org.codehaus.plexus.logging.Logger;
+
+public class DaemonProcessControl implements ProcessControl {
+    private final int controlPort;
+    private BufferedReader controlIn;
+    private Writer controlOut;
+
+    public DaemonProcessControl(int controlPort) {
+        this.controlPort = controlPort;
+    }
+
+    public void initializeProcess(Logger logger, Process process) throws Exception {
+        logger.debug("Attempting to establish control connection on port " + controlPort);
+        Socket controlSocket;
+        while (true) {
+            try {
+                controlSocket = new Socket(InetAddress.getByName("localhost"), controlPort);
+                break;
+            } catch (IOException ex) {
+                Thread.sleep(100);
+            }
+        }
+        logger.debug("Control connection established");
+        controlIn = new BufferedReader(new InputStreamReader(controlSocket.getInputStream(), "ASCII"));
+        controlOut = new OutputStreamWriter(controlSocket.getOutputStream(), "ASCII");
+        logger.debug("Waiting for daemon to become ready");
+        expectStatus("READY");
+        logger.debug("Daemon is ready");
+    }
+
+    public int shutdownProcess(Logger logger) throws Exception {
+        controlOut.write("STOP\r\n");
+        controlOut.flush();
+        expectStatus("STOPPED");
+        return STOPPING;
+    }
+    
+    private void expectStatus(String expectedStatus) throws IOException {
+        String status = controlIn.readLine();
+        if (status == null) {
+            throw new IllegalStateException("Control connection unexpectedly closed");
+        } else if (!status.equals(expectedStatus)) {
+            throw new IllegalStateException("Unexpected status: " + status);
+        }
+    }
+}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
index 14046b0ab..7b8bc79b0 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
@@ -36,15 +36,15 @@ public void enableLogging(Logger logger) {
         this.logger = logger;
     }
 
-    public void startProcess(String description, String[] cmdline, File workDir, ProcessStartAction startAction, ProcessStopAction stopAction) throws Exception {
+    public void startProcess(String description, String[] cmdline, File workDir, ProcessControl processControl) throws Exception {
         if (logger.isDebugEnabled()) {
             logger.debug("Starting process with command line: " + Arrays.asList(cmdline));
         }
         Process process = Runtime.getRuntime().exec(cmdline, null, workDir);
-        managedProcesses.add(new ManagedProcess(process, description, stopAction));
+        managedProcesses.add(new ManagedProcess(process, description, processControl));
         new Thread(new StreamPump(process.getInputStream(), System.out)).start();
         new Thread(new StreamPump(process.getErrorStream(), System.err)).start();
-        startAction.execute(logger, process);
+        processControl.initializeProcess(logger, process);
     }
     
     public void stopAll() throws Exception {
@@ -54,7 +54,7 @@ public void stopAll() throws Exception {
             int result;
             logger.debug("Executing stop action");
             try {
-                result = managedProcess.getStopAction().execute(logger);
+                result = managedProcess.getProcessControl().shutdownProcess(logger);
             } catch (Exception ex) {
                 if (savedException == null) {
                     savedException = ex;
@@ -64,7 +64,7 @@ public void stopAll() throws Exception {
             if (logger.isDebugEnabled()) {
                 logger.debug("result = " + result);
             }
-            if (result == ProcessStopAction.STOPPING) {
+            if (result == ProcessControl.STOPPING) {
                 managedProcess.getProcess().waitFor();
             } else {
                 managedProcess.getProcess().destroy();
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java
index e8d7d23cb..2237691a4 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java
@@ -21,12 +21,12 @@
 public class ManagedProcess {
     private final Process process;
     private final String description;
-    private final ProcessStopAction stopAction;
+    private final ProcessControl processControl;
 
-    public ManagedProcess(Process process, String description, ProcessStopAction stopAction) {
+    public ManagedProcess(Process process, String description, ProcessControl processControl) {
         this.process = process;
         this.description = description;
-        this.stopAction = stopAction;
+        this.processControl = processControl;
     }
 
     public Process getProcess() {
@@ -37,7 +37,7 @@ public String getDescription() {
         return description;
     }
 
-    public ProcessStopAction getStopAction() {
-        return stopAction;
+    public ProcessControl getProcessControl() {
+        return processControl;
     }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStopAction.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java
similarity index 62%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStopAction.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java
index 299c8da75..4eb70bc40 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStopAction.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java
@@ -21,18 +21,12 @@
 import org.codehaus.plexus.logging.Logger;
 
 /**
- * Action to be executed when a process is stopped. Typically (but not necessarily) this involves
- * sending a request to initiate a clean shutdown of the process.
+ * Defines the actions to be executed after a given process has been started and when a process is
+ * stopped.
  * 
  * @author Andreas Veithen
  */
-public interface ProcessStopAction {
-    ProcessStopAction NOP = new ProcessStopAction() {
-        public int execute(Logger logger) throws Exception {
-            return RUNNING;
-        }
-    };
-    
+public interface ProcessControl {
     /**
      * Indicates that the process is expected to be still running after the action is completed.
      */
@@ -44,5 +38,23 @@ public int execute(Logger logger) throws Exception {
      */
     int STOPPING = 2;
     
-    int execute(Logger logger) throws Exception;
+    /**
+     * Initialize the process. This typically involves waiting for the process to be completely
+     * started and to configure the server process, e.g. to deploy services.
+     * 
+     * @param logger
+     * @param process
+     * @throws Exception
+     */
+    void initializeProcess(Logger logger, Process process) throws Exception;
+    
+    /**
+     * Prepare the process for shutdown. Typically (but not necessarily) this involves sending a
+     * request to initiate a clean shutdown of the process.
+     * 
+     * @param logger
+     * @return
+     * @throws Exception
+     */
+    int shutdownProcess(Logger logger) throws Exception;
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
index cfa7db04e..d0ffadea5 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
@@ -21,6 +21,6 @@
 import java.io.File;
 
 public interface ProcessManager {
-    void startProcess(String description, String[] cmdline, File workDir, ProcessStartAction startAction, ProcessStopAction stopAction) throws Exception;
+    void startProcess(String description, String[] cmdline, File workDir, ProcessControl processControl) throws Exception;
     void stopAll() throws Exception;
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
new file mode 100644
index 000000000..286b57f03
--- /dev/null
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -0,0 +1,77 @@
+/*
+ * 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.axis.tools.maven.server;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+
+/**
+ * Start a daemon.
+ * 
+ * @goal start-daemon
+ * @phase pre-integration-test
+ * @requiresDependencyResolution test
+ */
+public class StartDaemonMojo extends AbstractStartProcessMojo {
+    /**
+     * The daemon class.
+     * 
+     * @parameter
+     * @required
+     */
+    private String daemonClass;
+    
+    /**
+     * The arguments to be passed to the main class.
+     * 
+     * @parameter
+     */
+    private String[] args;
+    
+    /**
+     * The working directory for the process.
+     * 
+     * @parameter default-value="${project.build.directory}/work"
+     * @required
+     */
+    private File workDir;
+
+    protected void doExecute() throws MojoExecutionException, MojoFailureException {
+        int controlPort;
+        try {
+            ServerSocket ss = new ServerSocket(0);
+            controlPort = ss.getLocalPort();
+            ss.close();
+        } catch (IOException ex) {
+            throw new MojoFailureException("Failed to allocate port number", ex);
+        }
+        workDir.mkdirs();
+        String[] vmArgs = new String[args != null ? args.length + 2 : 2];
+        vmArgs[0] = daemonClass;
+        vmArgs[1] = String.valueOf(controlPort);
+        if (args != null) {
+            System.arraycopy(args, 0, vmArgs, 2, args.length);
+        }
+        startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", vmArgs, workDir, new DaemonProcessControl(controlPort));
+    }
+}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
index 3777a9e0f..b9e5993e1 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
@@ -22,6 +22,7 @@
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.logging.Logger;
 
 /**
  * Start an arbitrary Java process.
@@ -56,6 +57,13 @@ public class StartProcessMojo extends AbstractStartProcessMojo {
 
     protected void doExecute() throws MojoExecutionException, MojoFailureException {
         workDir.mkdirs();
-        startJavaProcess(mainClass, mainClass, args != null ? args : new String[0], workDir, ProcessStartAction.NOP, ProcessStopAction.NOP);
+        startJavaProcess(mainClass, mainClass, args != null ? args : new String[0], workDir, new ProcessControl() {
+            public void initializeProcess(Logger logger, Process process) throws Exception {
+            }
+
+            public int shutdownProcess(Logger logger) throws Exception {
+                return RUNNING;
+            }
+        });
     }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index f0953d4b0..e986eb0bd 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -219,11 +219,10 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
                     "org.apache.axis.server.standalone.StandaloneAxisServer",
                     (String[])args.toArray(new String[args.size()]),
                     workDir,
-                    new AxisServerStartAction(actualPort, adminClient,
+                    new AxisServerProcessControl(actualPort, adminClient,
                             (File[])deployments.toArray(new File[deployments.size()]),
-                            isDebug() || foreground ? Integer.MAX_VALUE : 20000),
-                    new AxisServerStopAction(adminClient,
-                            (File[])undeployments.toArray(new File[undeployments.size()])));
+                            (File[])undeployments.toArray(new File[undeployments.size()]),
+                            isDebug() || foreground ? Integer.MAX_VALUE : 20000));
         } catch (Exception ex) {
             throw new MojoFailureException("Failed to start server", ex);
         }
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java b/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
index cfbebaea2..21f83c89c 100644
--- a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
+++ b/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
@@ -179,6 +179,13 @@ public abstract class AbstractWsdl2JavaMojo extends AbstractMojo {
      */
     private boolean helperGen;
     
+    /**
+     * 
+     * 
+     * @parameter default-value="false"
+     */
+    private boolean allowInvalidURL;
+    
     /**
      * The location of the deployment WSDD file to be generated. This parameter is ignored if
      * {@link #generate} is set to <code>client</code>. If this parameter is not specified, then no
@@ -269,7 +276,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 //        emitter.setQuiet(quiet);
         emitter.setTypeMappingVersion(typeMappingVersion);
         emitter.setNowrap(noWrapped);
-//        emitter.setAllowInvalidURL(allowInvalidURL);
+        emitter.setAllowInvalidURL(allowInvalidURL);
         emitter.setWrapArrays(wrapArrays);
 //        if (namespaceMappingFile != null) {
 //            emitter.setNStoPkg(namespaceMappingFile.toString());
diff --git a/samples/jms-sample/pom.xml b/samples/jms-sample/pom.xml
new file mode 100644
index 000000000..fb2038bf7
--- /dev/null
+++ b/samples/jms-sample/pom.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.axis</groupId>
+        <artifactId>samples</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>jms-sample</artifactId>
+    <name>JMS Sample</name>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-transport-jms</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>stock-sample</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.6.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <version>1.6.4</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-testutils</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-sources</goal>
+                        </goals>
+                        <configuration>
+                            <file>src/main/wsdl/GetQuote.wsdl</file>
+                            <generate>client</generate>
+                            <typeMappingVersion>1.1</typeMappingVersion>
+                            <deployScope>session</deployScope>
+                            <allowInvalidURL>true</allowInvalidURL>
+                            <mappings>
+                                <mapping>
+                                    <namespace>urn:xmltoday-delayed-quotes</namespace>
+                                    <package>samples.jms.stub.xmltoday_delayed_quotes</package>
+                                </mapping>
+                                <mapping>
+                                    <namespace>urn:xmltoday-delayed-quotes</namespace>
+                                    <package>samples.jms.stub.xmltoday_delayed_quotes</package>
+                                </mapping>
+                            </mappings>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <configuration>
+                            <portNames>
+                                <portName>test.brokerPort</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <resources>
+                                <resource>
+                                    <directory>src/test/conf</directory>
+                                    <filtering>true</filtering>
+                                </resource>
+                            </resources>
+                            <outputDirectory>${project.build.directory}/conf</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>maven-axis-server-plugin</artifactId>
+                <version>${project.version}</version>
+                <executions>
+                    <execution>
+                        <id>start-broker</id>
+                        <goals>
+                            <goal>start-daemon</goal>
+                        </goals>
+                        <configuration>
+                            <daemonClass>samples.jms.ActiveMQDaemon</daemonClass>
+                            <args>
+                                <arg>${test.brokerPort}</arg>
+                            </args>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-broker</id>
+                        <goals>
+                            <goal>stop-all</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <target>
+                                <echo message="Executing samples.jms.JMSTest ..."/>
+                                <java classname="samples.jms.JMSTest" fork="true" failonerror="true">
+                                    <classpath refid="maven.test.classpath"/>
+                                    <sysproperty key="axis.ServerConfigFile" file="src/main/wsdd/server-config.wsdd"/>
+                                    <arg value="-c"/>
+                                    <arg value="${project.build.directory}/conf/activemq-connection-factory.properties"/>
+                                    <arg value="-d"/>
+                                    <arg value="dynamicQueues/testQ"/>
+                                    <arg value="XXX"/>
+                                </java>
+                                <echo message="Executing samples.jms.dii.JMSURLTest ..."/>
+                                <java classname="samples.jms.dii.JMSURLTest" fork="true" failonerror="true">
+                                    <classpath refid="maven.test.classpath"/>
+                                    <sysproperty key="axis.ServerConfigFile" file="src/main/wsdd/server-config.wsdd"/>
+                                    <arg value="-c"/>
+                                    <arg value="${project.build.directory}/conf/activemq-connection-factory.properties"/>
+                                    <arg value="-d"/>
+                                    <arg value="dynamicQueues/testQ"/>
+                                    <arg value="-e"/>
+                                    <arg value="jms:/dynamicQueues/testQ?java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:${test.brokerPort}&amp;ConnectionFactoryJNDIName=ConnectionFactory"/>
+                                    <arg value="XXX"/>
+                                </java>
+                                <echo message="Executing samples.jms.stub.JMSURLStubTest ..."/>
+                                <java classname="samples.jms.stub.JMSURLStubTest" fork="true" failonerror="true">
+                                    <classpath refid="maven.test.classpath"/>
+                                    <sysproperty key="axis.ServerConfigFile" file="src/main/wsdd/server-config.wsdd"/>
+                                    <sysproperty key="axis.ClientConfigFile" file="src/main/wsdd/client-config.wsdd"/>
+                                    <arg value="-c"/>
+                                    <arg value="${project.build.directory}/conf/activemq-connection-factory.properties"/>
+                                    <arg value="-d"/>
+                                    <arg value="dynamicQueues/testQ"/>
+                                    <arg value="-e"/>
+                                    <arg value="jms:/dynamicQueues/testQ?java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory&amp;java.naming.provider.url=tcp://localhost:${test.brokerPort}&amp;ConnectionFactoryJNDIName=ConnectionFactory"/>
+                                    <arg value="XXX"/>
+                                </java>
+                            </target>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/distribution/src/main/files/samples/jms/JMSTest.java b/samples/jms-sample/src/main/java/samples/jms/JMSTest.java
similarity index 99%
rename from distribution/src/main/files/samples/jms/JMSTest.java
rename to samples/jms-sample/src/main/java/samples/jms/JMSTest.java
index 07389e0c0..45adbc657 100644
--- a/distribution/src/main/files/samples/jms/JMSTest.java
+++ b/samples/jms-sample/src/main/java/samples/jms/JMSTest.java
@@ -120,6 +120,7 @@ public static void main(String args[]) throws Exception {
             catch(AxisFault af)
             {
                 System.out.println(af.dumpToString());
+                System.exit(1);
             }
         }
 
diff --git a/distribution/src/main/files/samples/jms/dii/JMSURLTest.java b/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
similarity index 84%
rename from distribution/src/main/files/samples/jms/dii/JMSURLTest.java
rename to samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
index 31b12cd1e..409ba464e 100644
--- a/distribution/src/main/files/samples/jms/dii/JMSURLTest.java
+++ b/samples/jms-sample/src/main/java/samples/jms/dii/JMSURLTest.java
@@ -6,7 +6,6 @@
 import org.apache.axis.configuration.XMLStringProvider;
 import org.apache.axis.deployment.wsdd.WSDDConstants;
 import org.apache.axis.encoding.XMLType;
-import org.apache.axis.transport.jms.JMSConstants;
 import org.apache.axis.transport.jms.JMSTransport;
 import org.apache.axis.transport.jms.SimpleJMSListener;
 import org.apache.axis.utils.Options;
@@ -36,24 +35,7 @@ public class JMSURLTest {
             "</deployment>";
 
     // the JMS URL target endpoint address
-    static String sampleJmsUrl = "jms:/MyQ?" +
-                                 "vendor=JNDI" +
-                                 "&java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" +
-                                 "&java.naming.provider.url=file:///c:/JNDIStore" +
-                                 "&ConnectionFactoryJNDIName=MyCF" +
-                                 "&deliveryMode=persistent" +
-                                 "&priority=5" +
-                                 "&ttl=10000" +
-                                 "&debug=true";
-    /*
-    // example using Sonic
-    static String sampleJmsUrl = "jms:/SampleQ1?" +
-                                 "vendor=SonicMQ" +
-                                 "&brokerURL=localhost:2506" +
-                                 "&deliveryMode=persistent" +
-                                 "&priority=5" +
-                                 "&ttl=10000";
-    */
+    static String sampleJmsUrl;
 
     public static void main(String args[]) throws Exception {
         Options opts = new Options( args );
@@ -69,6 +51,11 @@ public static void main(String args[]) throws Exception {
         HashMap cfMap = SimpleJMSListener.createCFMap(opts);
         String destination = opts.isValueSet('d');
 
+        sampleJmsUrl = opts.isValueSet('e');
+        if (sampleJmsUrl == null) {
+            printUsage();
+        }
+        
         // create the jms listener
         SimpleJMSListener listener = new SimpleJMSListener(connectorMap,
                                                            cfMap,
@@ -92,6 +79,7 @@ public static void main(String args[]) throws Exception {
             catch(AxisFault af)
             {
                 System.out.println(af.dumpToString());
+                System.exit(1);
             }
         }
 
@@ -102,7 +90,7 @@ public static void main(String args[]) throws Exception {
         // note: this is optional, as all connectors will be closed upon exit
         JMSTransport.closeMatchingJMSConnectors(sampleJmsUrl, username, password);
 
-        System.exit(1);
+        System.exit(0);
     }
 
     public static Float getQuote(String ticker, String username, String password)
@@ -151,6 +139,7 @@ public static void printUsage()
         System.out.println("       -c connection factory properties filename");
         System.out.println("       -d destination");
         System.out.println("       -t topic [absence of -t indicates queue]");
+        System.out.println("       -e the JMS endpoint URL to use for the client");
         System.out.println();
         System.out.println("       -u username");
         System.out.println("       -w password");
diff --git a/distribution/src/main/files/samples/jms/stub/JMSURLStubTest.java b/samples/jms-sample/src/main/java/samples/jms/stub/JMSURLStubTest.java
similarity index 87%
rename from distribution/src/main/files/samples/jms/stub/JMSURLStubTest.java
rename to samples/jms-sample/src/main/java/samples/jms/stub/JMSURLStubTest.java
index 58814a4ca..be4402dad 100644
--- a/distribution/src/main/files/samples/jms/stub/JMSURLStubTest.java
+++ b/samples/jms-sample/src/main/java/samples/jms/stub/JMSURLStubTest.java
@@ -25,6 +25,8 @@
 import junit.framework.AssertionFailedError;
 import junit.framework.TestCase;
 
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.rmi.RemoteException;
 
 import javax.xml.rpc.ServiceException;
@@ -44,17 +46,23 @@ public JMSURLStubTest(String name) {
         super(name);
     }
 
-    public static Float getQuote(String ticker) throws AxisFault {
+    public static Float getQuote(String endptAddr, String ticker) throws AxisFault {
         float quote = -1.0F;
 
         GetQuoteServiceLocator locator = new GetQuoteServiceLocator();
         GetQuote getQuote;
 
+        if (endptAddr == null) {
+            endptAddr = locator.getGetQuoteAddress();
+        }
+        
         try {
-            getQuote = locator.getGetQuote();
+            getQuote = locator.getGetQuote(new URL(endptAddr));
         }
         catch (ServiceException e) {
             throw new AxisFault("JAX-RPC ServiceException caught: ", e);
+        } catch (MalformedURLException e) {
+            throw new AxisFault("MalformedURLException caught: ", e);
         }
         assertTrue("getQuote is null", getQuote != null);
 
@@ -64,7 +72,6 @@ public static Float getQuote(String ticker) throws AxisFault {
 
             // close matching connectors
             // note: this is optional, as all connectors will be closed upon exit
-            String endptAddr = locator.getGetQuoteAddress();
             JMSTransport.closeMatchingJMSConnectors(endptAddr, null, null);
         }
         catch (RemoteException e) {
@@ -82,6 +89,7 @@ public static void printUsage()
         System.out.println("       -c connection factory properties filename");
         System.out.println("       -d destination");
         System.out.println("       -t topic [absence of -t indicates queue]");
+        System.out.println("       -e the JMS endpoint URL to use for the client");
         System.out.println();
         System.out.println("       -u username");
         System.out.println("       -w password");
@@ -110,6 +118,8 @@ public static void main(String[] args) throws Exception
         HashMap cfMap = SimpleJMSListener.createCFMap(opts);
         String destination = opts.isValueSet('d');
 
+        String endptAddr = opts.isValueSet('e');
+        
         args = opts.getRemainingArgs();
         if ( args == null || args.length == 0)
             printUsage();
@@ -129,17 +139,18 @@ public static void main(String[] args) throws Exception
         {
             try
             {
-                Float quote = stubTest.getQuote(args[i]);
+                Float quote = stubTest.getQuote(endptAddr, args[i]);
                 System.out.println(args[i] + ": " + quote);
             }
             catch(AxisFault af)
             {
                 System.out.println(af.dumpToString());
+                System.exit(1);
             }
         }
 
         listener.shutdown();
 
-        System.exit(1);
+        System.exit(0);
     }
 }
diff --git a/distribution/src/main/files/samples/jms/client-config.wsdd b/samples/jms-sample/src/main/wsdd/client-config.wsdd
similarity index 100%
rename from distribution/src/main/files/samples/jms/client-config.wsdd
rename to samples/jms-sample/src/main/wsdd/client-config.wsdd
diff --git a/distribution/src/main/files/samples/jms/server-config.wsdd b/samples/jms-sample/src/main/wsdd/server-config.wsdd
similarity index 100%
rename from distribution/src/main/files/samples/jms/server-config.wsdd
rename to samples/jms-sample/src/main/wsdd/server-config.wsdd
diff --git a/distribution/src/main/files/samples/jms/stub/GetQuote.wsdl b/samples/jms-sample/src/main/wsdl/GetQuote.wsdl
similarity index 100%
rename from distribution/src/main/files/samples/jms/stub/GetQuote.wsdl
rename to samples/jms-sample/src/main/wsdl/GetQuote.wsdl
diff --git a/samples/jms-sample/src/test/conf/activemq-connection-factory.properties b/samples/jms-sample/src/test/conf/activemq-connection-factory.properties
new file mode 100644
index 000000000..e00afa0de
--- /dev/null
+++ b/samples/jms-sample/src/test/conf/activemq-connection-factory.properties
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.apache.activemq.jndi.ActiveMQInitialContextFactory
+java.naming.provider.url=tcp://localhost:${test.brokerPort}
+transport.jms.ConnectionFactoryJNDIName=ConnectionFactory
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java b/samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java
similarity index 60%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java
rename to samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java
index 3dddd0790..ea790354e 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessStartAction.java
+++ b/samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java
@@ -16,21 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axis.tools.maven.server;
+package samples.jms;
 
-import org.codehaus.plexus.logging.Logger;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.axis.testutils.daemon.Daemon;
 
-/**
- * Action to be executed after a given process has been started. This is typically used to configure
- * the server process, e.g. to deploy services.
- * 
- * @author Andreas Veithen
- */
-public interface ProcessStartAction {
-    ProcessStartAction NOP = new ProcessStartAction() {
-        public void execute(Logger logger, Process process) throws Exception {
-        }
-    };
+public class ActiveMQDaemon implements Daemon {
+    private BrokerService broker;
     
-    void execute(Logger logger, Process process) throws Exception;
+    public void start(String[] args) throws Exception {
+        broker = BrokerFactory.createBroker("broker:(tcp://localhost:" + args[0] + ")?useJmx=false&persistent=false");
+        broker.start();
+    }
+
+    public void stop() throws Exception {
+        broker.stop();
+    }
 }
diff --git a/samples/pom.xml b/samples/pom.xml
index 92da41690..9c7d2908e 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -42,6 +42,7 @@
         <module>integrationguide-sample</module>
         <module>jaxm-sample</module>
         <module>jaxrpc-sample</module>
+        <module>jms-sample</module>
         <module>message-sample</module>
         <module>mtomstub-sample</module>
         <module>misc-sample</module>

From 27fb034a11d4cdfea6679702da8d1e02722da0a2 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 8 Dec 2012 18:25:02 +0000
Subject: [PATCH 005/133] Fixed some build issues.

---
 samples/jms-sample/pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/samples/jms-sample/pom.xml b/samples/jms-sample/pom.xml
index fb2038bf7..b63d9e3f0 100644
--- a/samples/jms-sample/pom.xml
+++ b/samples/jms-sample/pom.xml
@@ -50,14 +50,9 @@
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>5.6.0</version>
+            <version>5.4.3</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <version>1.6.4</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-testutils</artifactId>
@@ -167,7 +162,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target>
+                            <target unless="skipTests">
                                 <echo message="Executing samples.jms.JMSTest ..."/>
                                 <java classname="samples.jms.JMSTest" fork="true" failonerror="true">
                                     <classpath refid="maven.test.classpath"/>

From a170c458754dddb24b4d53b433c396c63798f332 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 09:45:08 +0000
Subject: [PATCH 006/133] Let maven-axis-server-plugin automatically add
 axis-standalone-server to the classpath so that it is no longer required to
 declare it as a dependency.

---
 axis-rt-transport-http-javanet/pom.xml        |   6 -
 integration/pom.xml                           |   6 -
 .../server/AbstractStartProcessMojo.java      | 133 +++++++++++++++++-
 .../tools/maven/server/StartDaemonMojo.java   |   2 +-
 .../tools/maven/server/StartProcessMojo.java  |   2 +-
 .../tools/maven/server/StartServerMojo.java   |  13 ++
 samples/addr-sample/pom.xml                   |   6 -
 samples/attachments-sample/pom.xml            |   5 -
 samples/bidbuy-sample/pom.xml                 |   5 -
 samples/encoding-sample/pom.xml               |   5 -
 samples/faults-sample/pom.xml                 |   5 -
 samples/handler-sample/pom.xml                |   5 -
 samples/jaxrpc-sample/pom.xml                 |   5 -
 samples/message-sample/pom.xml                |   5 -
 samples/misc-sample/pom.xml                   |   5 -
 samples/proxy-sample/pom.xml                  |   5 -
 samples/stock-sample/pom.xml                  |   5 -
 17 files changed, 142 insertions(+), 76 deletions(-)

diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
index d23c1c8e0..4a68e9089 100644
--- a/axis-rt-transport-http-javanet/pom.xml
+++ b/axis-rt-transport-http-javanet/pom.xml
@@ -51,12 +51,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>interop-mock</artifactId>
diff --git a/integration/pom.xml b/integration/pom.xml
index d61c89c9a..1875db263 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -43,12 +43,6 @@
             <artifactId>axis-codegen</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-testutils</artifactId>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
index 49bd75d32..7f7674871 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
@@ -21,19 +21,37 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
-import org.apache.maven.artifact.DependencyResolutionRequiredException;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactCollector;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.apache.maven.artifact.resolver.DebugResolutionListener;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
 import org.apache.maven.execution.MavenSession;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.artifact.InvalidDependencyVersionException;
 import org.apache.maven.toolchain.Toolchain;
 import org.apache.maven.toolchain.ToolchainManager;
+import org.codehaus.plexus.logging.LogEnabled;
+import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 
-public abstract class AbstractStartProcessMojo extends AbstractServerMojo {
+public abstract class AbstractStartProcessMojo extends AbstractServerMojo implements LogEnabled {
     /**
      * The maven project.
      *
@@ -52,6 +70,49 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo {
      */
     private MavenSession session;
     
+    /**
+     * @component
+     */
+    private MavenProjectBuilder projectBuilder;
+    
+    /**
+     * Local maven repository.
+     * 
+     * @parameter expression="${localRepository}"
+     * @required
+     * @readonly
+     */
+    private ArtifactRepository localRepository;
+    
+    /**
+     * Remote repositories.
+     * 
+     * @parameter expression="${project.remoteArtifactRepositories}"
+     * @required
+     * @readonly
+     */
+    private List remoteArtifactRepositories;
+    
+    /**
+     * @component
+     */
+    protected ArtifactFactory artifactFactory;
+    
+    /**
+     * @component
+     */
+    private ArtifactResolver artifactResolver;
+    
+    /**
+     * @component
+     */
+    private ArtifactCollector artifactCollector;
+    
+    /**
+     * @component
+     */
+    private ArtifactMetadataSource artifactMetadataSource;
+    
     /**
      * @component
      */
@@ -98,11 +159,71 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo {
      */
     private String argLine;
     
+    private Logger logger;
+    
+    public void enableLogging(Logger logger) {
+        this.logger = logger;
+    }
+    
     protected boolean isDebug() {
         return debug;
     }
 
-    protected void startJavaProcess(String description, String mainClass, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
+    private List/*<File>*/ buildClasspath(Set/*<Artifact>*/ additionalArtifacts) throws ProjectBuildingException, InvalidDependencyVersionException, ArtifactResolutionException, ArtifactNotFoundException {
+        final Log log = getLog();
+        
+        // We need dependencies in scope test. Since this is the largest scope, we don't need
+        // to do any additional filtering based on dependency scope.
+        Set projectDependencies = project.getArtifacts();
+        
+        final Set artifacts = new HashSet(projectDependencies);
+        
+        if (additionalArtifacts != null) {
+            for (Iterator it = additionalArtifacts.iterator(); it.hasNext(); ) {
+                Artifact a = (Artifact)it.next();
+                if (log.isDebugEnabled()) {
+                    log.debug("Resolving artifact to be added to classpath: " + a);
+                }
+                ArtifactFilter filter = new ArtifactFilter() {
+                    public boolean include(Artifact artifact) {
+                        String id = artifact.getDependencyConflictId();
+                        for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+                            if (id.equals(((Artifact)it.next()).getDependencyConflictId())) {
+                                return false;
+                            }
+                        }
+                        return true;
+                    }
+                };
+                MavenProject p = projectBuilder.buildFromRepository(a, remoteArtifactRepositories, localRepository);
+                if (filter.include(p.getArtifact())) {
+                    Set s = p.createArtifacts(artifactFactory, Artifact.SCOPE_RUNTIME, filter);
+                    artifacts.addAll(artifactCollector.collect(s,
+                            p.getArtifact(), p.getManagedVersionMap(),
+                            localRepository, remoteArtifactRepositories, artifactMetadataSource, filter,
+                            Collections.singletonList(new DebugResolutionListener(logger))).getArtifacts());
+                    artifacts.add(p.getArtifact());
+                }
+            }
+        }
+        
+        List/*<File>*/ cp = new ArrayList();
+        cp.add(project.getBuild().getTestOutputDirectory());
+        cp.add(project.getBuild().getOutputDirectory());
+        for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+            Artifact a = (Artifact)it.next();
+            if (a.getArtifactHandler().isAddedToClasspath()) {
+                if (a.getFile() == null) {
+                    artifactResolver.resolve(a, remoteArtifactRepositories, localRepository);
+                }
+                cp.add(a.getFile());
+            }
+        }
+        
+        return cp;
+    }
+    
+    protected final void startJavaProcess(String description, String mainClass, Set additionalDependencies, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
         // Locate java executable to use
@@ -120,9 +241,9 @@ protected void startJavaProcess(String description, String mainClass, String[] a
         // Get class path
         List classpath;
         try {
-            classpath = project.getTestClasspathElements();
-        } catch (DependencyResolutionRequiredException ex) {
-            throw new MojoExecutionException("Unexpected exception", ex);
+            classpath = buildClasspath(additionalDependencies);
+        } catch (Exception ex) {
+            throw new MojoExecutionException("Failed to build classpath", ex);
         }
         if (log.isDebugEnabled()) {
             log.debug("Class path elements: " + classpath);
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
index 286b57f03..3b95b18f0 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -72,6 +72,6 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         if (args != null) {
             System.arraycopy(args, 0, vmArgs, 2, args.length);
         }
-        startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", vmArgs, workDir, new DaemonProcessControl(controlPort));
+        startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", null, vmArgs, workDir, new DaemonProcessControl(controlPort));
     }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
index b9e5993e1..33935f8b4 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
@@ -57,7 +57,7 @@ public class StartProcessMojo extends AbstractStartProcessMojo {
 
     protected void doExecute() throws MojoExecutionException, MojoFailureException {
         workDir.mkdirs();
-        startJavaProcess(mainClass, mainClass, args != null ? args : new String[0], workDir, new ProcessControl() {
+        startJavaProcess(mainClass, mainClass, null, args != null ? args : new String[0], workDir, new ProcessControl() {
             public void initializeProcess(Logger logger, Process process) throws Exception {
             }
 
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index e986eb0bd..9edf7a6eb 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -22,7 +22,9 @@
 import java.io.IOException;
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -30,6 +32,7 @@
 
 import org.apache.axis.client.AdminClient;
 import org.apache.axis.deployment.wsdd.WSDDConstants;
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
@@ -47,6 +50,13 @@
  * @requiresDependencyResolution test
  */
 public class StartServerMojo extends AbstractStartProcessMojo {
+    /**
+     * @parameter default-value="${plugin.version}"
+     * @required
+     * @readonly
+     */
+    private String axisVersion;
+    
     /**
      * @parameter default-value="${project.build.directory}/axis-server"
      * @required
@@ -214,9 +224,12 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         try {
             AdminClient adminClient = new AdminClient(true);
             adminClient.setTargetEndpointAddress(new URL("http://localhost:" + actualPort + "/axis/services/AdminService"));
+            Set additionalDependencies = new HashSet();
+            additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis", "axis-standalone-server", axisVersion, Artifact.SCOPE_TEST, "jar"));
             startJavaProcess(
                     "Server on port " + actualPort,
                     "org.apache.axis.server.standalone.StandaloneAxisServer",
+                    additionalDependencies,
                     (String[])args.toArray(new String[args.size()]),
                     workDir,
                     new AxisServerProcessControl(actualPort, adminClient,
diff --git a/samples/addr-sample/pom.xml b/samples/addr-sample/pom.xml
index 4c859bfa6..6194ef949 100644
--- a/samples/addr-sample/pom.xml
+++ b/samples/addr-sample/pom.xml
@@ -38,12 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/attachments-sample/pom.xml b/samples/attachments-sample/pom.xml
index d4c434337..7cb2b3da6 100644
--- a/samples/attachments-sample/pom.xml
+++ b/samples/attachments-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/bidbuy-sample/pom.xml b/samples/bidbuy-sample/pom.xml
index 878bb3815..835d27fd4 100644
--- a/samples/bidbuy-sample/pom.xml
+++ b/samples/bidbuy-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/encoding-sample/pom.xml b/samples/encoding-sample/pom.xml
index d9edb8b7b..7821b8722 100644
--- a/samples/encoding-sample/pom.xml
+++ b/samples/encoding-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/faults-sample/pom.xml b/samples/faults-sample/pom.xml
index 2e07be096..ceaceca9e 100644
--- a/samples/faults-sample/pom.xml
+++ b/samples/faults-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/handler-sample/pom.xml b/samples/handler-sample/pom.xml
index 8e2f55979..ab4e7e5f7 100644
--- a/samples/handler-sample/pom.xml
+++ b/samples/handler-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/jaxrpc-sample/pom.xml b/samples/jaxrpc-sample/pom.xml
index c73141415..c4d2bd0bd 100644
--- a/samples/jaxrpc-sample/pom.xml
+++ b/samples/jaxrpc-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>stock-sample</artifactId>
diff --git a/samples/message-sample/pom.xml b/samples/message-sample/pom.xml
index d14d8d562..9721884d5 100644
--- a/samples/message-sample/pom.xml
+++ b/samples/message-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/misc-sample/pom.xml b/samples/misc-sample/pom.xml
index 5e16a465e..7dd9b8477 100644
--- a/samples/misc-sample/pom.xml
+++ b/samples/misc-sample/pom.xml
@@ -38,11 +38,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/proxy-sample/pom.xml b/samples/proxy-sample/pom.xml
index b54470db9..964fd727f 100644
--- a/samples/proxy-sample/pom.xml
+++ b/samples/proxy-sample/pom.xml
@@ -49,11 +49,6 @@
         	<version>${project.version}</version>
         	<scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/samples/stock-sample/pom.xml b/samples/stock-sample/pom.xml
index f6d1c8295..e924835a4 100644
--- a/samples/stock-sample/pom.xml
+++ b/samples/stock-sample/pom.xml
@@ -43,11 +43,6 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
-            <version>${project.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

From 86a2ef39dfe3a5ebe73d6ce991243ed66e0a234a Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 12:08:15 +0000
Subject: [PATCH 007/133] * Use the Daemon interface defined by commons-daemon
 instead of our own Daemon interface. * Improved the management of the child
 process lifecycle.

---
 .../axis/testutils/daemon/Launcher.java       |  56 ----------
 daemon-launcher/pom.xml                       |  50 +++++++++
 .../tools/daemon/ControlConnectionReader.java |  76 +++++++++++++
 .../axis/tools/daemon/DaemonContextImpl.java  |  38 +++++++
 .../apache/axis/tools/daemon/Launcher.java    | 101 ++++++++++++++++++
 .../axis/tools/daemon/LauncherException.java  |  11 +-
 maven/maven-axis-server-plugin/pom.xml        |  17 +++
 .../tools/maven/server/StartDaemonMojo.java   |  14 ++-
 pom.xml                                       |   6 ++
 samples/jms-sample/pom.xml                    |   5 +-
 .../test/java/samples/jms/ActiveMQDaemon.java |  15 ++-
 11 files changed, 322 insertions(+), 67 deletions(-)
 delete mode 100644 axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java
 create mode 100644 daemon-launcher/pom.xml
 create mode 100644 daemon-launcher/src/main/java/org/apache/axis/tools/daemon/ControlConnectionReader.java
 create mode 100644 daemon-launcher/src/main/java/org/apache/axis/tools/daemon/DaemonContextImpl.java
 create mode 100644 daemon-launcher/src/main/java/org/apache/axis/tools/daemon/Launcher.java
 rename axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java => daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java (77%)

diff --git a/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java b/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java
deleted file mode 100644
index 36bb2c6eb..000000000
--- a/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Launcher.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.axis.testutils.daemon;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.ServerSocket;
-import java.net.Socket;
-
-public class Launcher {
-    public static void main(String[] args) throws Exception {
-        String daemonClass = args[0];
-        int controlPort = Integer.parseInt(args[1]);
-        String[] daemonArgs = new String[args.length-2];
-        System.arraycopy(args, 2, daemonArgs, 0, args.length-2);
-        ServerSocket controlServerSocket = new ServerSocket();
-        controlServerSocket.bind(new InetSocketAddress(InetAddress.getByName("localhost"), controlPort));
-        Socket controlSocket = controlServerSocket.accept();
-        BufferedReader controlIn = new BufferedReader(new InputStreamReader(controlSocket.getInputStream(), "ASCII"));
-        Writer controlOut = new OutputStreamWriter(controlSocket.getOutputStream(), "ASCII");
-        Daemon daemon = (Daemon)Class.forName(daemonClass).newInstance();
-        daemon.start(daemonArgs);
-        controlOut.write("READY\r\n");
-        controlOut.flush();
-        String request = controlIn.readLine();
-        if (request == null) {
-            System.err.println("Control connection unexpectedly closed");
-        } else if (request.equals("STOP")) {
-            daemon.stop();
-            controlOut.write("STOPPED\r\n");
-            controlOut.flush();
-        } else {
-            System.err.println("Unexpected request: " + request);
-        }
-    }
-}
diff --git a/daemon-launcher/pom.xml b/daemon-launcher/pom.xml
new file mode 100644
index 000000000..20b600295
--- /dev/null
+++ b/daemon-launcher/pom.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.axis</groupId>
+        <artifactId>axis-project</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>daemon-launcher</artifactId>
+    <name>Daemon Launcher</name>
+    <description>
+        Used by maven-axis-server-plugin to launch a Commons Daemon implementation.
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>commons-daemon</groupId>
+            <artifactId>commons-daemon</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/ControlConnectionReader.java b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/ControlConnectionReader.java
new file mode 100644
index 000000000..da8f3417a
--- /dev/null
+++ b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/ControlConnectionReader.java
@@ -0,0 +1,76 @@
+/*
+ * 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.axis.tools.daemon;
+
+import java.io.BufferedReader;
+import java.io.Reader;
+import java.util.LinkedList;
+
+import org.apache.commons.daemon.Daemon;
+
+/**
+ * Reads messages from the control connection. The main purpose of this is to detect as soon as
+ * possible when the control connection is closed by the parent process and to terminate the child
+ * process if that is unexpected. To achieve this we need to read the messages eagerly and place
+ * them into a queue. In particular this covers the case where the child process has received a
+ * <tt>STOP</tt> message and {@link Daemon#stop()} or {@link Daemon#destroy()} hangs. In this case,
+ * if the parent process is terminated (or stops waiting for the <tt>STOPPED</tt> message and closes
+ * the control connection), we can stop the child process immediately.
+ * 
+ * @author Andreas Veithen
+ */
+final class ControlConnectionReader implements Runnable {
+    private final BufferedReader in;
+    private final LinkedList queue = new LinkedList();
+    private boolean expectClose;
+    
+    ControlConnectionReader(Reader in) {
+        this.in = new BufferedReader(in);
+    }
+    
+    synchronized String awaitMessage() throws InterruptedException {
+        while (queue.isEmpty()) {
+            wait();
+        }
+        return (String)queue.removeFirst();
+    }
+    
+    synchronized void expectClose() {
+        this.expectClose = true;
+    }
+    
+    public void run() {
+        try {
+            String message;
+            while ((message = in.readLine()) != null) {
+                synchronized (this) {
+                    queue.add(message);
+                    notify();
+                }
+            }
+            if (!expectClose) {
+                System.err.println("Control connection unexpectedly closed; terminating.");
+                System.exit(1);
+            }
+        } catch (Throwable ex) {
+            ex.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
diff --git a/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/DaemonContextImpl.java b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/DaemonContextImpl.java
new file mode 100644
index 000000000..414690a7e
--- /dev/null
+++ b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/DaemonContextImpl.java
@@ -0,0 +1,38 @@
+/*
+ * 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.axis.tools.daemon;
+
+import org.apache.commons.daemon.DaemonContext;
+import org.apache.commons.daemon.DaemonController;
+
+final class DaemonContextImpl implements DaemonContext {
+    private final String[] args;
+
+    public DaemonContextImpl(String[] args) {
+        this.args = args;
+    }
+
+    public DaemonController getController() {
+        throw new UnsupportedOperationException();
+    }
+
+    public String[] getArguments() {
+        return args;
+    }
+}
diff --git a/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/Launcher.java b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/Launcher.java
new file mode 100644
index 000000000..35c15f5b0
--- /dev/null
+++ b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/Launcher.java
@@ -0,0 +1,101 @@
+/*
+ * 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.axis.tools.daemon;
+
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.ServerSocket;
+import java.net.Socket;
+
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
+
+/**
+ * Main class to launch and control a {@link Daemon} implementation. This class is typically
+ * executed in a child JVM and allows the parent process to control the lifecycle of the daemon
+ * instance. The main method takes the following arguments:
+ * <ol>
+ * <li>The class name of the {@link Daemon} implementation.
+ * <li>A TCP port number to use for the control connection.
+ * </ol>
+ * All remaining arguments are passed to the {@link Daemon} implementation.
+ * <p>
+ * The class uses the following protocol to allow the parent process to control the lifecycle of the
+ * daemon:
+ * <ol>
+ * <li>The parent process spawns a new child JVM with this class as main class. It passes the class
+ * name of the {@link Daemon} implementation and the control port as arguments (see above).
+ * <li>The child process opens the specified TCP port and waits for the control connection to be
+ * established.
+ * <li>The parent process connects to the control port.
+ * <li>The child process {@link Daemon#init(DaemonContext) initializes} and {@link Daemon#start()
+ * starts} the daemon.
+ * <li>The child process sends a <tt>READY</tt> message over the control connection to the parent
+ * process.
+ * <li>When the parent process no longer needs the daemon, it sends a <tt>STOP</tt> message to the
+ * child process.
+ * <li>The child process {@link Daemon#stop() stops} and {@link Daemon#destroy() destroys} the
+ * daemon.
+ * <li>The child process sends a <tt>STOPPED</tt> message to the parent process, closes the control
+ * connection and terminates itself.
+ * <li>The parent process closes the control connection.
+ * </ol>
+ * 
+ * @author Andreas Veithen
+ */
+public class Launcher {
+    public static void main(String[] args) {
+        try {
+            String daemonClass = args[0];
+            int controlPort = Integer.parseInt(args[1]);
+            String[] daemonArgs = new String[args.length-2];
+            System.arraycopy(args, 2, daemonArgs, 0, args.length-2);
+            ServerSocket controlServerSocket = new ServerSocket();
+            controlServerSocket.bind(new InetSocketAddress(InetAddress.getByName("localhost"), controlPort));
+            Socket controlSocket = controlServerSocket.accept();
+            // We only accept a single connection; therefore we can close the ServerSocket here
+            controlServerSocket.close();
+            ControlConnectionReader controlIn = new ControlConnectionReader(new InputStreamReader(controlSocket.getInputStream(), "ASCII"));
+            new Thread(controlIn).start();
+            Writer controlOut = new OutputStreamWriter(controlSocket.getOutputStream(), "ASCII");
+            Daemon daemon = (Daemon)Class.forName(daemonClass).newInstance();
+            daemon.init(new DaemonContextImpl(daemonArgs));
+            daemon.start();
+            controlOut.write("READY\r\n");
+            controlOut.flush();
+            String request = controlIn.awaitMessage();
+            if (request.equals("STOP")) {
+                daemon.stop();
+                daemon.destroy();
+                controlIn.expectClose();
+                controlOut.write("STOPPED\r\n");
+                controlOut.flush();
+                System.exit(0);
+            } else {
+                throw new LauncherException("Unexpected request: " + request);
+            }
+        } catch (Throwable ex) {
+            ex.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
diff --git a/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java
similarity index 77%
rename from axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java
rename to daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java
index 4ac087046..5d177c273 100644
--- a/axis-testutils/src/main/java/org/apache/axis/testutils/daemon/Daemon.java
+++ b/daemon-launcher/src/main/java/org/apache/axis/tools/daemon/LauncherException.java
@@ -16,9 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axis.testutils.daemon;
+package org.apache.axis.tools.daemon;
 
-public interface Daemon {
-    void start(String[] args) throws Exception;
-    void stop() throws Exception;
+final class LauncherException extends Exception {
+    private static final long serialVersionUID = 9049901854635661634L;
+
+    public LauncherException(String msg) {
+        super(msg);
+    }
 }
diff --git a/maven/maven-axis-server-plugin/pom.xml b/maven/maven-axis-server-plugin/pom.xml
index 95b149834..099c4eacb 100644
--- a/maven/maven-axis-server-plugin/pom.xml
+++ b/maven/maven-axis-server-plugin/pom.xml
@@ -60,6 +60,23 @@
             <artifactId>maven-toolchain</artifactId>
             <version>1.0</version>
         </dependency>
+        
+        <!-- These dependencies are here merely to ensure that in the Axis build they are built
+             before this project. This is necessary because these artifacts may be loaded by
+             the plug-in at runtime and we need to make sure that they are available and that
+             we get the latest version. -->
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>daemon-launcher</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-standalone-server</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+        </dependency>
     </dependencies>
     <reporting>
         <plugins>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
index 3b95b18f0..fedcac2dd 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -21,7 +21,10 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.util.HashSet;
+import java.util.Set;
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 
@@ -33,6 +36,13 @@
  * @requiresDependencyResolution test
  */
 public class StartDaemonMojo extends AbstractStartProcessMojo {
+    /**
+     * @parameter default-value="${plugin.version}"
+     * @required
+     * @readonly
+     */
+    private String axisVersion;
+    
     /**
      * The daemon class.
      * 
@@ -72,6 +82,8 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         if (args != null) {
             System.arraycopy(args, 0, vmArgs, 2, args.length);
         }
-        startJavaProcess(daemonClass, "org.apache.axis.testutils.daemon.Launcher", null, vmArgs, workDir, new DaemonProcessControl(controlPort));
+        Set additionalDependencies = new HashSet();
+        additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis", "daemon-launcher", axisVersion, Artifact.SCOPE_TEST, "jar"));
+        startJavaProcess(daemonClass, "org.apache.axis.tools.daemon.Launcher", additionalDependencies, vmArgs, workDir, new DaemonProcessControl(controlPort));
     }
 }
diff --git a/pom.xml b/pom.xml
index 3029a347a..43ec7afc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,6 +79,7 @@
         <module>axis-testutils</module>
         <module>axis-tools</module>
         <module>axis-war</module>
+        <module>daemon-launcher</module>
         <module>distribution</module>
         <module>integration</module>
         <module>interop-mock</module>
@@ -131,6 +132,11 @@
                 <artifactId>commons-lang</artifactId>
                 <version>2.6</version>
             </dependency>
+            <dependency>
+                <groupId>commons-daemon</groupId>
+                <artifactId>commons-daemon</artifactId>
+                <version>1.0.10</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <prerequisites>
diff --git a/samples/jms-sample/pom.xml b/samples/jms-sample/pom.xml
index b63d9e3f0..485a45caa 100644
--- a/samples/jms-sample/pom.xml
+++ b/samples/jms-sample/pom.xml
@@ -54,9 +54,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-testutils</artifactId>
-            <version>${project.version}</version>
+            <groupId>commons-daemon</groupId>
+            <artifactId>commons-daemon</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java b/samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java
index ea790354e..db1978294 100644
--- a/samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java
+++ b/samples/jms-sample/src/test/java/samples/jms/ActiveMQDaemon.java
@@ -20,17 +20,26 @@
 
 import org.apache.activemq.broker.BrokerFactory;
 import org.apache.activemq.broker.BrokerService;
-import org.apache.axis.testutils.daemon.Daemon;
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
+import org.apache.commons.daemon.DaemonInitException;
 
 public class ActiveMQDaemon implements Daemon {
     private BrokerService broker;
     
-    public void start(String[] args) throws Exception {
-        broker = BrokerFactory.createBroker("broker:(tcp://localhost:" + args[0] + ")?useJmx=false&persistent=false");
+    public void init(DaemonContext context) throws DaemonInitException, Exception {
+        broker = BrokerFactory.createBroker("broker:(tcp://localhost:" + context.getArguments()[0] + ")?useJmx=false&persistent=false");
+    }
+
+    public void start() throws Exception {
         broker.start();
     }
 
     public void stop() throws Exception {
         broker.stop();
     }
+
+    public void destroy() {
+        broker = null;
+    }
 }

From 00847d6e706ce200029bc271afe1dde5b16198c2 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 13:32:22 +0000
Subject: [PATCH 008/133] Removed the start-process goal and always use a
 Daemon implementation. This ensures that the process is fully initialized
 when the integration tests start.

---
 .../tools/maven/server/StartProcessMojo.java  | 69 -------------------
 samples/transport-sample/pom.xml              |  9 ++-
 .../samples/transport/tcp/TCPListener.java    |  6 +-
 .../transport/tcp/TCPListenerDaemon.java      | 43 ++++++++++++
 4 files changed, 55 insertions(+), 72 deletions(-)
 delete mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
 create mode 100644 samples/transport-sample/src/test/java/samples/transport/tcp/TCPListenerDaemon.java

diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
deleted file mode 100644
index 33935f8b4..000000000
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartProcessMojo.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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.axis.tools.maven.server;
-
-import java.io.File;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.logging.Logger;
-
-/**
- * Start an arbitrary Java process.
- * 
- * @goal start-process
- * @phase pre-integration-test
- * @requiresDependencyResolution test
- */
-public class StartProcessMojo extends AbstractStartProcessMojo {
-    /**
-     * The main class.
-     * 
-     * @parameter
-     * @required
-     */
-    private String mainClass;
-    
-    /**
-     * The arguments to be passed to the main class.
-     * 
-     * @parameter
-     */
-    private String[] args;
-    
-    /**
-     * The working directory for the process.
-     * 
-     * @parameter default-value="${project.build.directory}/work"
-     * @required
-     */
-    private File workDir;
-
-    protected void doExecute() throws MojoExecutionException, MojoFailureException {
-        workDir.mkdirs();
-        startJavaProcess(mainClass, mainClass, null, args != null ? args : new String[0], workDir, new ProcessControl() {
-            public void initializeProcess(Logger logger, Process process) throws Exception {
-            }
-
-            public int shutdownProcess(Logger logger) throws Exception {
-                return RUNNING;
-            }
-        });
-    }
-}
diff --git a/samples/transport-sample/pom.xml b/samples/transport-sample/pom.xml
index 8d1b15524..591c975ad 100644
--- a/samples/transport-sample/pom.xml
+++ b/samples/transport-sample/pom.xml
@@ -44,6 +44,11 @@
             <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-daemon</groupId>
+            <artifactId>commons-daemon</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -84,10 +89,10 @@
                     <execution>
                         <id>start-server</id>
                         <goals>
-                            <goal>start-process</goal>
+                            <goal>start-daemon</goal>
                         </goals>
                         <configuration>
-                            <mainClass>samples.transport.tcp.TCPListener</mainClass>
+                            <daemonClass>samples.transport.tcp.TCPListenerDaemon</daemonClass>
                             <args>
                                 <arg>-p</arg>
                                 <arg>${test.functional.TCPListenerPort}</arg>
diff --git a/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java b/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java
index 35b517d4c..9035184df 100644
--- a/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java
+++ b/samples/transport-sample/src/main/java/samples/transport/tcp/TCPListener.java
@@ -59,7 +59,7 @@ public class TCPListener implements Runnable {
     private AxisEngine engine = null ;
 
     // becomes true when we want to quit
-    private boolean done = false;
+    private volatile boolean done = false;
 
     static final String wsdd =
             "<deployment xmlns=\"http://xml.apache.org/axis/wsdd/\" " +
@@ -115,6 +115,10 @@ public void run () {
         }
     }
 
+    public void stop() throws IOException {
+        done = true;
+        srvSocket.close();
+    }
 
     public class SocketHandler implements Runnable {
         private Socket socket;
diff --git a/samples/transport-sample/src/test/java/samples/transport/tcp/TCPListenerDaemon.java b/samples/transport-sample/src/test/java/samples/transport/tcp/TCPListenerDaemon.java
new file mode 100644
index 000000000..9ceeee1bc
--- /dev/null
+++ b/samples/transport-sample/src/test/java/samples/transport/tcp/TCPListenerDaemon.java
@@ -0,0 +1,43 @@
+/*
+ * 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 samples.transport.tcp;
+
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
+import org.apache.commons.daemon.DaemonInitException;
+
+public class TCPListenerDaemon implements Daemon {
+    private TCPListener listener;
+
+    public void init(DaemonContext context) throws DaemonInitException, Exception {
+        listener = new TCPListener(context.getArguments());
+    }
+
+    public void start() throws Exception {
+        new Thread(listener).start();
+    }
+
+    public void stop() throws Exception {
+        listener.stop();
+    }
+
+    public void destroy() {
+        listener = null;
+    }
+}

From 0b9f02ca6db140badabdccaac9fb8b9e1976cb73 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 17:22:05 +0000
Subject: [PATCH 009/133] Added support for the deprecated languageSpecificType
 attribute.

---
 .../axis/model/wsdd/WSDDExtendedMetaData.java | 37 ++++++++++++
 .../org/apache/axis/model/wsdd/WSDDUtil.java  | 58 ++++++++++++++++++-
 .../axis/model/wsdd/DeprecationTest.java      | 35 +++++++++++
 .../axis/model/wsdd/languageSpecificType.wsdd |  8 +++
 4 files changed, 136 insertions(+), 2 deletions(-)
 create mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java
 create mode 100644 axis-model/src/test/java/org/apache/axis/model/wsdd/DeprecationTest.java
 create mode 100644 axis-model/src/test/resources/org/apache/axis/model/wsdd/languageSpecificType.wsdd

diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java
new file mode 100644
index 000000000..1f5f4726e
--- /dev/null
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDExtendedMetaData.java
@@ -0,0 +1,37 @@
+/*
+ * 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.axis.model.wsdd;
+
+import org.apache.axis.model.wsdd.impl.WSDDPackageImpl;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.BasicExtendedMetaData;
+
+final class WSDDExtendedMetaData extends BasicExtendedMetaData {
+    private static final EClass mapping = WSDDPackageImpl.eINSTANCE.getMapping();
+    
+    public EStructuralFeature getAttribute(EClass eClass, String namespace, String name) {
+        if (mapping.isSuperTypeOf(eClass) && namespace == null && name.equals("languageSpecificType")) {
+            // TODO: emit warning
+            return mapping.getEStructuralFeature(WSDDPackageImpl.MAPPING__TYPE);
+        } else {
+            return super.getAttribute(eClass, namespace, name);
+        }
+    }
+}
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDUtil.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDUtil.java
index 47e5e6f8f..86d71e57c 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDUtil.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDUtil.java
@@ -19,31 +19,85 @@
 package org.apache.axis.model.wsdd;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Writer;
+import java.net.URL;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.axis.components.logger.LogFactory;
+import org.apache.axis.configuration.DefaultConfiguration;
 import org.apache.axis.model.util.AxisXMLResource;
 import org.apache.axis.model.wsdd.impl.WSDDPackageImpl;
-import org.eclipse.emf.ecore.util.ExtendedMetaData;
+import org.apache.commons.logging.Log;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xmi.util.XMLProcessor;
 import org.xml.sax.InputSource;
 
 public final class WSDDUtil {
+    private static final Log log = LogFactory.getLog(WSDDUtil.class.getName());
+    
     private WSDDUtil() {}
 
     public static Deployment load(InputSource is) throws IOException {
         WSDDPackageImpl.eINSTANCE.eClass();
         AxisXMLResource resource = new AxisXMLResource();
         Map options = new HashMap();
-        options.put(XMLResource.OPTION_EXTENDED_META_DATA, ExtendedMetaData.INSTANCE);
+        options.put(XMLResource.OPTION_EXTENDED_META_DATA, new WSDDExtendedMetaData());
         options.put(AxisXMLResource.OPTION_IGNORE_NAMESPACE_FOR_UNQUALIFIED_QNAME, WSDDPackageImpl.eNS_URI);
         resource.load(is, options);
         return (Deployment)resource.getContents().get(0);        
     }
     
+    /**
+     * Load the default Axis configuration. This method implements the same algorithm as
+     * {@link DefaultConfiguration}.
+     * 
+     * @param cl
+     *            the class loader to load the configuration from
+     * @param type
+     *            the type of configuration (<tt>client</tt> or <tt>server</tt>)
+     * @return the default configuration
+     * @throws IOException
+     */
+    public static Deployment buildDefaultConfiguration(ClassLoader cl, String type) throws IOException {
+        // Load the base configuration
+        String resourceName = "org/apache/axis/" + type + "/" + type + "-config.wsdd";
+        InputStream in = cl.getResourceAsStream(resourceName);
+        if (in == null) {
+            throw new IOException("Resource " + resourceName + " not found");
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("Loading resource " + resourceName);
+        }
+        Deployment deployment;
+        try {
+            deployment = WSDDUtil.load(new InputSource(in));
+        } finally {
+            in.close();
+        }
+        
+        // Discover and load additional default configuration fragments
+        resourceName = "META-INF/axis/default-" + type + "-config.wsdd";
+        Enumeration resources = cl.getResources(resourceName);
+        while (resources.hasMoreElements()) {
+            URL url = (URL)resources.nextElement();
+            if (log.isDebugEnabled()) {
+                log.debug("Loading " + url);
+            }
+            in = url.openStream();
+            try {
+                deployment.merge(WSDDUtil.load(new InputSource(in)));
+            } finally {
+                in.close();
+            }
+        }
+        
+        return deployment;
+    }
+    
     public static void save(Deployment deployment, OutputStream out) throws IOException {
         AxisXMLResource resource = new AxisXMLResource();
         XMLProcessor processor = new XMLProcessor();
diff --git a/axis-model/src/test/java/org/apache/axis/model/wsdd/DeprecationTest.java b/axis-model/src/test/java/org/apache/axis/model/wsdd/DeprecationTest.java
new file mode 100644
index 000000000..cd805b4c4
--- /dev/null
+++ b/axis-model/src/test/java/org/apache/axis/model/wsdd/DeprecationTest.java
@@ -0,0 +1,35 @@
+/*
+ * 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.axis.model.wsdd;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.axis.deployment.wsdd.WSDDConstants;
+import org.xml.sax.InputSource;
+
+public class DeprecationTest extends TestCase {
+    public void testLanguageSpecificType() throws Exception {
+        Deployment deployment = WSDDUtil.load(new InputSource(DeprecationTest.class.getResource("languageSpecificType.wsdd").toString()));
+        Service service = (Service)deployment.getServices().get(0);
+        BeanMapping beanMapping = (BeanMapping)service.getBeanMappings().get(0);
+        assertEquals(new QName(WSDDConstants.URI_WSDD_JAVA, "test.rpc.Bean"), beanMapping.getType());
+    }
+}
diff --git a/axis-model/src/test/resources/org/apache/axis/model/wsdd/languageSpecificType.wsdd b/axis-model/src/test/resources/org/apache/axis/model/wsdd/languageSpecificType.wsdd
new file mode 100644
index 000000000..13fcaf49f
--- /dev/null
+++ b/axis-model/src/test/resources/org/apache/axis/model/wsdd/languageSpecificType.wsdd
@@ -0,0 +1,8 @@
+<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+    <service name="IF3SOAP" provider="Handler">
+        <parameter name="allowedMethods" value="getBeanById,getAllBeans,getAllCategories,getBeansByCategory,getBeansByDate,getBeansByExpression,getXMLForBean"/>
+        <parameter name="className" value="test.rpc.IF3SOAPImpl"/>
+        <parameter name="handlerClass" value="org.apache.axis.providers.java.RPCProvider"/>
+        <beanMapping qname="myNS:Bean" xmlns:myNS="urn:IF3SOAP" languageSpecificType="java:test.rpc.Bean"/>
+    </service>
+</deployment>
\ No newline at end of file

From c8c4a20860f206d3be4e9883d1cd245d795d6bff Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 18:17:44 +0000
Subject: [PATCH 010/133] Added support for globally defined type mappings.

---
 axis-model/model/wsdd.ecore                   |  54 +--
 .../apache/axis/model/wsdd/Deployment.java    |   2 +-
 .../axis/model/wsdd/MappingContainer.java     |  77 ++++
 .../org/apache/axis/model/wsdd/Service.java   |  53 +--
 .../apache/axis/model/wsdd/WSDDFactory.java   |   9 +
 .../axis/model/wsdd/impl/DeploymentImpl.java  |   4 +-
 .../model/wsdd/impl/MappingContainerImpl.java | 223 +++++++++++
 .../axis/model/wsdd/impl/ServiceImpl.java     | 171 +++++----
 .../axis/model/wsdd/impl/WSDDFactoryImpl.java |  11 +
 .../axis/model/wsdd/impl/WSDDPackageImpl.java | 363 ++++++++++++------
 axis-model/src/test/wsdd/bidbuy.wsdd          |  23 ++
 11 files changed, 713 insertions(+), 277 deletions(-)
 create mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java
 create mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java
 create mode 100644 axis-model/src/test/wsdd/bidbuy.wsdd

diff --git a/axis-model/model/wsdd.ecore b/axis-model/model/wsdd.ecore
index b45cc822f..42df32adb 100644
--- a/axis-model/model/wsdd.ecore
+++ b/axis-model/model/wsdd.ecore
@@ -25,6 +25,32 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="innerType" eType="ecore:EDataType xml.ecore#//QName"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="BeanMapping" eSuperTypes="#//Mapping"/>
+  <eClassifiers xsi:type="ecore:EClass" name="MappingContainer">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="typeMappings" upperBound="-1"
+        eType="#//TypeMapping" containment="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="typeMapping"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="beanMappings" upperBound="-1"
+        eType="#//BeanMapping" containment="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="beanMapping"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="arrayMappings" upperBound="-1"
+        eType="#//ArrayMapping" containment="true">
+      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
+        <details key="kind" value="element"/>
+        <details key="name" value="arrayMapping"/>
+        <details key="namespace" value="##targetNamespace"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="OperationParameter">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="qname" eType="ecore:EDataType xml.ecore#//QName"/>
@@ -118,7 +144,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="pivot" eType="ecore:EDataType xml.ecore#//QName"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Service" eSuperTypes="#//DeployableItem">
+  <eClassifiers xsi:type="ecore:EClass" name="Service" eSuperTypes="#//DeployableItem #//MappingContainer">
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="provider" eType="ecore:EDataType xml.ecore#//QName"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="use" eType="ecore:EDataType soap.ecore#//Use"/>
@@ -139,32 +165,8 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="typeMappings" upperBound="-1"
-        eType="#//TypeMapping" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="typeMapping"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="beanMappings" upperBound="-1"
-        eType="#//BeanMapping" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="beanMapping"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="arrayMappings" upperBound="-1"
-        eType="#//ArrayMapping" containment="true">
-      <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
-        <details key="kind" value="element"/>
-        <details key="name" value="arrayMapping"/>
-        <details key="namespace" value="##targetNamespace"/>
-      </eAnnotations>
-    </eStructuralFeatures>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Deployment">
+  <eClassifiers xsi:type="ecore:EClass" name="Deployment" eSuperTypes="#//MappingContainer">
     <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
       <details key="name" value="deployment"/>
       <details key="kind" value="element"/>
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
index 827362b8a..3efe9fb8d 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
@@ -27,7 +27,7 @@
  * @model extendedMetaData="name='deployment' kind='element'"
  * @generated
  */
-public interface Deployment {
+public interface Deployment extends MappingContainer {
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
      * <!-- begin-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java
new file mode 100644
index 000000000..93f83221e
--- /dev/null
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java
@@ -0,0 +1,77 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd;
+
+import java.util.List;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Mapping Container</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.MappingContainer#getTypeMappings <em>Type Mappings</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.MappingContainer#getBeanMappings <em>Bean Mappings</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.MappingContainer#getArrayMappings <em>Array Mappings</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @model
+ * @generated
+ */
+public interface MappingContainer {
+    /**
+     * Returns the value of the '<em><b>Type Mappings</b></em>' containment reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.TypeMapping}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Type Mappings</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Type Mappings</em>' containment reference list.
+     * @model type="org.apache.axis.model.wsdd.TypeMapping" containment="true"
+     *        extendedMetaData="kind='element' name='typeMapping' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getTypeMappings();
+
+    /**
+     * Returns the value of the '<em><b>Bean Mappings</b></em>' containment reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.BeanMapping}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Bean Mappings</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Bean Mappings</em>' containment reference list.
+     * @model type="org.apache.axis.model.wsdd.BeanMapping" containment="true"
+     *        extendedMetaData="kind='element' name='beanMapping' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getBeanMappings();
+
+    /**
+     * Returns the value of the '<em><b>Array Mappings</b></em>' containment reference list.
+     * The list contents are of type {@link org.apache.axis.model.wsdd.ArrayMapping}.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Array Mappings</em>' containment reference list isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Array Mappings</em>' containment reference list.
+     * @model type="org.apache.axis.model.wsdd.ArrayMapping" containment="true"
+     *        extendedMetaData="kind='element' name='arrayMapping' namespace='##targetNamespace'"
+     * @generated
+     */
+    List getArrayMappings();
+
+} // MappingContainer
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
index e15265256..3146ae25c 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
@@ -25,16 +25,13 @@
  *   <li>{@link org.apache.axis.model.wsdd.Service#getStyle <em>Style</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getNamespaces <em>Namespaces</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Service#getOperations <em>Operations</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getTypeMappings <em>Type Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getBeanMappings <em>Bean Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getArrayMappings <em>Array Mappings</em>}</li>
  * </ul>
  * </p>
  *
  * @model
  * @generated
  */
-public interface Service extends DeployableItem {
+public interface Service extends DeployableItem, MappingContainer {
     /**
      * Returns the value of the '<em><b>Name</b></em>' attribute.
      * <!-- begin-user-doc -->
@@ -166,52 +163,4 @@ public interface Service extends DeployableItem {
      */
     List getOperations();
 
-    /**
-     * Returns the value of the '<em><b>Type Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.TypeMapping}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type Mappings</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.TypeMapping" containment="true"
-     *        extendedMetaData="kind='element' name='typeMapping' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getTypeMappings();
-
-    /**
-     * Returns the value of the '<em><b>Bean Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.BeanMapping}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Bean Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Bean Mappings</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.BeanMapping" containment="true"
-     *        extendedMetaData="kind='element' name='beanMapping' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getBeanMappings();
-
-    /**
-     * Returns the value of the '<em><b>Array Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.ArrayMapping}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Array Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Array Mappings</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.ArrayMapping" containment="true"
-     *        extendedMetaData="kind='element' name='arrayMapping' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getArrayMappings();
-
 } // Service
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
index aea67e665..466fb79a0 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
@@ -66,6 +66,15 @@ public interface WSDDFactory {
      */
     BeanMapping createBeanMapping();
 
+    /**
+     * Returns a new object of class '<em>Mapping Container</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Mapping Container</em>'.
+     * @generated
+     */
+    MappingContainer createMappingContainer();
+
     /**
      * Returns a new object of class '<em>Operation Parameter</em>'.
      * <!-- begin-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
index 6f6452a19..aa4fae9d9 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
@@ -22,8 +22,6 @@
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
 import org.eclipse.emf.ecore.util.BasicInternalEList;
 import org.eclipse.emf.ecore.util.InternalEList;
 
@@ -44,7 +42,7 @@
  *
  * @generated
  */
-public class DeploymentImpl extends EObjectImpl implements Deployment {
+public class DeploymentImpl extends MappingContainerImpl implements Deployment {
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java
new file mode 100644
index 000000000..ec705b905
--- /dev/null
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java
@@ -0,0 +1,223 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.apache.axis.model.wsdd.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.axis.model.wsdd.ArrayMapping;
+import org.apache.axis.model.wsdd.BeanMapping;
+import org.apache.axis.model.wsdd.MappingContainer;
+import org.apache.axis.model.wsdd.TypeMapping;
+
+import org.eclipse.emf.common.notify.NotificationChain;
+
+import org.eclipse.emf.common.util.EList;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+
+import org.eclipse.emf.ecore.impl.EObjectImpl;
+
+import org.eclipse.emf.ecore.util.BasicInternalEList;
+import org.eclipse.emf.ecore.util.InternalEList;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Mapping Container</b></em>'.
+ * <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl#getTypeMappings <em>Type Mappings</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl#getBeanMappings <em>Bean Mappings</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl#getArrayMappings <em>Array Mappings</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class MappingContainerImpl extends EObjectImpl implements MappingContainer {
+    /**
+     * The cached value of the '{@link #getTypeMappings() <em>Type Mappings</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getTypeMappings()
+     * @generated
+     * @ordered
+     */
+    protected EList typeMappings;
+
+    /**
+     * The cached value of the '{@link #getBeanMappings() <em>Bean Mappings</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getBeanMappings()
+     * @generated
+     * @ordered
+     */
+    protected EList beanMappings;
+
+    /**
+     * The cached value of the '{@link #getArrayMappings() <em>Array Mappings</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getArrayMappings()
+     * @generated
+     * @ordered
+     */
+    protected EList arrayMappings;
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected MappingContainerImpl() {
+        super();
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    protected EClass eStaticClass() {
+        return WSDDPackageImpl.Literals.MAPPING_CONTAINER;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getTypeMappings() {
+        if (typeMappings == null) {
+            typeMappings = new BasicInternalEList(TypeMapping.class);
+        }
+        return typeMappings;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getBeanMappings() {
+        if (beanMappings == null) {
+            beanMappings = new BasicInternalEList(BeanMapping.class);
+        }
+        return beanMappings;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public List getArrayMappings() {
+        if (arrayMappings == null) {
+            arrayMappings = new BasicInternalEList(ArrayMapping.class);
+        }
+        return arrayMappings;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+        switch (featureID) {
+            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
+                return ((InternalEList)getTypeMappings()).basicRemove(otherEnd, msgs);
+            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
+                return ((InternalEList)getBeanMappings()).basicRemove(otherEnd, msgs);
+            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
+                return ((InternalEList)getArrayMappings()).basicRemove(otherEnd, msgs);
+        }
+        return super.eInverseRemove(otherEnd, featureID, msgs);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Object eGet(int featureID, boolean resolve, boolean coreType) {
+        switch (featureID) {
+            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
+                return getTypeMappings();
+            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
+                return getBeanMappings();
+            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
+                return getArrayMappings();
+        }
+        return super.eGet(featureID, resolve, coreType);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eSet(int featureID, Object newValue) {
+        switch (featureID) {
+            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
+                getTypeMappings().clear();
+                getTypeMappings().addAll((Collection)newValue);
+                return;
+            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
+                getBeanMappings().clear();
+                getBeanMappings().addAll((Collection)newValue);
+                return;
+            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
+                getArrayMappings().clear();
+                getArrayMappings().addAll((Collection)newValue);
+                return;
+        }
+        super.eSet(featureID, newValue);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void eUnset(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
+                getTypeMappings().clear();
+                return;
+            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
+                getBeanMappings().clear();
+                return;
+            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
+                getArrayMappings().clear();
+                return;
+        }
+        super.eUnset(featureID);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public boolean eIsSet(int featureID) {
+        switch (featureID) {
+            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
+                return typeMappings != null && !typeMappings.isEmpty();
+            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
+                return beanMappings != null && !beanMappings.isEmpty();
+            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
+                return arrayMappings != null && !arrayMappings.isEmpty();
+        }
+        return super.eIsSet(featureID);
+    }
+
+} //MappingContainerImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
index 6218a74a0..b9e2c8506 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
@@ -14,6 +14,7 @@
 import org.apache.axis.constants.Use;
 import org.apache.axis.model.wsdd.ArrayMapping;
 import org.apache.axis.model.wsdd.BeanMapping;
+import org.apache.axis.model.wsdd.MappingContainer;
 import org.apache.axis.model.wsdd.Operation;
 import org.apache.axis.model.wsdd.Service;
 import org.apache.axis.model.wsdd.TypeMapping;
@@ -35,21 +36,51 @@
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getTypeMappings <em>Type Mappings</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getBeanMappings <em>Bean Mappings</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getArrayMappings <em>Array Mappings</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getName <em>Name</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getProvider <em>Provider</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getUse <em>Use</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getStyle <em>Style</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getNamespaces <em>Namespaces</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getOperations <em>Operations</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getTypeMappings <em>Type Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getBeanMappings <em>Bean Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getArrayMappings <em>Array Mappings</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
 public class ServiceImpl extends DeployableItemImpl implements Service {
+    /**
+     * The cached value of the '{@link #getTypeMappings() <em>Type Mappings</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getTypeMappings()
+     * @generated
+     * @ordered
+     */
+    protected EList typeMappings;
+
+    /**
+     * The cached value of the '{@link #getBeanMappings() <em>Bean Mappings</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getBeanMappings()
+     * @generated
+     * @ordered
+     */
+    protected EList beanMappings;
+
+    /**
+     * The cached value of the '{@link #getArrayMappings() <em>Array Mappings</em>}' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getArrayMappings()
+     * @generated
+     * @ordered
+     */
+    protected EList arrayMappings;
+
     /**
      * The default value of the '{@link #getName() <em>Name</em>}' attribute.
      * <!-- begin-user-doc -->
@@ -150,36 +181,6 @@ public class ServiceImpl extends DeployableItemImpl implements Service {
      */
     protected EList operations;
 
-    /**
-     * The cached value of the '{@link #getTypeMappings() <em>Type Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTypeMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList typeMappings;
-
-    /**
-     * The cached value of the '{@link #getBeanMappings() <em>Bean Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getBeanMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList beanMappings;
-
-    /**
-     * The cached value of the '{@link #getArrayMappings() <em>Array Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getArrayMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList arrayMappings;
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -337,14 +338,14 @@ public List getArrayMappings() {
      */
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case WSDDPackageImpl.SERVICE__OPERATIONS:
-                return ((InternalEList)getOperations()).basicRemove(otherEnd, msgs);
             case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
                 return ((InternalEList)getTypeMappings()).basicRemove(otherEnd, msgs);
             case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
                 return ((InternalEList)getBeanMappings()).basicRemove(otherEnd, msgs);
             case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
                 return ((InternalEList)getArrayMappings()).basicRemove(otherEnd, msgs);
+            case WSDDPackageImpl.SERVICE__OPERATIONS:
+                return ((InternalEList)getOperations()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
     }
@@ -356,6 +357,12 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
      */
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
+                return getTypeMappings();
+            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
+                return getBeanMappings();
+            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
+                return getArrayMappings();
             case WSDDPackageImpl.SERVICE__NAME:
                 return getName();
             case WSDDPackageImpl.SERVICE__PROVIDER:
@@ -368,12 +375,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 return getNamespaces();
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 return getOperations();
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                return getTypeMappings();
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                return getBeanMappings();
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                return getArrayMappings();
         }
         return super.eGet(featureID, resolve, coreType);
     }
@@ -385,6 +386,18 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
      */
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
+                getTypeMappings().clear();
+                getTypeMappings().addAll((Collection)newValue);
+                return;
+            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
+                getBeanMappings().clear();
+                getBeanMappings().addAll((Collection)newValue);
+                return;
+            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
+                getArrayMappings().clear();
+                getArrayMappings().addAll((Collection)newValue);
+                return;
             case WSDDPackageImpl.SERVICE__NAME:
                 setName((String)newValue);
                 return;
@@ -405,18 +418,6 @@ public void eSet(int featureID, Object newValue) {
                 getOperations().clear();
                 getOperations().addAll((Collection)newValue);
                 return;
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                getTypeMappings().clear();
-                getTypeMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                getBeanMappings().clear();
-                getBeanMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                getArrayMappings().clear();
-                getArrayMappings().addAll((Collection)newValue);
-                return;
         }
         super.eSet(featureID, newValue);
     }
@@ -428,6 +429,15 @@ public void eSet(int featureID, Object newValue) {
      */
     public void eUnset(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
+                getTypeMappings().clear();
+                return;
+            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
+                getBeanMappings().clear();
+                return;
+            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
+                getArrayMappings().clear();
+                return;
             case WSDDPackageImpl.SERVICE__NAME:
                 setName(NAME_EDEFAULT);
                 return;
@@ -446,15 +456,6 @@ public void eUnset(int featureID) {
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 getOperations().clear();
                 return;
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                getTypeMappings().clear();
-                return;
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                getBeanMappings().clear();
-                return;
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                getArrayMappings().clear();
-                return;
         }
         super.eUnset(featureID);
     }
@@ -466,6 +467,12 @@ public void eUnset(int featureID) {
      */
     public boolean eIsSet(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
+                return typeMappings != null && !typeMappings.isEmpty();
+            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
+                return beanMappings != null && !beanMappings.isEmpty();
+            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
+                return arrayMappings != null && !arrayMappings.isEmpty();
             case WSDDPackageImpl.SERVICE__NAME:
                 return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
             case WSDDPackageImpl.SERVICE__PROVIDER:
@@ -478,16 +485,44 @@ public boolean eIsSet(int featureID) {
                 return namespaces != null && !namespaces.isEmpty();
             case WSDDPackageImpl.SERVICE__OPERATIONS:
                 return operations != null && !operations.isEmpty();
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                return typeMappings != null && !typeMappings.isEmpty();
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                return beanMappings != null && !beanMappings.isEmpty();
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                return arrayMappings != null && !arrayMappings.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
+        if (baseClass == MappingContainer.class) {
+            switch (derivedFeatureID) {
+                case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: return WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS;
+                case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: return WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS;
+                case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: return WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS;
+                default: return -1;
+            }
+        }
+        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
+        if (baseClass == MappingContainer.class) {
+            switch (baseFeatureID) {
+                case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS: return WSDDPackageImpl.SERVICE__TYPE_MAPPINGS;
+                case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS: return WSDDPackageImpl.SERVICE__BEAN_MAPPINGS;
+                case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS: return WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS;
+                default: return -1;
+            }
+        }
+        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
index 78acc4eaf..41abfb8ab 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
@@ -72,6 +72,7 @@ public EObject create(EClass eClass) {
             case WSDDPackageImpl.TYPE_MAPPING: return (EObject)createTypeMapping();
             case WSDDPackageImpl.ARRAY_MAPPING: return (EObject)createArrayMapping();
             case WSDDPackageImpl.BEAN_MAPPING: return (EObject)createBeanMapping();
+            case WSDDPackageImpl.MAPPING_CONTAINER: return (EObject)createMappingContainer();
             case WSDDPackageImpl.OPERATION_PARAMETER: return (EObject)createOperationParameter();
             case WSDDPackageImpl.FAULT: return (EObject)createFault();
             case WSDDPackageImpl.OPERATION: return (EObject)createOperation();
@@ -165,6 +166,16 @@ public BeanMapping createBeanMapping() {
         return beanMapping;
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public MappingContainer createMappingContainer() {
+        MappingContainerImpl mappingContainer = new MappingContainerImpl();
+        return mappingContainer;
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
index 7a0ff58dc..cd0d72528 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
@@ -16,6 +16,7 @@
 import org.apache.axis.model.wsdd.GlobalConfiguration;
 import org.apache.axis.model.wsdd.Handler;
 import org.apache.axis.model.wsdd.Mapping;
+import org.apache.axis.model.wsdd.MappingContainer;
 import org.apache.axis.model.wsdd.Operation;
 import org.apache.axis.model.wsdd.OperationParameter;
 import org.apache.axis.model.wsdd.Parameter;
@@ -123,7 +124,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getFlow()
      * @generated
      */
-    public static final int FLOW = 10;
+    public static final int FLOW = 11;
 
     /**
      * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.MappingImpl <em>Mapping</em>}' class.
@@ -336,6 +337,52 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     public static final int BEAN_MAPPING_FEATURE_COUNT = MAPPING_FEATURE_COUNT + 0;
 
+    /**
+     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl <em>Mapping Container</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.apache.axis.model.wsdd.impl.MappingContainerImpl
+     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getMappingContainer()
+     * @generated
+     */
+    public static final int MAPPING_CONTAINER = 5;
+
+    /**
+     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int MAPPING_CONTAINER__TYPE_MAPPINGS = 0;
+
+    /**
+     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int MAPPING_CONTAINER__BEAN_MAPPINGS = 1;
+
+    /**
+     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int MAPPING_CONTAINER__ARRAY_MAPPINGS = 2;
+
+    /**
+     * The number of structural features of the '<em>Mapping Container</em>' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int MAPPING_CONTAINER_FEATURE_COUNT = 3;
+
     /**
      * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl <em>Operation Parameter</em>}' class.
      * <!-- begin-user-doc -->
@@ -344,7 +391,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getOperationParameter()
      * @generated
      */
-    public static final int OPERATION_PARAMETER = 5;
+    public static final int OPERATION_PARAMETER = 6;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -426,7 +473,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getFault()
      * @generated
      */
-    public static final int FAULT = 6;
+    public static final int FAULT = 7;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -481,7 +528,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getOperation()
      * @generated
      */
-    public static final int OPERATION = 7;
+    public static final int OPERATION = 8;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -599,7 +646,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterizable()
      * @generated
      */
-    public static final int PARAMETERIZABLE = 8;
+    public static final int PARAMETERIZABLE = 9;
 
     /**
      * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -627,7 +674,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getHandler()
      * @generated
      */
-    public static final int HANDLER = 9;
+    public static final int HANDLER = 10;
 
     /**
      * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -691,7 +738,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getDeployableItem()
      * @generated
      */
-    public static final int DEPLOYABLE_ITEM = 11;
+    public static final int DEPLOYABLE_ITEM = 12;
 
     /**
      * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -737,7 +784,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getGlobalConfiguration()
      * @generated
      */
-    public static final int GLOBAL_CONFIGURATION = 12;
+    public static final int GLOBAL_CONFIGURATION = 13;
 
     /**
      * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -783,7 +830,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getTransport()
      * @generated
      */
-    public static final int TRANSPORT = 13;
+    public static final int TRANSPORT = 14;
 
     /**
      * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -847,7 +894,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getService()
      * @generated
      */
-    public static final int SERVICE = 14;
+    public static final int SERVICE = 15;
 
     /**
      * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
@@ -877,85 +924,85 @@ public class WSDDPackageImpl extends EPackageImpl {
     public static final int SERVICE__RESPONSE_FLOW = DEPLOYABLE_ITEM__RESPONSE_FLOW;
 
     /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
+     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__NAME = DEPLOYABLE_ITEM_FEATURE_COUNT + 0;
+    public static final int SERVICE__TYPE_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 0;
 
     /**
-     * The feature id for the '<em><b>Provider</b></em>' attribute.
+     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__PROVIDER = DEPLOYABLE_ITEM_FEATURE_COUNT + 1;
+    public static final int SERVICE__BEAN_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 1;
 
     /**
-     * The feature id for the '<em><b>Use</b></em>' attribute.
+     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__USE = DEPLOYABLE_ITEM_FEATURE_COUNT + 2;
+    public static final int SERVICE__ARRAY_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 2;
 
     /**
-     * The feature id for the '<em><b>Style</b></em>' attribute.
+     * The feature id for the '<em><b>Name</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__STYLE = DEPLOYABLE_ITEM_FEATURE_COUNT + 3;
+    public static final int SERVICE__NAME = DEPLOYABLE_ITEM_FEATURE_COUNT + 3;
 
     /**
-     * The feature id for the '<em><b>Namespaces</b></em>' attribute list.
+     * The feature id for the '<em><b>Provider</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__NAMESPACES = DEPLOYABLE_ITEM_FEATURE_COUNT + 4;
+    public static final int SERVICE__PROVIDER = DEPLOYABLE_ITEM_FEATURE_COUNT + 4;
 
     /**
-     * The feature id for the '<em><b>Operations</b></em>' containment reference list.
+     * The feature id for the '<em><b>Use</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__OPERATIONS = DEPLOYABLE_ITEM_FEATURE_COUNT + 5;
+    public static final int SERVICE__USE = DEPLOYABLE_ITEM_FEATURE_COUNT + 5;
 
     /**
-     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
+     * The feature id for the '<em><b>Style</b></em>' attribute.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__TYPE_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 6;
+    public static final int SERVICE__STYLE = DEPLOYABLE_ITEM_FEATURE_COUNT + 6;
 
     /**
-     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
+     * The feature id for the '<em><b>Namespaces</b></em>' attribute list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__BEAN_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 7;
+    public static final int SERVICE__NAMESPACES = DEPLOYABLE_ITEM_FEATURE_COUNT + 7;
 
     /**
-     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
+     * The feature id for the '<em><b>Operations</b></em>' containment reference list.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int SERVICE__ARRAY_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 8;
+    public static final int SERVICE__OPERATIONS = DEPLOYABLE_ITEM_FEATURE_COUNT + 8;
 
     /**
      * The number of structural features of the '<em>Service</em>' class.
@@ -974,7 +1021,34 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getDeployment()
      * @generated
      */
-    public static final int DEPLOYMENT = 15;
+    public static final int DEPLOYMENT = 16;
+
+    /**
+     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int DEPLOYMENT__TYPE_MAPPINGS = MAPPING_CONTAINER__TYPE_MAPPINGS;
+
+    /**
+     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int DEPLOYMENT__BEAN_MAPPINGS = MAPPING_CONTAINER__BEAN_MAPPINGS;
+
+    /**
+     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int DEPLOYMENT__ARRAY_MAPPINGS = MAPPING_CONTAINER__ARRAY_MAPPINGS;
 
     /**
      * The feature id for the '<em><b>Name</b></em>' attribute.
@@ -983,7 +1057,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int DEPLOYMENT__NAME = 0;
+    public static final int DEPLOYMENT__NAME = MAPPING_CONTAINER_FEATURE_COUNT + 0;
 
     /**
      * The feature id for the '<em><b>Global Configuration</b></em>' containment reference.
@@ -992,7 +1066,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int DEPLOYMENT__GLOBAL_CONFIGURATION = 1;
+    public static final int DEPLOYMENT__GLOBAL_CONFIGURATION = MAPPING_CONTAINER_FEATURE_COUNT + 1;
 
     /**
      * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
@@ -1001,7 +1075,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int DEPLOYMENT__HANDLERS = 2;
+    public static final int DEPLOYMENT__HANDLERS = MAPPING_CONTAINER_FEATURE_COUNT + 2;
 
     /**
      * The feature id for the '<em><b>Transports</b></em>' containment reference list.
@@ -1010,7 +1084,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int DEPLOYMENT__TRANSPORTS = 3;
+    public static final int DEPLOYMENT__TRANSPORTS = MAPPING_CONTAINER_FEATURE_COUNT + 3;
 
     /**
      * The feature id for the '<em><b>Services</b></em>' containment reference list.
@@ -1019,7 +1093,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int DEPLOYMENT__SERVICES = 4;
+    public static final int DEPLOYMENT__SERVICES = MAPPING_CONTAINER_FEATURE_COUNT + 4;
 
     /**
      * The number of structural features of the '<em>Deployment</em>' class.
@@ -1028,7 +1102,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int DEPLOYMENT_FEATURE_COUNT = 5;
+    public static final int DEPLOYMENT_FEATURE_COUNT = MAPPING_CONTAINER_FEATURE_COUNT + 5;
 
     /**
      * The meta object id for the '{@link org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}' enum.
@@ -1038,7 +1112,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterMode()
      * @generated
      */
-    public static final int PARAMETER_MODE = 16;
+    public static final int PARAMETER_MODE = 17;
 
     /**
      * <!-- begin-user-doc -->
@@ -1082,6 +1156,13 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     private EClass beanMappingEClass = null;
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass mappingContainerEClass = null;
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1417,6 +1498,57 @@ public EClass getBeanMapping() {
         return beanMappingEClass;
     }
 
+    /**
+     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.MappingContainer <em>Mapping Container</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Mapping Container</em>'.
+     * @see org.apache.axis.model.wsdd.MappingContainer
+     * @generated
+     */
+    public EClass getMappingContainer() {
+        return mappingContainerEClass;
+    }
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.MappingContainer#getTypeMappings <em>Type Mappings</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Type Mappings</em>'.
+     * @see org.apache.axis.model.wsdd.MappingContainer#getTypeMappings()
+     * @see #getMappingContainer()
+     * @generated
+     */
+    public EReference getMappingContainer_TypeMappings() {
+        return (EReference)mappingContainerEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.MappingContainer#getBeanMappings <em>Bean Mappings</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Bean Mappings</em>'.
+     * @see org.apache.axis.model.wsdd.MappingContainer#getBeanMappings()
+     * @see #getMappingContainer()
+     * @generated
+     */
+    public EReference getMappingContainer_BeanMappings() {
+        return (EReference)mappingContainerEClass.getEStructuralFeatures().get(1);
+    }
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.MappingContainer#getArrayMappings <em>Array Mappings</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Array Mappings</em>'.
+     * @see org.apache.axis.model.wsdd.MappingContainer#getArrayMappings()
+     * @see #getMappingContainer()
+     * @generated
+     */
+    public EReference getMappingContainer_ArrayMappings() {
+        return (EReference)mappingContainerEClass.getEStructuralFeatures().get(2);
+    }
+
     /**
      * Returns the meta object for class '{@link org.apache.axis.model.wsdd.OperationParameter <em>Operation Parameter</em>}'.
      * <!-- begin-user-doc -->
@@ -1980,45 +2112,6 @@ public EReference getService_Operations() {
         return (EReference)serviceEClass.getEStructuralFeatures().get(5);
     }
 
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getTypeMappings <em>Type Mappings</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Type Mappings</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getTypeMappings()
-     * @see #getService()
-     * @generated
-     */
-    public EReference getService_TypeMappings() {
-        return (EReference)serviceEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getBeanMappings <em>Bean Mappings</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Bean Mappings</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getBeanMappings()
-     * @see #getService()
-     * @generated
-     */
-    public EReference getService_BeanMappings() {
-        return (EReference)serviceEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getArrayMappings <em>Array Mappings</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Array Mappings</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getArrayMappings()
-     * @see #getService()
-     * @generated
-     */
-    public EReference getService_ArrayMappings() {
-        return (EReference)serviceEClass.getEStructuralFeatures().get(8);
-    }
-
     /**
      * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Deployment <em>Deployment</em>}'.
      * <!-- begin-user-doc -->
@@ -2156,6 +2249,11 @@ public void createPackageContents() {
 
         beanMappingEClass = createEClass(BEAN_MAPPING);
 
+        mappingContainerEClass = createEClass(MAPPING_CONTAINER);
+        createEReference(mappingContainerEClass, MAPPING_CONTAINER__TYPE_MAPPINGS);
+        createEReference(mappingContainerEClass, MAPPING_CONTAINER__BEAN_MAPPINGS);
+        createEReference(mappingContainerEClass, MAPPING_CONTAINER__ARRAY_MAPPINGS);
+
         operationParameterEClass = createEClass(OPERATION_PARAMETER);
         createEAttribute(operationParameterEClass, OPERATION_PARAMETER__NAME);
         createEAttribute(operationParameterEClass, OPERATION_PARAMETER__QNAME);
@@ -2211,9 +2309,6 @@ public void createPackageContents() {
         createEAttribute(serviceEClass, SERVICE__STYLE);
         createEAttribute(serviceEClass, SERVICE__NAMESPACES);
         createEReference(serviceEClass, SERVICE__OPERATIONS);
-        createEReference(serviceEClass, SERVICE__TYPE_MAPPINGS);
-        createEReference(serviceEClass, SERVICE__BEAN_MAPPINGS);
-        createEReference(serviceEClass, SERVICE__ARRAY_MAPPINGS);
 
         deploymentEClass = createEClass(DEPLOYMENT);
         createEAttribute(deploymentEClass, DEPLOYMENT__NAME);
@@ -2262,6 +2357,8 @@ public void initializePackageContents() {
         globalConfigurationEClass.getESuperTypes().add(this.getDeployableItem());
         transportEClass.getESuperTypes().add(this.getDeployableItem());
         serviceEClass.getESuperTypes().add(this.getDeployableItem());
+        serviceEClass.getESuperTypes().add(this.getMappingContainer());
+        deploymentEClass.getESuperTypes().add(this.getMappingContainer());
 
         // Initialize classes and features; add operations and parameters
         initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -2282,6 +2379,11 @@ public void initializePackageContents() {
 
         initEClass(beanMappingEClass, BeanMapping.class, "BeanMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
+        initEClass(mappingContainerEClass, MappingContainer.class, "MappingContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getMappingContainer_TypeMappings(), this.getTypeMapping(), null, "typeMappings", null, 0, -1, MappingContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getMappingContainer_BeanMappings(), this.getBeanMapping(), null, "beanMappings", null, 0, -1, MappingContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getMappingContainer_ArrayMappings(), this.getArrayMapping(), null, "arrayMappings", null, 0, -1, MappingContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+
         initEClass(operationParameterEClass, OperationParameter.class, "OperationParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getOperationParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getOperationParameter_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2341,9 +2443,6 @@ public void initializePackageContents() {
         initEAttribute(getService_Style(), theSOAPPackage.getStyle(), "style", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getService_Namespaces(), ecorePackage.getEString(), "namespaces", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getService_Operations(), this.getOperation(), null, "operations", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getService_TypeMappings(), this.getTypeMapping(), null, "typeMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getService_BeanMappings(), this.getBeanMapping(), null, "beanMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getService_ArrayMappings(), this.getArrayMapping(), null, "arrayMappings", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(deploymentEClass, Deployment.class, "Deployment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
         initEAttribute(getDeployment_Name(), ecorePackage.getEString(), "name", null, 0, 1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -2378,91 +2477,91 @@ public void initializePackageContents() {
     protected void createExtendedMetaDataAnnotations() {
         String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
         addAnnotation
-          (getOperation_Parameters(), 
+          (getMappingContainer_TypeMappings(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "parameter",
+             "name", "typeMapping",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getOperation_Faults(), 
+          (getMappingContainer_BeanMappings(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "fault",
+             "name", "beanMapping",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getParameterizable_Parameters(), 
+          (getMappingContainer_ArrayMappings(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "parameter",
+             "name", "arrayMapping",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getFlow_Handlers(), 
+          (getOperation_Parameters(), 
            source, 
            new String[] {
-             "name", "handler",
              "kind", "element",
+             "name", "parameter",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getDeployableItem_RequestFlow(), 
+          (getOperation_Faults(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "requestFlow",
+             "name", "fault",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getDeployableItem_ResponseFlow(), 
+          (getParameterizable_Parameters(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "responseFlow",
+             "name", "parameter",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getService_Namespaces(), 
+          (getFlow_Handlers(), 
            source, 
            new String[] {
+             "name", "handler",
              "kind", "element",
-             "name", "namespace",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getService_Operations(), 
+          (getDeployableItem_RequestFlow(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "operation",
+             "name", "requestFlow",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getService_TypeMappings(), 
+          (getDeployableItem_ResponseFlow(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "typeMapping",
+             "name", "responseFlow",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getService_BeanMappings(), 
+          (getService_Namespaces(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "beanMapping",
+             "name", "namespace",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getService_ArrayMappings(), 
+          (getService_Operations(), 
            source, 
            new String[] {
              "kind", "element",
-             "name", "arrayMapping",
+             "name", "operation",
              "namespace", "##targetNamespace"
            });		
         addAnnotation
@@ -2651,6 +2750,40 @@ public interface Literals {
          */
         public static final EClass BEAN_MAPPING = eINSTANCE.getBeanMapping();
 
+        /**
+         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl <em>Mapping Container</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.apache.axis.model.wsdd.impl.MappingContainerImpl
+         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getMappingContainer()
+         * @generated
+         */
+        public static final EClass MAPPING_CONTAINER = eINSTANCE.getMappingContainer();
+
+        /**
+         * The meta object literal for the '<em><b>Type Mappings</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final EReference MAPPING_CONTAINER__TYPE_MAPPINGS = eINSTANCE.getMappingContainer_TypeMappings();
+
+        /**
+         * The meta object literal for the '<em><b>Bean Mappings</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final EReference MAPPING_CONTAINER__BEAN_MAPPINGS = eINSTANCE.getMappingContainer_BeanMappings();
+
+        /**
+         * The meta object literal for the '<em><b>Array Mappings</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final EReference MAPPING_CONTAINER__ARRAY_MAPPINGS = eINSTANCE.getMappingContainer_ArrayMappings();
+
         /**
          * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl <em>Operation Parameter</em>}' class.
          * <!-- begin-user-doc -->
@@ -3021,30 +3154,6 @@ public interface Literals {
          */
         public static final EReference SERVICE__OPERATIONS = eINSTANCE.getService_Operations();
 
-        /**
-         * The meta object literal for the '<em><b>Type Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference SERVICE__TYPE_MAPPINGS = eINSTANCE.getService_TypeMappings();
-
-        /**
-         * The meta object literal for the '<em><b>Bean Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference SERVICE__BEAN_MAPPINGS = eINSTANCE.getService_BeanMappings();
-
-        /**
-         * The meta object literal for the '<em><b>Array Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference SERVICE__ARRAY_MAPPINGS = eINSTANCE.getService_ArrayMappings();
-
         /**
          * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.DeploymentImpl <em>Deployment</em>}' class.
          * <!-- begin-user-doc -->
diff --git a/axis-model/src/test/wsdd/bidbuy.wsdd b/axis-model/src/test/wsdd/bidbuy.wsdd
new file mode 100644
index 000000000..603dbc5cb
--- /dev/null
+++ b/axis-model/src/test/wsdd/bidbuy.wsdd
@@ -0,0 +1,23 @@
+<!-- Use this file to deploy some handlers/chains and services      -->
+<!-- Two ways to do this:                                           -->
+<!--   java org.apache.axis.client.AdminClient deploy.wsdd          -->
+<!--      after the axis server is running                          -->
+<!-- or                                                             -->
+<!--   java org.apache.axis.utils.Admin client|server deploy.wsdd   -->
+<!--      from the same directory that the Axis engine runs         -->
+<deployment xmlns="http://xml.apache.org/axis/wsdd/" xmlns:java="http://xml.apache.org/axis/wsdd/providers/java" xmlns:bid="http://www.soapinterop.org/Bid" xmlns:reg="http://www.soapinterop.org/Registry">
+    <service name="Bid" provider="java:RPC">
+        <namespace>http://www.soapinterop.org/Bid</namespace>
+        <parameter name="className" value="samples.bidbuy.BidService"/>
+        <parameter name="allowedMethods" value="RequestForQuote SimpleBuy Buy Ping"/>
+    </service>
+    <beanMapping qname="bid:PurchaseOrder" languageSpecificType="java:samples.bidbuy.PurchaseOrder"/>
+    <beanMapping qname="bid:Address" languageSpecificType="java:samples.bidbuy.Address"/>
+    <beanMapping qname="bid:LineItem" languageSpecificType="java:samples.bidbuy.LineItem"/>
+    <!-- * * * * * * * * * * * * * * * * * * * * * * * * * * * * -->
+    <service name="BidRegistry" provider="java:RPC">
+        <parameter name="className" value="samples.bidbuy.RegistryService"/>
+        <parameter name="allowedMethods" value="Register Unregister Lookup LookupAsString"/>
+    </service>
+    <beanMapping qname="reg:Service" languageSpecificType="java:samples.bidbuy.Service"/>
+</deployment>

From aea267e5cf45ab3e9a89c7dcafd62fa50261b6ac Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 18:22:15 +0000
Subject: [PATCH 011/133] Renamed Flow to Chain to match the naming used in
 Axis core.

---
 axis-model/model/wsdd.ecore                   |   6 +-
 .../axis/model/wsdd/{Flow.java => Chain.java} |   4 +-
 .../axis/model/wsdd/DeployableItem.java       |  12 +-
 .../apache/axis/model/wsdd/WSDDFactory.java   |  18 +--
 .../impl/{FlowImpl.java => ChainImpl.java}    |  20 +--
 .../model/wsdd/impl/DeployableItemImpl.java   |  30 ++--
 .../axis/model/wsdd/impl/WSDDFactoryImpl.java |  22 +--
 .../axis/model/wsdd/impl/WSDDPackageImpl.java | 142 +++++++++---------
 8 files changed, 127 insertions(+), 127 deletions(-)
 rename axis-model/src/main/java/org/apache/axis/model/wsdd/{Flow.java => Chain.java} (90%)
 rename axis-model/src/main/java/org/apache/axis/model/wsdd/impl/{FlowImpl.java => ChainImpl.java} (85%)

diff --git a/axis-model/model/wsdd.ecore b/axis-model/model/wsdd.ecore
index 42df32adb..172bbdebb 100644
--- a/axis-model/model/wsdd.ecore
+++ b/axis-model/model/wsdd.ecore
@@ -111,7 +111,7 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType xml.ecore#//QName"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Flow">
+  <eClassifiers xsi:type="ecore:EClass" name="Chain">
     <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
         eType="#//Handler" containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
@@ -122,7 +122,7 @@
     </eStructuralFeatures>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="DeployableItem" abstract="true" eSuperTypes="#//Parameterizable">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="requestFlow" eType="#//Flow"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="requestFlow" eType="#//Chain"
         containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
@@ -130,7 +130,7 @@
         <details key="namespace" value="##targetNamespace"/>
       </eAnnotations>
     </eStructuralFeatures>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="responseFlow" eType="#//Flow"
+    <eStructuralFeatures xsi:type="ecore:EReference" name="responseFlow" eType="#//Chain"
         containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
         <details key="kind" value="element"/>
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
similarity index 90%
rename from axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
rename to axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
index a0f5486c8..9bb4595af 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Flow.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
@@ -17,14 +17,14 @@
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Flow#getHandlers <em>Handlers</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}</li>
  * </ul>
  * </p>
  *
  * @model
  * @generated
  */
-public interface Flow {
+public interface Chain {
 
     /**
      * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
index b1743edf1..9710fa3c2 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
@@ -32,12 +32,12 @@ public interface DeployableItem extends Parameterizable {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Request Flow</em>' containment reference.
-     * @see #setRequestFlow(Flow)
+     * @see #setRequestFlow(Chain)
      * @model containment="true"
      *        extendedMetaData="kind='element' name='requestFlow' namespace='##targetNamespace'"
      * @generated
      */
-    Flow getRequestFlow();
+    Chain getRequestFlow();
 
     /**
      * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow <em>Request Flow</em>}' containment reference.
@@ -47,7 +47,7 @@ public interface DeployableItem extends Parameterizable {
      * @see #getRequestFlow()
      * @generated
      */
-    void setRequestFlow(Flow value);
+    void setRequestFlow(Chain value);
 
     /**
      * Returns the value of the '<em><b>Response Flow</b></em>' containment reference.
@@ -58,12 +58,12 @@ public interface DeployableItem extends Parameterizable {
      * </p>
      * <!-- end-user-doc -->
      * @return the value of the '<em>Response Flow</em>' containment reference.
-     * @see #setResponseFlow(Flow)
+     * @see #setResponseFlow(Chain)
      * @model containment="true"
      *        extendedMetaData="kind='element' name='responseFlow' namespace='##targetNamespace'"
      * @generated
      */
-    Flow getResponseFlow();
+    Chain getResponseFlow();
 
     /**
      * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow <em>Response Flow</em>}' containment reference.
@@ -73,6 +73,6 @@ public interface DeployableItem extends Parameterizable {
      * @see #getResponseFlow()
      * @generated
      */
-    void setResponseFlow(Flow value);
+    void setResponseFlow(Chain value);
 
 } // DeployableItem
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
index 466fb79a0..7e2c46c4c 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
@@ -30,15 +30,6 @@ public interface WSDDFactory {
      */
     Parameter createParameter();
 
-    /**
-     * Returns a new object of class '<em>Flow</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Flow</em>'.
-     * @generated
-     */
-    Flow createFlow();
-
     /**
      * Returns a new object of class '<em>Type Mapping</em>'.
      * <!-- begin-user-doc -->
@@ -120,6 +111,15 @@ public interface WSDDFactory {
      */
     Handler createHandler();
 
+    /**
+     * Returns a new object of class '<em>Chain</em>'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return a new object of class '<em>Chain</em>'.
+     * @generated
+     */
+    Chain createChain();
+
     /**
      * Returns a new object of class '<em>Global Configuration</em>'.
      * <!-- begin-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
similarity index 85%
rename from axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
rename to axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
index d94d9135c..93b3fad1c 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FlowImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
@@ -8,7 +8,7 @@
 
 import java.util.Collection;
 import java.util.List;
-import org.apache.axis.model.wsdd.Flow;
+import org.apache.axis.model.wsdd.Chain;
 
 import org.apache.axis.model.wsdd.Handler;
 import org.eclipse.emf.common.notify.NotificationChain;
@@ -27,13 +27,13 @@
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.FlowImpl#getHandlers <em>Handlers</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getHandlers <em>Handlers</em>}</li>
  * </ul>
  * </p>
  *
  * @generated
  */
-public class FlowImpl extends EObjectImpl implements Flow {
+public class ChainImpl extends EObjectImpl implements Chain {
     /**
      * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -49,7 +49,7 @@ public class FlowImpl extends EObjectImpl implements Flow {
      * <!-- end-user-doc -->
      * @generated
      */
-    protected FlowImpl() {
+    protected ChainImpl() {
         super();
     }
 
@@ -59,7 +59,7 @@ protected FlowImpl() {
      * @generated
      */
     protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.FLOW;
+        return WSDDPackageImpl.Literals.CHAIN;
     }
 
     /**
@@ -81,7 +81,7 @@ public List getHandlers() {
      */
     public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
         switch (featureID) {
-            case WSDDPackageImpl.FLOW__HANDLERS:
+            case WSDDPackageImpl.CHAIN__HANDLERS:
                 return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
         }
         return super.eInverseRemove(otherEnd, featureID, msgs);
@@ -94,7 +94,7 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
      */
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
-            case WSDDPackageImpl.FLOW__HANDLERS:
+            case WSDDPackageImpl.CHAIN__HANDLERS:
                 return getHandlers();
         }
         return super.eGet(featureID, resolve, coreType);
@@ -107,7 +107,7 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
      */
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
-            case WSDDPackageImpl.FLOW__HANDLERS:
+            case WSDDPackageImpl.CHAIN__HANDLERS:
                 getHandlers().clear();
                 getHandlers().addAll((Collection)newValue);
                 return;
@@ -122,7 +122,7 @@ public void eSet(int featureID, Object newValue) {
      */
     public void eUnset(int featureID) {
         switch (featureID) {
-            case WSDDPackageImpl.FLOW__HANDLERS:
+            case WSDDPackageImpl.CHAIN__HANDLERS:
                 getHandlers().clear();
                 return;
         }
@@ -136,7 +136,7 @@ public void eUnset(int featureID) {
      */
     public boolean eIsSet(int featureID) {
         switch (featureID) {
-            case WSDDPackageImpl.FLOW__HANDLERS:
+            case WSDDPackageImpl.CHAIN__HANDLERS:
                 return handlers != null && !handlers.isEmpty();
         }
         return super.eIsSet(featureID);
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
index 0aa4b27f5..ae94f6b50 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
@@ -8,7 +8,7 @@
 
 import org.apache.axis.model.wsdd.DeployableItem;
 
-import org.apache.axis.model.wsdd.Flow;
+import org.apache.axis.model.wsdd.Chain;
 import org.eclipse.emf.common.notify.NotificationChain;
 import org.eclipse.emf.ecore.EClass;
 
@@ -37,7 +37,7 @@ public abstract class DeployableItemImpl extends ParameterizableImpl implements
      * @generated
      * @ordered
      */
-    protected Flow requestFlow;
+    protected Chain requestFlow;
     /**
      * The cached value of the '{@link #getResponseFlow() <em>Response Flow</em>}' containment reference.
      * <!-- begin-user-doc -->
@@ -46,7 +46,7 @@ public abstract class DeployableItemImpl extends ParameterizableImpl implements
      * @generated
      * @ordered
      */
-    protected Flow responseFlow;
+    protected Chain responseFlow;
 
     /**
      * <!-- begin-user-doc -->
@@ -71,7 +71,7 @@ protected EClass eStaticClass() {
      * <!-- end-user-doc -->
      * @generated
      */
-    public Flow getRequestFlow() {
+    public Chain getRequestFlow() {
         return requestFlow;
     }
 
@@ -80,8 +80,8 @@ public Flow getRequestFlow() {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetRequestFlow(Flow newRequestFlow, NotificationChain msgs) {
-        Flow oldRequestFlow = requestFlow;
+    public NotificationChain basicSetRequestFlow(Chain newRequestFlow, NotificationChain msgs) {
+        Chain oldRequestFlow = requestFlow;
         requestFlow = newRequestFlow;
         return msgs;
     }
@@ -91,7 +91,7 @@ public NotificationChain basicSetRequestFlow(Flow newRequestFlow, NotificationCh
      * <!-- end-user-doc -->
      * @generated
      */
-    public void setRequestFlow(Flow newRequestFlow) {
+    public void setRequestFlow(Chain newRequestFlow) {
         if (newRequestFlow != requestFlow) {
             NotificationChain msgs = null;
             if (requestFlow != null)
@@ -108,7 +108,7 @@ public void setRequestFlow(Flow newRequestFlow) {
      * <!-- end-user-doc -->
      * @generated
      */
-    public Flow getResponseFlow() {
+    public Chain getResponseFlow() {
         return responseFlow;
     }
 
@@ -117,8 +117,8 @@ public Flow getResponseFlow() {
      * <!-- end-user-doc -->
      * @generated
      */
-    public NotificationChain basicSetResponseFlow(Flow newResponseFlow, NotificationChain msgs) {
-        Flow oldResponseFlow = responseFlow;
+    public NotificationChain basicSetResponseFlow(Chain newResponseFlow, NotificationChain msgs) {
+        Chain oldResponseFlow = responseFlow;
         responseFlow = newResponseFlow;
         return msgs;
     }
@@ -128,7 +128,7 @@ public NotificationChain basicSetResponseFlow(Flow newResponseFlow, Notification
      * <!-- end-user-doc -->
      * @generated
      */
-    public void setResponseFlow(Flow newResponseFlow) {
+    public void setResponseFlow(Chain newResponseFlow) {
         if (newResponseFlow != responseFlow) {
             NotificationChain msgs = null;
             if (responseFlow != null)
@@ -178,10 +178,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
             case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                setRequestFlow((Flow)newValue);
+                setRequestFlow((Chain)newValue);
                 return;
             case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                setResponseFlow((Flow)newValue);
+                setResponseFlow((Chain)newValue);
                 return;
         }
         super.eSet(featureID, newValue);
@@ -195,10 +195,10 @@ public void eSet(int featureID, Object newValue) {
     public void eUnset(int featureID) {
         switch (featureID) {
             case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                setRequestFlow((Flow)null);
+                setRequestFlow((Chain)null);
                 return;
             case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                setResponseFlow((Flow)null);
+                setResponseFlow((Chain)null);
                 return;
         }
         super.eUnset(featureID);
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
index 41abfb8ab..de0680aa6 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
@@ -78,7 +78,7 @@ public EObject create(EClass eClass) {
             case WSDDPackageImpl.OPERATION: return (EObject)createOperation();
             case WSDDPackageImpl.PARAMETERIZABLE: return (EObject)createParameterizable();
             case WSDDPackageImpl.HANDLER: return (EObject)createHandler();
-            case WSDDPackageImpl.FLOW: return (EObject)createFlow();
+            case WSDDPackageImpl.CHAIN: return (EObject)createChain();
             case WSDDPackageImpl.GLOBAL_CONFIGURATION: return (EObject)createGlobalConfiguration();
             case WSDDPackageImpl.TRANSPORT: return (EObject)createTransport();
             case WSDDPackageImpl.SERVICE: return (EObject)createService();
@@ -126,16 +126,6 @@ public Parameter createParameter() {
         return parameter;
     }
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Flow createFlow() {
-        FlowImpl flow = new FlowImpl();
-        return flow;
-    }
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -226,6 +216,16 @@ public Handler createHandler() {
         return handler;
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public Chain createChain() {
+        ChainImpl chain = new ChainImpl();
+        return chain;
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
index cd0d72528..6f83464df 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
@@ -12,7 +12,7 @@
 import org.apache.axis.model.wsdd.DeployableItem;
 import org.apache.axis.model.wsdd.Deployment;
 import org.apache.axis.model.wsdd.Fault;
-import org.apache.axis.model.wsdd.Flow;
+import org.apache.axis.model.wsdd.Chain;
 import org.apache.axis.model.wsdd.GlobalConfiguration;
 import org.apache.axis.model.wsdd.Handler;
 import org.apache.axis.model.wsdd.Mapping;
@@ -116,16 +116,6 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     public static final int PARAMETER_FEATURE_COUNT = 2;
 
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.FlowImpl <em>Flow</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.FlowImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getFlow()
-     * @generated
-     */
-    public static final int FLOW = 11;
-
     /**
      * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.MappingImpl <em>Mapping</em>}' class.
      * <!-- begin-user-doc -->
@@ -712,6 +702,16 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     public static final int HANDLER_FEATURE_COUNT = PARAMETERIZABLE_FEATURE_COUNT + 2;
 
+    /**
+     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.ChainImpl <em>Chain</em>}' class.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see org.apache.axis.model.wsdd.impl.ChainImpl
+     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getChain()
+     * @generated
+     */
+    public static final int CHAIN = 11;
+
     /**
      * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
      * <!-- begin-user-doc -->
@@ -719,16 +719,16 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int FLOW__HANDLERS = 0;
+    public static final int CHAIN__HANDLERS = 0;
 
     /**
-     * The number of structural features of the '<em>Flow</em>' class.
+     * The number of structural features of the '<em>Chain</em>' class.
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
      * @generated
      * @ordered
      */
-    public static final int FLOW_FEATURE_COUNT = 1;
+    public static final int CHAIN_FEATURE_COUNT = 1;
 
     /**
      * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl <em>Deployable Item</em>}' class.
@@ -1121,13 +1121,6 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     private EClass parameterEClass = null;
 
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass flowEClass = null;
-
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1198,6 +1191,13 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     private EClass handlerEClass = null;
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    private EClass chainEClass = null;
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -1347,31 +1347,6 @@ public EAttribute getParameter_Value() {
         return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
     }
 
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Flow <em>Flow</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Flow</em>'.
-     * @see org.apache.axis.model.wsdd.Flow
-     * @generated
-     */
-    public EClass getFlow() {
-        return flowEClass;
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Flow#getHandlers <em>Handlers</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Handlers</em>'.
-     * @see org.apache.axis.model.wsdd.Flow#getHandlers()
-     * @see #getFlow()
-     * @generated
-     */
-    public EReference getFlow_Handlers() {
-        return (EReference)flowEClass.getEStructuralFeatures().get(0);
-    }
-
     /**
      * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Mapping <em>Mapping</em>}'.
      * <!-- begin-user-doc -->
@@ -1934,6 +1909,31 @@ public EAttribute getHandler_Type() {
         return (EAttribute)handlerEClass.getEStructuralFeatures().get(1);
     }
 
+    /**
+     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Chain <em>Chain</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for class '<em>Chain</em>'.
+     * @see org.apache.axis.model.wsdd.Chain
+     * @generated
+     */
+    public EClass getChain() {
+        return chainEClass;
+    }
+
+    /**
+     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the containment reference list '<em>Handlers</em>'.
+     * @see org.apache.axis.model.wsdd.Chain#getHandlers()
+     * @see #getChain()
+     * @generated
+     */
+    public EReference getChain_Handlers() {
+        return (EReference)chainEClass.getEStructuralFeatures().get(0);
+    }
+
     /**
      * Returns the meta object for class '{@link org.apache.axis.model.wsdd.DeployableItem <em>Deployable Item</em>}'.
      * <!-- begin-user-doc -->
@@ -2289,8 +2289,8 @@ public void createPackageContents() {
         createEAttribute(handlerEClass, HANDLER__NAME);
         createEAttribute(handlerEClass, HANDLER__TYPE);
 
-        flowEClass = createEClass(FLOW);
-        createEReference(flowEClass, FLOW__HANDLERS);
+        chainEClass = createEClass(CHAIN);
+        createEReference(chainEClass, CHAIN__HANDLERS);
 
         deployableItemEClass = createEClass(DEPLOYABLE_ITEM);
         createEReference(deployableItemEClass, DEPLOYABLE_ITEM__REQUEST_FLOW);
@@ -2423,12 +2423,12 @@ public void initializePackageContents() {
         initEAttribute(getHandler_Name(), ecorePackage.getEString(), "name", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEAttribute(getHandler_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
-        initEClass(flowEClass, Flow.class, "Flow", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getFlow_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Flow.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEClass(chainEClass, Chain.class, "Chain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEReference(getChain_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(deployableItemEClass, DeployableItem.class, "DeployableItem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDeployableItem_RequestFlow(), this.getFlow(), null, "requestFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDeployableItem_ResponseFlow(), this.getFlow(), null, "responseFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getDeployableItem_RequestFlow(), this.getChain(), null, "requestFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEReference(getDeployableItem_ResponseFlow(), this.getChain(), null, "responseFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(globalConfigurationEClass, GlobalConfiguration.class, "GlobalConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
@@ -2525,7 +2525,7 @@ protected void createExtendedMetaDataAnnotations() {
              "namespace", "##targetNamespace"
            });		
         addAnnotation
-          (getFlow_Handlers(), 
+          (getChain_Handlers(), 
            source, 
            new String[] {
              "name", "handler",
@@ -2644,24 +2644,6 @@ public interface Literals {
          */
         public static final EAttribute PARAMETER__VALUE = eINSTANCE.getParameter_Value();
 
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.FlowImpl <em>Flow</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.FlowImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getFlow()
-         * @generated
-         */
-        public static final EClass FLOW = eINSTANCE.getFlow();
-
-        /**
-         * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference FLOW__HANDLERS = eINSTANCE.getFlow_Handlers();
-
         /**
          * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.MappingImpl <em>Mapping</em>}' class.
          * <!-- begin-user-doc -->
@@ -3034,6 +3016,24 @@ public interface Literals {
          */
         public static final EAttribute HANDLER__TYPE = eINSTANCE.getHandler_Type();
 
+        /**
+         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.ChainImpl <em>Chain</em>}' class.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see org.apache.axis.model.wsdd.impl.ChainImpl
+         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getChain()
+         * @generated
+         */
+        public static final EClass CHAIN = eINSTANCE.getChain();
+
+        /**
+         * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final EReference CHAIN__HANDLERS = eINSTANCE.getChain_Handlers();
+
         /**
          * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl <em>Deployable Item</em>}' class.
          * <!-- begin-user-doc -->

From 6f1e26df0ebd958625d0e3afa7c377cba66f69fc Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 21:23:06 +0000
Subject: [PATCH 012/133] Let maven-axis-server-plugin prepare the
 server-config.wsdd file before starting the server (instead of deploying the
 individual WSDD files using AdminClient).

---
 axis-model/model/wsdd.ecore                   |   2 +
 .../org/apache/axis/model/wsdd/Chain.java     |  53 ++++++++
 .../axis/model/wsdd/impl/ChainImpl.java       | 112 ++++++++++++++++
 .../axis/model/wsdd/impl/DeploymentImpl.java  |   3 +
 .../axis/model/wsdd/impl/WSDDPackageImpl.java |  70 +++++++++-
 axis-model/src/test/wsdd/stock.wsdd           |  31 +++++
 maven/maven-axis-server-plugin/pom.xml        |   9 +-
 .../server/AbstractStartProcessMojo.java      | 113 +++++++++-------
 .../tools/maven/server/AdminClientUtils.java  |  42 ------
 .../server/AxisServerProcessControl.java      |  11 +-
 .../tools/maven/server/StartDaemonMojo.java   |  15 +--
 .../tools/maven/server/StartServerMojo.java   | 125 +++++++++---------
 .../tools/maven/wsdd/GenerateWSDDMojo.java    |  42 +-----
 samples/attachments-sample/pom.xml            |   3 +-
 samples/encoding-sample/pom.xml               |   2 +-
 samples/faults-sample/pom.xml                 |   2 +-
 samples/jaxrpc-sample/pom.xml                 |   4 +-
 samples/message-sample/pom.xml                |   2 +-
 samples/misc-sample/pom.xml                   |   2 +-
 samples/stock-sample/pom.xml                  |   2 +-
 20 files changed, 418 insertions(+), 227 deletions(-)
 create mode 100644 axis-model/src/test/wsdd/stock.wsdd
 delete mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AdminClientUtils.java

diff --git a/axis-model/model/wsdd.ecore b/axis-model/model/wsdd.ecore
index 172bbdebb..574792f2d 100644
--- a/axis-model/model/wsdd.ecore
+++ b/axis-model/model/wsdd.ecore
@@ -112,6 +112,8 @@
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType xml.ecore#//QName"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Chain">
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="type" eType="ecore:EDataType xml.ecore#//QName"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="handlers" upperBound="-1"
         eType="#//Handler" containment="true">
       <eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
index 9bb4595af..2b728cf61 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
@@ -7,6 +7,7 @@
 package org.apache.axis.model.wsdd;
 
 import java.util.List;
+import javax.xml.namespace.QName;
 
 
 /**
@@ -17,6 +18,8 @@
  * <p>
  * The following features are supported:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}</li>
  * </ul>
  * </p>
@@ -26,6 +29,56 @@
  */
 public interface Chain {
 
+    /**
+     * Returns the value of the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Name</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Name</em>' attribute.
+     * @see #setName(String)
+     * @model
+     * @generated
+     */
+    String getName();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Name</em>' attribute.
+     * @see #getName()
+     * @generated
+     */
+    void setName(String value);
+
+    /**
+     * Returns the value of the '<em><b>Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <p>
+     * If the meaning of the '<em>Type</em>' attribute isn't clear,
+     * there really should be more of a description here...
+     * </p>
+     * <!-- end-user-doc -->
+     * @return the value of the '<em>Type</em>' attribute.
+     * @see #setType(QName)
+     * @model dataType="org.apache.axis.model.xml.QName"
+     * @generated
+     */
+    QName getType();
+
+    /**
+     * Sets the value of the '{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @param value the new value of the '<em>Type</em>' attribute.
+     * @see #getType()
+     * @generated
+     */
+    void setType(QName value);
+
     /**
      * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
      * The list contents are of type {@link org.apache.axis.model.wsdd.Handler}.
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
index 93b3fad1c..76afa77b4 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
@@ -8,6 +8,7 @@
 
 import java.util.Collection;
 import java.util.List;
+import javax.xml.namespace.QName;
 import org.apache.axis.model.wsdd.Chain;
 
 import org.apache.axis.model.wsdd.Handler;
@@ -27,6 +28,8 @@
  * <p>
  * The following features are implemented:
  * <ul>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getName <em>Name</em>}</li>
+ *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getType <em>Type</em>}</li>
  *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getHandlers <em>Handlers</em>}</li>
  * </ul>
  * </p>
@@ -34,6 +37,42 @@
  * @generated
  */
 public class ChainImpl extends EObjectImpl implements Chain {
+    /**
+     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected static final String NAME_EDEFAULT = null;
+    /**
+     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getName()
+     * @generated
+     * @ordered
+     */
+    protected String name = NAME_EDEFAULT;
+    /**
+     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getType()
+     * @generated
+     * @ordered
+     */
+    protected static final QName TYPE_EDEFAULT = null;
+    /**
+     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @see #getType()
+     * @generated
+     * @ordered
+     */
+    protected QName type = TYPE_EDEFAULT;
     /**
      * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
      * <!-- begin-user-doc -->
@@ -62,6 +101,42 @@ protected EClass eStaticClass() {
         return WSDDPackageImpl.Literals.CHAIN;
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setName(String newName) {
+        name = newName;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public QName getType() {
+        return type;
+    }
+
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public void setType(QName newType) {
+        type = newType;
+    }
+
     /**
      * <!-- begin-user-doc -->
      * <!-- end-user-doc -->
@@ -94,6 +169,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,
      */
     public Object eGet(int featureID, boolean resolve, boolean coreType) {
         switch (featureID) {
+            case WSDDPackageImpl.CHAIN__NAME:
+                return getName();
+            case WSDDPackageImpl.CHAIN__TYPE:
+                return getType();
             case WSDDPackageImpl.CHAIN__HANDLERS:
                 return getHandlers();
         }
@@ -107,6 +186,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {
      */
     public void eSet(int featureID, Object newValue) {
         switch (featureID) {
+            case WSDDPackageImpl.CHAIN__NAME:
+                setName((String)newValue);
+                return;
+            case WSDDPackageImpl.CHAIN__TYPE:
+                setType((QName)newValue);
+                return;
             case WSDDPackageImpl.CHAIN__HANDLERS:
                 getHandlers().clear();
                 getHandlers().addAll((Collection)newValue);
@@ -122,6 +207,12 @@ public void eSet(int featureID, Object newValue) {
      */
     public void eUnset(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.CHAIN__NAME:
+                setName(NAME_EDEFAULT);
+                return;
+            case WSDDPackageImpl.CHAIN__TYPE:
+                setType(TYPE_EDEFAULT);
+                return;
             case WSDDPackageImpl.CHAIN__HANDLERS:
                 getHandlers().clear();
                 return;
@@ -136,10 +227,31 @@ public void eUnset(int featureID) {
      */
     public boolean eIsSet(int featureID) {
         switch (featureID) {
+            case WSDDPackageImpl.CHAIN__NAME:
+                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
+            case WSDDPackageImpl.CHAIN__TYPE:
+                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
             case WSDDPackageImpl.CHAIN__HANDLERS:
                 return handlers != null && !handlers.isEmpty();
         }
         return super.eIsSet(featureID);
     }
 
+    /**
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     */
+    public String toString() {
+        if (eIsProxy()) return super.toString();
+
+        StringBuffer result = new StringBuffer(super.toString());
+        result.append(" (name: ");
+        result.append(name);
+        result.append(", type: ");
+        result.append(type);
+        result.append(')');
+        return result.toString();
+    }
+
 } //FlowImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
index aa4fae9d9..3cff4c809 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
@@ -216,6 +216,9 @@ public void merge(Deployment other) {
         getHandlers().addAll(other.getHandlers());
         getTransports().addAll(other.getTransports());
         getServices().addAll(other.getServices());
+        getTypeMappings().addAll(other.getTypeMappings());
+        getBeanMappings().addAll(other.getBeanMappings());
+        getArrayMappings().addAll(other.getArrayMappings());
     }
 
     /**
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
index 6f83464df..c59c699e6 100644
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
@@ -712,6 +712,24 @@ public class WSDDPackageImpl extends EPackageImpl {
      */
     public static final int CHAIN = 11;
 
+    /**
+     * The feature id for the '<em><b>Name</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int CHAIN__NAME = 0;
+
+    /**
+     * The feature id for the '<em><b>Type</b></em>' attribute.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @generated
+     * @ordered
+     */
+    public static final int CHAIN__TYPE = 1;
+
     /**
      * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
      * <!-- begin-user-doc -->
@@ -719,7 +737,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int CHAIN__HANDLERS = 0;
+    public static final int CHAIN__HANDLERS = 2;
 
     /**
      * The number of structural features of the '<em>Chain</em>' class.
@@ -728,7 +746,7 @@ public class WSDDPackageImpl extends EPackageImpl {
      * @generated
      * @ordered
      */
-    public static final int CHAIN_FEATURE_COUNT = 1;
+    public static final int CHAIN_FEATURE_COUNT = 3;
 
     /**
      * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl <em>Deployable Item</em>}' class.
@@ -1921,6 +1939,32 @@ public EClass getChain() {
         return chainEClass;
     }
 
+    /**
+     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Name</em>'.
+     * @see org.apache.axis.model.wsdd.Chain#getName()
+     * @see #getChain()
+     * @generated
+     */
+    public EAttribute getChain_Name() {
+        return (EAttribute)chainEClass.getEStructuralFeatures().get(0);
+    }
+
+    /**
+     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}'.
+     * <!-- begin-user-doc -->
+     * <!-- end-user-doc -->
+     * @return the meta object for the attribute '<em>Type</em>'.
+     * @see org.apache.axis.model.wsdd.Chain#getType()
+     * @see #getChain()
+     * @generated
+     */
+    public EAttribute getChain_Type() {
+        return (EAttribute)chainEClass.getEStructuralFeatures().get(1);
+    }
+
     /**
      * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}'.
      * <!-- begin-user-doc -->
@@ -1931,7 +1975,7 @@ public EClass getChain() {
      * @generated
      */
     public EReference getChain_Handlers() {
-        return (EReference)chainEClass.getEStructuralFeatures().get(0);
+        return (EReference)chainEClass.getEStructuralFeatures().get(2);
     }
 
     /**
@@ -2290,6 +2334,8 @@ public void createPackageContents() {
         createEAttribute(handlerEClass, HANDLER__TYPE);
 
         chainEClass = createEClass(CHAIN);
+        createEAttribute(chainEClass, CHAIN__NAME);
+        createEAttribute(chainEClass, CHAIN__TYPE);
         createEReference(chainEClass, CHAIN__HANDLERS);
 
         deployableItemEClass = createEClass(DEPLOYABLE_ITEM);
@@ -2424,6 +2470,8 @@ public void initializePackageContents() {
         initEAttribute(getHandler_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(chainEClass, Chain.class, "Chain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+        initEAttribute(getChain_Name(), ecorePackage.getEString(), "name", null, 0, 1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+        initEAttribute(getChain_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
         initEReference(getChain_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
         initEClass(deployableItemEClass, DeployableItem.class, "DeployableItem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3026,6 +3074,22 @@ public interface Literals {
          */
         public static final EClass CHAIN = eINSTANCE.getChain();
 
+        /**
+         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final EAttribute CHAIN__NAME = eINSTANCE.getChain_Name();
+
+        /**
+         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public static final EAttribute CHAIN__TYPE = eINSTANCE.getChain_Type();
+
         /**
          * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
          * <!-- begin-user-doc -->
diff --git a/axis-model/src/test/wsdd/stock.wsdd b/axis-model/src/test/wsdd/stock.wsdd
new file mode 100644
index 000000000..a4dc44ade
--- /dev/null
+++ b/axis-model/src/test/wsdd/stock.wsdd
@@ -0,0 +1,31 @@
+<!-- Use this file to deploy some handlers/chains and services      -->
+<!-- Two ways to do this:                                           -->
+<!--   java org.apache.axis.client.AdminClient deploy.wsdd          -->
+<!--      after the axis server is running                          -->
+<!-- or                                                             -->
+<!--   java org.apache.axis.utils.Admin client|server deploy.wsdd   -->
+<!--      from the same directory that the Axis engine runs         -->
+
+<deployment name="test" xmlns="http://xml.apache.org/axis/wsdd/" 
+    xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+
+  <service name="urn:xmltoday-delayed-quotes" provider="java:RPC">
+    <parameter name="className" value="samples.stock.StockQuoteService"/>
+    <parameter name="allowedMethods" value="getQuote test"/>
+    <parameter name="allowedRoles" value="user1,user2"/>
+    <parameter name="wsdlServicePort" value="GetQuote"/>
+
+    <requestFlow name="checks">
+      <handler type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+      <handler type="java:org.apache.axis.handlers.SimpleAuthorizationHandler"/>
+    </requestFlow>
+  </service>
+
+  <service name="urn:cominfo" provider="java:RPC">
+    <parameter name="className" value="samples.stock.ComInfoService" />
+    <parameter name="allowedMethods" value="getInfo" />
+    <parameter name="allowedRoles" value="user3"/>
+    <requestFlow type="checks"/>
+  </service>
+
+</deployment>
diff --git a/maven/maven-axis-server-plugin/pom.xml b/maven/maven-axis-server-plugin/pom.xml
index 099c4eacb..9bd5f86e9 100644
--- a/maven/maven-axis-server-plugin/pom.xml
+++ b/maven/maven-axis-server-plugin/pom.xml
@@ -43,6 +43,11 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-rt-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-plugin-api</artifactId>
@@ -69,13 +74,13 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>daemon-launcher</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-standalone-server</artifactId>
             <version>${project.version}</version>
-            <type>pom</type>
+            <scope>test</scope>
         </dependency>
     </dependencies>
     <reporting>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
index 7f7674871..1a455e4ca 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
@@ -96,7 +96,7 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo implem
     /**
      * @component
      */
-    protected ArtifactFactory artifactFactory;
+    private ArtifactFactory artifactFactory;
     
     /**
      * @component
@@ -159,6 +159,16 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo implem
      */
     private String argLine;
     
+    /**
+     * @parameter default-value="${plugin.version}"
+     * @required
+     * @readonly
+     */
+    private String axisVersion;
+    
+    private final Set/*<Artifact>*/ additionalDependencies = new HashSet();
+    private List/*<File>*/ classpath;
+    
     private Logger logger;
     
     public void enableLogging(Logger logger) {
@@ -169,61 +179,72 @@ protected boolean isDebug() {
         return debug;
     }
 
-    private List/*<File>*/ buildClasspath(Set/*<Artifact>*/ additionalArtifacts) throws ProjectBuildingException, InvalidDependencyVersionException, ArtifactResolutionException, ArtifactNotFoundException {
-        final Log log = getLog();
-        
-        // We need dependencies in scope test. Since this is the largest scope, we don't need
-        // to do any additional filtering based on dependency scope.
-        Set projectDependencies = project.getArtifacts();
-        
-        final Set artifacts = new HashSet(projectDependencies);
-        
-        if (additionalArtifacts != null) {
-            for (Iterator it = additionalArtifacts.iterator(); it.hasNext(); ) {
-                Artifact a = (Artifact)it.next();
-                if (log.isDebugEnabled()) {
-                    log.debug("Resolving artifact to be added to classpath: " + a);
-                }
-                ArtifactFilter filter = new ArtifactFilter() {
-                    public boolean include(Artifact artifact) {
-                        String id = artifact.getDependencyConflictId();
-                        for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
-                            if (id.equals(((Artifact)it.next()).getDependencyConflictId())) {
-                                return false;
+    protected final void addDependency(String groupId, String artifactId, String version) {
+        additionalDependencies.add(artifactFactory.createArtifact(groupId, artifactId, version, Artifact.SCOPE_TEST, "jar"));
+        classpath = null;
+    }
+    
+    protected final void addAxisDependency(String artifactId) {
+        addDependency("org.apache.axis", artifactId, axisVersion);
+    }
+    
+    protected final List/*<File>*/ getClasspath() throws ProjectBuildingException, InvalidDependencyVersionException, ArtifactResolutionException, ArtifactNotFoundException {
+        if (classpath == null) {
+            final Log log = getLog();
+            
+            // We need dependencies in scope test. Since this is the largest scope, we don't need
+            // to do any additional filtering based on dependency scope.
+            Set projectDependencies = project.getArtifacts();
+            
+            final Set artifacts = new HashSet(projectDependencies);
+            
+            if (additionalDependencies != null) {
+                for (Iterator it = additionalDependencies.iterator(); it.hasNext(); ) {
+                    Artifact a = (Artifact)it.next();
+                    if (log.isDebugEnabled()) {
+                        log.debug("Resolving artifact to be added to classpath: " + a);
+                    }
+                    ArtifactFilter filter = new ArtifactFilter() {
+                        public boolean include(Artifact artifact) {
+                            String id = artifact.getDependencyConflictId();
+                            for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+                                if (id.equals(((Artifact)it.next()).getDependencyConflictId())) {
+                                    return false;
+                                }
                             }
+                            return true;
                         }
-                        return true;
+                    };
+                    MavenProject p = projectBuilder.buildFromRepository(a, remoteArtifactRepositories, localRepository);
+                    if (filter.include(p.getArtifact())) {
+                        Set s = p.createArtifacts(artifactFactory, Artifact.SCOPE_RUNTIME, filter);
+                        artifacts.addAll(artifactCollector.collect(s,
+                                p.getArtifact(), p.getManagedVersionMap(),
+                                localRepository, remoteArtifactRepositories, artifactMetadataSource, filter,
+                                Collections.singletonList(new DebugResolutionListener(logger))).getArtifacts());
+                        artifacts.add(p.getArtifact());
                     }
-                };
-                MavenProject p = projectBuilder.buildFromRepository(a, remoteArtifactRepositories, localRepository);
-                if (filter.include(p.getArtifact())) {
-                    Set s = p.createArtifacts(artifactFactory, Artifact.SCOPE_RUNTIME, filter);
-                    artifacts.addAll(artifactCollector.collect(s,
-                            p.getArtifact(), p.getManagedVersionMap(),
-                            localRepository, remoteArtifactRepositories, artifactMetadataSource, filter,
-                            Collections.singletonList(new DebugResolutionListener(logger))).getArtifacts());
-                    artifacts.add(p.getArtifact());
                 }
             }
-        }
-        
-        List/*<File>*/ cp = new ArrayList();
-        cp.add(project.getBuild().getTestOutputDirectory());
-        cp.add(project.getBuild().getOutputDirectory());
-        for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
-            Artifact a = (Artifact)it.next();
-            if (a.getArtifactHandler().isAddedToClasspath()) {
-                if (a.getFile() == null) {
-                    artifactResolver.resolve(a, remoteArtifactRepositories, localRepository);
+            
+            classpath = new ArrayList();
+            classpath.add(new File(project.getBuild().getTestOutputDirectory()));
+            classpath.add(new File(project.getBuild().getOutputDirectory()));
+            for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+                Artifact a = (Artifact)it.next();
+                if (a.getArtifactHandler().isAddedToClasspath()) {
+                    if (a.getFile() == null) {
+                        artifactResolver.resolve(a, remoteArtifactRepositories, localRepository);
+                    }
+                    classpath.add(a.getFile());
                 }
-                cp.add(a.getFile());
             }
         }
         
-        return cp;
+        return classpath;
     }
     
-    protected final void startJavaProcess(String description, String mainClass, Set additionalDependencies, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
+    protected final void startJavaProcess(String description, String mainClass, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
         // Locate java executable to use
@@ -241,7 +262,7 @@ protected final void startJavaProcess(String description, String mainClass, Set
         // Get class path
         List classpath;
         try {
-            classpath = buildClasspath(additionalDependencies);
+            classpath = getClasspath();
         } catch (Exception ex) {
             throw new MojoExecutionException("Failed to build classpath", ex);
         }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AdminClientUtils.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AdminClientUtils.java
deleted file mode 100644
index 35bd695c4..000000000
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AdminClientUtils.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.axis.tools.maven.server;
-
-import java.io.File;
-
-import org.apache.axis.client.AdminClient;
-import org.codehaus.plexus.logging.Logger;
-
-public final class AdminClientUtils {
-    private AdminClientUtils() {}
-    
-    public static void process(Logger logger, AdminClient adminClient, File[] wsddFiles) throws Exception {
-        for (int i=0; i<wsddFiles.length; i++) {
-            File wsddFile = wsddFiles[i];
-            if (logger.isDebugEnabled()) {
-                logger.debug("Starting to process " + wsddFile);
-            }
-            String result = adminClient.process(wsddFile.getPath());
-            if (logger.isDebugEnabled()) {
-                logger.debug("AdminClient result: " + result);
-            }
-            logger.info("Processed " + wsddFile);
-        }
-    }
-}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
index b4a8b147a..0dd60af85 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
@@ -18,7 +18,6 @@
  */
 package org.apache.axis.tools.maven.server;
 
-import java.io.File;
 import java.net.URL;
 import java.rmi.RemoteException;
 
@@ -31,15 +30,11 @@
 public class AxisServerProcessControl implements ProcessControl {
     private final int port;
     private final AdminClient adminClient;
-    private final File[] deployments;
-    private final File[] undeployments;
     private final int timeout;
     
-    public AxisServerProcessControl(int port, AdminClient adminClient, File[] deployments, File[] undeployments, int timeout) {
+    public AxisServerProcessControl(int port, AdminClient adminClient, int timeout) {
         this.port = port;
         this.adminClient = adminClient;
-        this.deployments = deployments;
-        this.undeployments = undeployments;
         this.timeout = timeout;
     }
 
@@ -68,13 +63,9 @@ public void initializeProcess(Logger logger, Process process) throws Exception {
             }
             Thread.sleep(200);
         }
-        
-        // Deploy services
-        AdminClientUtils.process(logger, adminClient, deployments);
     }
 
     public int shutdownProcess(Logger logger) throws Exception {
-        AdminClientUtils.process(logger, adminClient, undeployments);
         adminClient.quit();
         return STOPPING;
     }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
index fedcac2dd..9455e8b24 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -21,10 +21,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.ServerSocket;
-import java.util.HashSet;
-import java.util.Set;
 
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 
@@ -36,13 +33,6 @@
  * @requiresDependencyResolution test
  */
 public class StartDaemonMojo extends AbstractStartProcessMojo {
-    /**
-     * @parameter default-value="${plugin.version}"
-     * @required
-     * @readonly
-     */
-    private String axisVersion;
-    
     /**
      * The daemon class.
      * 
@@ -82,8 +72,7 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         if (args != null) {
             System.arraycopy(args, 0, vmArgs, 2, args.length);
         }
-        Set additionalDependencies = new HashSet();
-        additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis", "daemon-launcher", axisVersion, Artifact.SCOPE_TEST, "jar"));
-        startJavaProcess(daemonClass, "org.apache.axis.tools.daemon.Launcher", additionalDependencies, vmArgs, workDir, new DaemonProcessControl(controlPort));
+        addAxisDependency("daemon-launcher");
+        startJavaProcess(daemonClass, "org.apache.axis.tools.daemon.Launcher", vmArgs, workDir, new DaemonProcessControl(controlPort));
     }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index 9edf7a6eb..75ea435e0 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -19,27 +19,24 @@
 package org.apache.axis.tools.maven.server;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
+import java.net.URLClassLoader;
 import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.axis.client.AdminClient;
-import org.apache.axis.deployment.wsdd.WSDDConstants;
-import org.apache.maven.artifact.Artifact;
+import org.apache.axis.model.wsdd.Deployment;
+import org.apache.axis.model.wsdd.WSDDUtil;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.logging.Log;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
-import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
 
 /**
  * Start a {@link org.apache.axis.server.standalone.StandaloneAxisServer} instance in a separate
@@ -50,13 +47,6 @@
  * @requiresDependencyResolution test
  */
 public class StartServerMojo extends AbstractStartProcessMojo {
-    /**
-     * @parameter default-value="${plugin.version}"
-     * @required
-     * @readonly
-     */
-    private String axisVersion;
-    
     /**
      * @parameter default-value="${project.build.directory}/axis-server"
      * @required
@@ -80,9 +70,7 @@ public class StartServerMojo extends AbstractStartProcessMojo {
     private int maxSessions;
     
     /**
-     * A set of WSDD files for services to deploy. The WSDD files may be deployment or undeployment
-     * requests. Undeployment requests will be processed when the server is stopped. The primary use
-     * case for this is to test undeployment.
+     * A set of WSDD files for services to deploy.
      * 
      * @parameter
      */
@@ -129,21 +117,34 @@ public class StartServerMojo extends AbstractStartProcessMojo {
     protected void doExecute() throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
+        // Need to setup additional dependencies before building the default configuration!
+        addAxisDependency("axis-standalone-server");
+        
         // Determine the port to be used
         int actualPort = foreground && foregroundPort != -1 ? foregroundPort : port;
         
-        // Select WSDD files
-        List deployments = new ArrayList();
-        List undeployments = new ArrayList();
-        if (wsdds != null && wsdds.length > 0) {
-            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-            dbf.setNamespaceAware(true);
-            DocumentBuilder documentBuilder;
+        // Prepare a work directory where we can place the server-config.wsdd file
+        File workDir = new File(workDirBase, String.valueOf(actualPort));
+        if (workDir.exists()) {
             try {
-                documentBuilder = dbf.newDocumentBuilder();
-            } catch (ParserConfigurationException ex) {
-                throw new MojoFailureException("Unable to initialize DOM parser", ex);
+                FileUtils.deleteDirectory(workDir);
+            } catch (IOException ex) {
+                throw new MojoFailureException("Failed to clean the work directory", ex);
             }
+        }
+        File webInfDir = new File(workDir, "WEB-INF");
+        webInfDir.mkdirs();
+        
+        // Start with the default configuration (which depends on the JARs in the classpath)
+        Deployment deployment;
+        try {
+            deployment = WSDDUtil.buildDefaultConfiguration(buildClassLoader(), "server");
+        } catch (IOException ex) {
+            throw new MojoExecutionException("Failed to build default server configuration", ex);
+        }
+        
+        // Select WSDD files
+        if (wsdds != null) {
             for (int i=0; i<wsdds.length; i++) {
                 FileSet wsdd = wsdds[i];
                 DirectoryScanner scanner = wsdd.createScanner();
@@ -151,47 +152,30 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
                 String[] includedFiles = scanner.getIncludedFiles();
                 for (int j=0; j<includedFiles.length; j++) {
                     File wsddFile = new File(wsdd.getDirectory(), includedFiles[j]);
-                    Element wsddElement;
                     try {
-                        wsddElement = documentBuilder.parse(wsddFile).getDocumentElement();
-                    } catch (Exception ex) {
-                        log.warn("Skipping " + wsddFile + ": not an XML file", ex);
-                        continue;
-                    }
-                    if (WSDDConstants.URI_WSDD.equals(wsddElement.getNamespaceURI())) {
-                        String type = wsddElement.getLocalName();
-                        if (type.equals(WSDDConstants.ELEM_WSDD_DEPLOY)) {
-                            deployments.add(wsddFile);
-                        } else if (type.equals(WSDDConstants.ELEM_WSDD_UNDEPLOY)) {
-                            undeployments.add(wsddFile);
-                        } else {
-                            log.warn("Skipping " + wsddFile + ": unexpected WSDD type");
-                        }
-                    } else {
-                        log.warn("Skipping " + wsddFile + ": not a WSDD file");
+                        deployment.merge(WSDDUtil.load(new InputSource(wsddFile.toURI().toString())));
+                    } catch (IOException ex) {
+                        throw new MojoExecutionException("Failed to load " + wsddFile, ex);
                     }
+                    getLog().info("Processed " + wsddFile);
                 }
             }
-            if (log.isDebugEnabled()) {
-                log.debug("Deployments: " + deployments);
-                log.debug("Undeployments: " + undeployments);
-            }
         }
         
-        // Prepare a work directory where the server can create a server-config.wsdd file
-        File workDir = new File(workDirBase, String.valueOf(actualPort));
-        if (workDir.exists()) {
+        // Write the server-config.wsdd file
+        File serverConfigWsdd = new File(webInfDir, "server-config.wsdd");
+        try {
+            FileOutputStream out = new FileOutputStream(serverConfigWsdd);
             try {
-                FileUtils.deleteDirectory(workDir);
-            } catch (IOException ex) {
-                throw new MojoFailureException("Failed to clean the work directory", ex);
+                WSDDUtil.save(deployment, out);
+            } finally {
+                out.close();
             }
+        } catch (IOException ex) {
+            throw new MojoExecutionException("Failed to write " + serverConfigWsdd, ex);
         }
-        workDir.mkdirs();
         
         if (configs != null && configs.length > 0) {
-            File webInfDir = new File(workDir, "WEB-INF");
-            webInfDir.mkdirs();
             for (int i=0; i<configs.length; i++) {
                 FileSet config = configs[i];
                 DirectoryScanner scanner = config.createScanner();
@@ -224,17 +208,12 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         try {
             AdminClient adminClient = new AdminClient(true);
             adminClient.setTargetEndpointAddress(new URL("http://localhost:" + actualPort + "/axis/services/AdminService"));
-            Set additionalDependencies = new HashSet();
-            additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis", "axis-standalone-server", axisVersion, Artifact.SCOPE_TEST, "jar"));
             startJavaProcess(
                     "Server on port " + actualPort,
                     "org.apache.axis.server.standalone.StandaloneAxisServer",
-                    additionalDependencies,
                     (String[])args.toArray(new String[args.size()]),
                     workDir,
                     new AxisServerProcessControl(actualPort, adminClient,
-                            (File[])deployments.toArray(new File[deployments.size()]),
-                            (File[])undeployments.toArray(new File[undeployments.size()]),
                             isDebug() || foreground ? Integer.MAX_VALUE : 20000));
         } catch (Exception ex) {
             throw new MojoFailureException("Failed to start server", ex);
@@ -253,4 +232,22 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
             }
         }
     }
+    
+    private ClassLoader buildClassLoader() throws MojoExecutionException {
+        List classpath;
+        try {
+            classpath = getClasspath();
+        } catch (Exception ex) {
+            throw new MojoExecutionException("Failed to build classpath", ex);
+        }
+        URL[] urls = new URL[classpath.size()];
+        for (int i=0; i<classpath.size(); i++) {
+            try {
+                urls[i] = ((File)classpath.get(i)).toURI().toURL();
+            } catch (MalformedURLException ex) {
+                throw new MojoExecutionException("Unexpected exception", ex);
+            }
+        }
+        return new URLClassLoader(urls);
+    }
 }
diff --git a/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java b/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
index f2fba7d46..7f7e47e27 100644
--- a/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
+++ b/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
@@ -106,47 +106,11 @@ public void execute() throws MojoExecutionException, MojoFailureException {
         
         Deployment deployment;
         
-        // Note: To locate the different parts of the default configuration, we use the same
-        //       algorithm as in DefaultConfiguration.
-        
-        // Load the base configuration
-        String resourceName = "org/apache/axis/" + type + "/" + type + "-config.wsdd";
-        InputStream in = cl.getResourceAsStream(resourceName);
-        if (in == null) {
-            throw new MojoFailureException("Resource " + resourceName + " not found");
-        }
-        getLog().info("Loading resource " + resourceName);
-        try {
-            try {
-                deployment = WSDDUtil.load(new InputSource(in));
-            } finally {
-                in.close();
-            }
-        } catch (IOException ex) {
-            throw new MojoFailureException("Failed to process resource " + resourceName, ex);
-        }
-        
-        // Discover and load additional default configuration fragments
-        resourceName = "META-INF/axis/default-" + type + "-config.wsdd";
-        Enumeration resources;
+        getLog().info("Loading default configuration");
         try {
-            resources = cl.getResources(resourceName);
+            deployment = WSDDUtil.buildDefaultConfiguration(cl, type);
         } catch (IOException ex) {
-            throw new MojoFailureException("Failed to discover resources with name " + resourceName, ex);
-        }
-        while (resources.hasMoreElements()) {
-            URL url = (URL)resources.nextElement();
-            getLog().info("Loading " + url);
-            try {
-                in = url.openStream();
-                try {
-                    deployment.merge(WSDDUtil.load(new InputSource(in)));
-                } finally {
-                    in.close();
-                }
-            } catch (Exception ex) {
-                throw new MojoFailureException("Failed to process " + url, ex);
-            }
+            throw new MojoFailureException("Unable to build default configuration", ex);
         }
         
         if (files != null) {
diff --git a/samples/attachments-sample/pom.xml b/samples/attachments-sample/pom.xml
index 7cb2b3da6..6d6049441 100644
--- a/samples/attachments-sample/pom.xml
+++ b/samples/attachments-sample/pom.xml
@@ -86,7 +86,8 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>attachdeploy.wsdd</include>
+                                        <include>testref.wsdd</include>
                                     </includes>
                                 </wsdd>
                             </wsdds>
diff --git a/samples/encoding-sample/pom.xml b/samples/encoding-sample/pom.xml
index 7821b8722..261fe4a6f 100644
--- a/samples/encoding-sample/pom.xml
+++ b/samples/encoding-sample/pom.xml
@@ -86,7 +86,7 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                             </wsdds>
diff --git a/samples/faults-sample/pom.xml b/samples/faults-sample/pom.xml
index ceaceca9e..e11affc59 100644
--- a/samples/faults-sample/pom.xml
+++ b/samples/faults-sample/pom.xml
@@ -86,7 +86,7 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                             </wsdds>
diff --git a/samples/jaxrpc-sample/pom.xml b/samples/jaxrpc-sample/pom.xml
index c4d2bd0bd..cfe872729 100644
--- a/samples/jaxrpc-sample/pom.xml
+++ b/samples/jaxrpc-sample/pom.xml
@@ -120,13 +120,13 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>**/deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                                 <wsdd>
                                     <directory>../stock-sample/src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                                 <wsdd>
diff --git a/samples/message-sample/pom.xml b/samples/message-sample/pom.xml
index 9721884d5..5f9c9062f 100644
--- a/samples/message-sample/pom.xml
+++ b/samples/message-sample/pom.xml
@@ -86,7 +86,7 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                             </wsdds>
diff --git a/samples/misc-sample/pom.xml b/samples/misc-sample/pom.xml
index 7dd9b8477..4261f04d2 100644
--- a/samples/misc-sample/pom.xml
+++ b/samples/misc-sample/pom.xml
@@ -86,7 +86,7 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                             </wsdds>
diff --git a/samples/stock-sample/pom.xml b/samples/stock-sample/pom.xml
index e924835a4..6436fb810 100644
--- a/samples/stock-sample/pom.xml
+++ b/samples/stock-sample/pom.xml
@@ -99,7 +99,7 @@
                                 <wsdd>
                                     <directory>src/main/wsdd</directory>
                                     <includes>
-                                        <include>**/*.wsdd</include>
+                                        <include>deploy.wsdd</include>
                                     </includes>
                                 </wsdd>
                             </wsdds>

From e0bde98507f763318f6d2a17714933e927bbf082 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 9 Dec 2012 21:38:06 +0000
Subject: [PATCH 013/133] Automate the setup of the JWS stuff.

---
 .../main/resources/META-INF/axis/default-server-config.wsdd  | 0
 .../apache/axis/server/standalone/StandaloneAxisServer.java  | 1 -
 .../apache/axis/server/standalone/StandaloneAxisServlet.java | 4 ----
 integration/pom.xml                                          | 5 -----
 .../org/apache/axis/tools/maven/server/StartServerMojo.java  | 3 +++
 samples/stock-sample/pom.xml                                 | 5 -----
 6 files changed, 3 insertions(+), 15 deletions(-)
 rename axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd => axis-rt-jws/src/main/resources/META-INF/axis/default-server-config.wsdd (100%)

diff --git a/axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd b/axis-rt-jws/src/main/resources/META-INF/axis/default-server-config.wsdd
similarity index 100%
rename from axis-standalone-server/src/main/resources/org/apache/axis/server/standalone/jws-handler.wsdd
rename to axis-rt-jws/src/main/resources/META-INF/axis/default-server-config.wsdd
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
index ebe988161..fffd538e2 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
@@ -115,7 +115,6 @@ public static void main(String[] args) throws Exception {
             for (int i=0; i<jwsDirs.length; i++) {
                 resources.add(Resource.newResource(jwsDirs[i]));
             }
-            servlet.enableJWS();
             enableJWS = true;
         } else {
             enableJWS = false;
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
index 2b0a8cb43..faf69fab9 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
@@ -45,10 +45,6 @@ public StandaloneAxisServlet() {
         wsddUrls.add(StandaloneAxisServlet.class.getResource("quit-handler-deploy.wsdd"));
     }
     
-    public void enableJWS() {
-        wsddUrls.add(StandaloneAxisServlet.class.getResource("jws-handler.wsdd"));
-    }
-    
     public void init() throws ServletException {
         super.init();
         try {
diff --git a/integration/pom.xml b/integration/pom.xml
index 1875db263..4facb2599 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>axis-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-rt-jws</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-codegen</artifactId>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index 75ea435e0..16f94b323 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -119,6 +119,9 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         
         // Need to setup additional dependencies before building the default configuration!
         addAxisDependency("axis-standalone-server");
+        if (jwsDirs != null && jwsDirs.length > 0) {
+            addAxisDependency("axis-rt-jws");
+        }
         
         // Determine the port to be used
         int actualPort = foreground && foregroundPort != -1 ? foregroundPort : port;
diff --git a/samples/stock-sample/pom.xml b/samples/stock-sample/pom.xml
index 6436fb810..af0238703 100644
--- a/samples/stock-sample/pom.xml
+++ b/samples/stock-sample/pom.xml
@@ -33,11 +33,6 @@
             <artifactId>axis-rt-core</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-rt-jws</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

From 8e94073901ea149507668153c4635b98486d1c2b Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 10 Dec 2012 21:28:56 +0000
Subject: [PATCH 014/133] Skip distribution tests is skipTests=true.

---
 distribution/pom.xml | 6 ++++--
 pom.xml              | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index e7dbb22c8..538f6d739 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -81,7 +81,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target>
+                            <target unless="${skipTests}">
                                 <unzip src="${project.build.directory}/${project.artifactId}-${project.version}-bin.zip" dest="${project.build.directory}" />
                             </target>
                         </configuration>
@@ -93,7 +93,7 @@
                             <goal>run</goal>
                         </goals>
                         <configuration>
-                            <target>
+                            <target unless="${skipTests}">
                                 <ant dir="${project.build.directory}/axis-${project.version}/samples/addr"/>
                                 <ant dir="${project.build.directory}/axis-${project.version}/samples/attachments"/>
                                 <ant dir="${project.build.directory}/axis-${project.version}/samples/bidbuy"/>
@@ -140,6 +140,7 @@
                         <configuration>
                             <outputDirectory>${project.build.directory}/axis-${project.version}/lib</outputDirectory>
                             <includeArtifactIds>junit</includeArtifactIds>
+                            <skip>${skipTests}</skip>
                         </configuration>
                     </execution>
                     <execution>
@@ -159,6 +160,7 @@
                             <overWrite>true</overWrite>
                             <outputDirectory>${project.build.directory}/jboss/lib</outputDirectory>
                             <stripVersion>true</stripVersion>
+                            <skip>${skipTests}</skip>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 43ec7afc5..c95820374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,7 +204,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.4</version>
+                    <version>2.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

From 57c024a269a7276215dcee3c9ec1197a745d4912 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 11 Dec 2012 17:26:34 +0000
Subject: [PATCH 015/133] * Added a Daemon implementation for the Axis
 stand-alone server. * Simplified the maven-axis-server-plugin: now all
 processes controlled by the plug-in are Daemon implementations.

---
 axis-standalone-server/pom.xml                |  19 +++
 .../standalone/LimitSessionManager.java       |   4 +-
 .../axis/server/standalone/QuitHandler.java   |   5 +-
 .../axis/server/standalone/QuitListener.java  |   2 +-
 .../server/standalone/ServerException.java    |  27 +++
 .../standalone/StandaloneAxisServer.java      | 154 +++++++++---------
 .../standalone/StandaloneAxisServlet.java     |   2 +-
 .../server/standalone/cli/Configurator.java   |  98 +++++++++++
 .../standalone/cli/ConfiguratorException.java |  26 +--
 .../axis/server/standalone/cli/Main.java      |  62 +++++++
 .../standalone/daemon/AxisServerDaemon.java   |  52 ++++++
 distribution/pom.xml                          |   5 +
 maven/maven-axis-server-plugin/pom.xml        |   4 -
 ...jo.java => AbstractDaemonControlMojo.java} |   8 +-
 ...Mojo.java => AbstractStartDaemonMojo.java} |  40 +++--
 .../server/AxisServerProcessControl.java      |  72 --------
 ...ProcessManager.java => DaemonManager.java} |   4 +-
 ...Manager.java => DefaultDaemonManager.java} |  38 +++--
 .../tools/maven/server/ProcessControl.java    |  60 -------
 ...nProcessControl.java => RemoteDaemon.java} |  27 ++-
 .../tools/maven/server/StartDaemonMojo.java   |  23 +--
 .../tools/maven/server/StartServerMojo.java   |  15 +-
 .../axis/tools/maven/server/StopAllMojo.java  |   4 +-
 .../resources/META-INF/plexus/components.xml  |   4 +-
 24 files changed, 444 insertions(+), 311 deletions(-)
 create mode 100644 axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
 create mode 100644 axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Configurator.java
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java => axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/ConfiguratorException.java (56%)
 create mode 100644 axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Main.java
 create mode 100644 axis-standalone-server/src/main/java/org/apache/axis/server/standalone/daemon/AxisServerDaemon.java
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{AbstractServerMojo.java => AbstractDaemonControlMojo.java} (90%)
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{AbstractStartProcessMojo.java => AbstractStartDaemonMojo.java} (89%)
 delete mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{ProcessManager.java => DaemonManager.java} (85%)
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{DefaultProcessManager.java => DefaultDaemonManager.java} (68%)
 delete mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java
 rename maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/{DaemonProcessControl.java => RemoteDaemon.java} (74%)

diff --git a/axis-standalone-server/pom.xml b/axis-standalone-server/pom.xml
index 92b48d7f5..7a0f5e937 100644
--- a/axis-standalone-server/pom.xml
+++ b/axis-standalone-server/pom.xml
@@ -48,6 +48,10 @@
             <artifactId>commons-cli</artifactId>
             <version>1.2</version>
         </dependency>
+        <dependency>
+            <groupId>commons-daemon</groupId>
+            <artifactId>commons-daemon</artifactId>
+        </dependency>
         <dependency>
             <!-- Jetty 6.1 is the last version with support for Java 1.4 -->
             <groupId>org.mortbay.jetty</groupId>
@@ -55,6 +59,21 @@
             <version>6.1.26</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <mainClass>org.apache.axis.server.standalone.cli.Main</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <reporting>
         <plugins>
             <plugin>
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java
index 3ab816d05..aef1f3cd1 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java
@@ -32,7 +32,7 @@
  * 
  * @author Andreas Veithen
  */
-public class LimitSessionManager extends HashSessionManager {
+final class LimitSessionManager extends HashSessionManager {
     // This is only needed to get access to some protected methods/fields.
     class Session extends HashSessionManager.Session {
         private static final long serialVersionUID = -6648322281268846583L;
@@ -54,7 +54,7 @@ protected void timeout() {
     private Timer timer;
     private TimerTask task;
 
-    public LimitSessionManager(int maxSessions) {
+    LimitSessionManager(int maxSessions) {
         this.maxSessions = maxSessions;
     }
 
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitHandler.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitHandler.java
index 853decd90..3afef3fa5 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitHandler.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitHandler.java
@@ -29,10 +29,13 @@
 /**
  * Handler that looks for the {@link MessageContext#QUIT_REQUESTED} flag set by {@link Admin} and
  * initiates the shutdown procedure if the flag is set.
+ * <p>
+ * Note: this is an internal class that should not be used by application code.
  * 
  * @author Andreas Veithen
  */
-public class QuitHandler extends BasicHandler {
+// Must be public so that the Axis core can load it
+public final class QuitHandler extends BasicHandler {
     public static final String QUIT_LISTENER = QuitListener.class.getName();
     
     public void invoke(MessageContext msgContext) throws AxisFault {
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java
index 5600c0bd0..4ec7ee775 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/QuitListener.java
@@ -23,7 +23,7 @@
  * 
  * @author Andreas Veithen
  */
-class QuitListener {
+final class QuitListener {
     private boolean quit;
     
     synchronized void requestQuit() {
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
new file mode 100644
index 000000000..f53dd3c29
--- /dev/null
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/ServerException.java
@@ -0,0 +1,27 @@
+/*
+ * 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.axis.server.standalone;
+
+public class ServerException extends Exception {
+    private static final long serialVersionUID = 2996112474203025829L;
+
+    public ServerException(Throwable cause) {
+        super(cause);
+    }
+}
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
index fffd538e2..d403e05e3 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServer.java
@@ -19,16 +19,10 @@
 package org.apache.axis.server.standalone;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.GnuParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;
 import org.mortbay.jetty.Server;
 import org.mortbay.jetty.SessionManager;
 import org.mortbay.jetty.servlet.Context;
@@ -45,82 +39,71 @@
  * 
  * @author Andreas Veithen
  */
-public class StandaloneAxisServer {
-    public static void main(String[] args) throws Exception {
-        Options options = new Options();
-        
-        {
-            Option option = new Option("p", true, "the HTTP port");
-            option.setArgName("port");
-            option.setRequired(true);
-            options.addOption(option);
-        }
-        
-        {
-            Option option = new Option("w", true, "the work directory");
-            option.setArgName("dir");
-            option.setRequired(true);
-            options.addOption(option);
-        }
-        
-        {
-            Option option = new Option("j", true, "a list of directories to look up JWS files from");
-            option.setArgName("dirs");
-            options.addOption(option);
-        }
-        
-        {
-            Option option = new Option("m", true, "the maximum number of concurrently active sessions");
-            option.setArgName("count");
-            options.addOption(option);
-        }
-        
-        if (args.length == 0) {
-            HelpFormatter formatter = new HelpFormatter();
-            formatter.printHelp(StandaloneAxisServer.class.getName(), options);
-            return;
-        }
-        
-        CommandLineParser parser = new GnuParser();
-        CommandLine cmdLine;
-        try {
-            cmdLine = parser.parse(options, args);
-        } catch (ParseException ex) {
-            System.err.println(ex.getMessage());
-            System.exit(1);
-            return; // Make compiler happy
-        }
-        
-        int port = Integer.parseInt(cmdLine.getOptionValue("p"));
-        
-        int maxSessions;
-        if (cmdLine.hasOption("m")) {
-            maxSessions = Integer.parseInt(cmdLine.getOptionValue("m"));
-        } else {
-            maxSessions = -1;
-        }
-        
+public final class StandaloneAxisServer {
+    private int port;
+    private File workDir;
+    private int maxSessions = -1;
+    private File[] jwsDirs;
+    
+    private Server server;
+    private QuitListener quitListener;
+    
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public File getWorkDir() {
+        return workDir;
+    }
+
+    public void setWorkDir(File workDir) {
+        this.workDir = workDir;
+    }
+
+    public int getMaxSessions() {
+        return maxSessions;
+    }
+
+    public void setMaxSessions(int maxSessions) {
+        this.maxSessions = maxSessions;
+    }
+
+    public File[] getJwsDirs() {
+        return jwsDirs == null ? null : (File[])jwsDirs.clone();
+    }
+
+    public void setJwsDirs(File[] jwsDirs) {
+        this.jwsDirs = jwsDirs == null ? null : (File[])jwsDirs.clone();
+    }
+
+    public void init() throws ServerException {
         StandaloneAxisServlet servlet = new StandaloneAxisServlet();
         
         List resources = new ArrayList();
         
         // Add the work dir as a resource so that Axis can create its server-config.wsdd file there
-        File workDir = new File(cmdLine.getOptionValue("w"));
         new File(workDir, "WEB-INF").mkdir();
-        resources.add(Resource.newResource(workDir.getAbsolutePath()));
+        try {
+            resources.add(Resource.newResource(workDir.getAbsolutePath()));
+        } catch (IOException ex) {
+            throw new ServerException(ex);
+        }
         
-        boolean enableJWS;
-        if (cmdLine.hasOption("j")) {
-            String[] jwsDirs = cmdLine.getOptionValue("j").split(File.pathSeparator);
+        if (jwsDirs != null) {
             for (int i=0; i<jwsDirs.length; i++) {
-                resources.add(Resource.newResource(jwsDirs[i]));
+                try {
+                    resources.add(Resource.newResource(jwsDirs[i].getAbsolutePath()));
+                } catch (IOException ex) {
+                    throw new ServerException(ex);
+                }
             }
-            enableJWS = true;
-        } else {
-            enableJWS = false;
         }
         
-        Server server = new Server(port);
+        server = new Server(port);
         server.setGracefulShutdown(1000);
         Context context = new Context(server, "/axis");
         context.setBaseResource(new ResourceCollection((Resource[])resources.toArray(new Resource[resources.size()])));
@@ -131,7 +114,7 @@ public static void main(String[] args) throws Exception {
             sessionManager = new LimitSessionManager(maxSessions);
         }
         context.setSessionHandler(new SessionHandler(sessionManager));
-        QuitListener quitListener = new QuitListener();
+        quitListener = new QuitListener();
         context.setAttribute(QuitHandler.QUIT_LISTENER, quitListener);
         ServletHandler servletHandler = context.getServletHandler();
         ServletHolder axisServletHolder = new ServletHolder(servlet);
@@ -149,18 +132,31 @@ public static void main(String[] args) throws Exception {
             mapping.setPathSpec("/servlet/AxisServlet");
             servletHandler.addServletMapping(mapping);
         }
-        if (enableJWS) {
+        if (jwsDirs != null && jwsDirs.length > 0) {
             ServletMapping mapping = new ServletMapping();
             mapping.setServletName("AxisServlet");
             mapping.setPathSpec("*.jws");
             servletHandler.addServletMapping(mapping);
         }
-        server.start();
+    }
+    
+    public void start() throws ServerException {
+        try {
+            server.start();
+        } catch (Exception ex) {
+            throw new ServerException(ex);
+        }
+    }
+    
+    public void awaitQuitRequest() throws InterruptedException {
+        quitListener.awaitQuitRequest();
+    }
+    
+    public void stop() throws ServerException {
         try {
-            quitListener.awaitQuitRequest();
-        } catch (InterruptedException ex) {
-            // Just continue and stop the server
+            server.stop();
+        } catch (Exception ex) {
+            throw new ServerException(ex);
         }
-        server.stop();
     }
 }
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
index faf69fab9..fbbf12223 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/StandaloneAxisServlet.java
@@ -37,7 +37,7 @@
  * 
  * @author Andreas Veithen
  */
-public class StandaloneAxisServlet extends AxisServlet {
+final class StandaloneAxisServlet extends AxisServlet {
     private final List/*<URL>*/ wsddUrls;
     
     public StandaloneAxisServlet() {
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Configurator.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Configurator.java
new file mode 100644
index 000000000..1449feb56
--- /dev/null
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Configurator.java
@@ -0,0 +1,98 @@
+/*
+ * 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.axis.server.standalone.cli;
+
+import java.io.File;
+import java.io.PrintWriter;
+
+import org.apache.axis.server.standalone.StandaloneAxisServer;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+
+public final class Configurator {
+    public static final Configurator INSTANCE = new Configurator();
+    
+    private final Options options;
+    
+    private Configurator() {
+        options = new Options();
+        
+        {
+            Option option = new Option("p", true, "the HTTP port");
+            option.setArgName("port");
+            option.setRequired(true);
+            options.addOption(option);
+        }
+        
+        {
+            Option option = new Option("w", true, "the work directory");
+            option.setArgName("dir");
+            option.setRequired(true);
+            options.addOption(option);
+        }
+        
+        {
+            Option option = new Option("j", true, "a list of directories to look up JWS files from");
+            option.setArgName("dirs");
+            options.addOption(option);
+        }
+        
+        {
+            Option option = new Option("m", true, "the maximum number of concurrently active sessions");
+            option.setArgName("count");
+            options.addOption(option);
+        }
+    }
+    
+    public void printHelp(PrintWriter pw, String app) {
+        HelpFormatter formatter = new HelpFormatter();
+        formatter.printUsage(pw, 100, app, options);
+        formatter.printOptions(pw, 100, options, 1, 2);
+        pw.flush();
+    }
+    
+    public void configure(StandaloneAxisServer server, String[] args) throws ConfiguratorException {
+        CommandLineParser parser = new GnuParser();
+        CommandLine cmdLine;
+        try {
+            cmdLine = parser.parse(options, args);
+        } catch (ParseException ex) {
+            throw new ConfiguratorException(ex.getMessage());
+        }
+        
+        server.setPort(Integer.parseInt(cmdLine.getOptionValue("p")));
+        server.setWorkDir(new File(cmdLine.getOptionValue("w")));
+        if (cmdLine.hasOption("m")) {
+            server.setMaxSessions(Integer.parseInt(cmdLine.getOptionValue("m")));
+        }
+        if (cmdLine.hasOption("j")) {
+            String[] jwsDirStrings = cmdLine.getOptionValue("j").split(File.pathSeparator);
+            File[] jwsDirs = new File[jwsDirStrings.length];
+            for (int i=0; i<jwsDirStrings.length; i++) {
+                jwsDirs[i] = new File(jwsDirStrings[i]);
+            }
+            server.setJwsDirs(jwsDirs);
+        }
+    }
+}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/ConfiguratorException.java
similarity index 56%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java
rename to axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/ConfiguratorException.java
index 2237691a4..1d97eaba7 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ManagedProcess.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/ConfiguratorException.java
@@ -16,28 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.axis.tools.maven.server;
+package org.apache.axis.server.standalone.cli;
 
-public class ManagedProcess {
-    private final Process process;
-    private final String description;
-    private final ProcessControl processControl;
+public class ConfiguratorException extends Exception {
+    private static final long serialVersionUID = 664045878448812254L;
 
-    public ManagedProcess(Process process, String description, ProcessControl processControl) {
-        this.process = process;
-        this.description = description;
-        this.processControl = processControl;
+    public ConfiguratorException(Throwable cause) {
+        super(cause);
     }
 
-    public Process getProcess() {
-        return process;
-    }
-
-    public String getDescription() {
-        return description;
-    }
-
-    public ProcessControl getProcessControl() {
-        return processControl;
+    public ConfiguratorException(String message) {
+        super(message);
     }
 }
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Main.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Main.java
new file mode 100644
index 000000000..cca06a235
--- /dev/null
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/cli/Main.java
@@ -0,0 +1,62 @@
+/*
+ * 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.axis.server.standalone.cli;
+
+import java.io.PrintWriter;
+
+import org.apache.axis.server.standalone.ServerException;
+import org.apache.axis.server.standalone.StandaloneAxisServer;
+
+/**
+ * Main class to run the stand-alone server from the command line.
+ * 
+ * @author Andreas Veithen
+ */
+public class Main {
+    public static void main(String[] args) {
+        StandaloneAxisServer server = new StandaloneAxisServer();
+        
+        if (args.length == 0) {
+            Configurator.INSTANCE.printHelp(new PrintWriter(System.out), Main.class.getName());
+            return;
+        }
+        
+        try {
+            Configurator.INSTANCE.configure(server, args);
+        } catch (ConfiguratorException ex) {
+            System.err.println(ex.getMessage());
+            System.exit(1);
+            return; // Make compiler happy
+        }
+        
+        try {
+            server.init();
+            server.start();
+            try {
+                server.awaitQuitRequest();
+            } catch (InterruptedException ex) {
+                // Just continue and stop the server
+            }
+            server.stop();
+        } catch (ServerException ex) {
+            ex.printStackTrace();
+            System.exit(1);
+        }
+    }
+}
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/daemon/AxisServerDaemon.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/daemon/AxisServerDaemon.java
new file mode 100644
index 000000000..9b600c017
--- /dev/null
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/daemon/AxisServerDaemon.java
@@ -0,0 +1,52 @@
+/*
+ * 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.axis.server.standalone.daemon;
+
+import org.apache.axis.server.standalone.StandaloneAxisServer;
+import org.apache.axis.server.standalone.cli.Configurator;
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
+import org.apache.commons.daemon.DaemonInitException;
+
+/**
+ * {@link Daemon} implementation that runs the stand-alone Axis server.
+ * 
+ * @author Andreas Veithen
+ */
+public class AxisServerDaemon implements Daemon {
+    private StandaloneAxisServer server;
+    
+    public void init(DaemonContext context) throws DaemonInitException, Exception {
+        server = new StandaloneAxisServer();
+        Configurator.INSTANCE.configure(server, context.getArguments());
+        server.init();
+    }
+
+    public void start() throws Exception {
+        server.start();
+    }
+
+    public void stop() throws Exception {
+        server.stop();
+    }
+
+    public void destroy() {
+        server = null;
+    }
+}
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 538f6d739..7b2617f4c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -47,6 +47,11 @@
             <artifactId>axis-tools</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-standalone-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/maven/maven-axis-server-plugin/pom.xml b/maven/maven-axis-server-plugin/pom.xml
index 9bd5f86e9..7c4b29139 100644
--- a/maven/maven-axis-server-plugin/pom.xml
+++ b/maven/maven-axis-server-plugin/pom.xml
@@ -39,10 +39,6 @@
         </site>
     </distributionManagement>
     <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-rt-core</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-model</artifactId>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
similarity index 90%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractServerMojo.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
index a67ad7dfa..4cb075172 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractServerMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
@@ -24,7 +24,7 @@
 
 import com.github.veithen.ulog.PlexusLoggerInjector;
 
-public abstract class AbstractServerMojo extends AbstractMojo {
+public abstract class AbstractDaemonControlMojo extends AbstractMojo {
     /**
      * @component
      */
@@ -35,7 +35,7 @@ public abstract class AbstractServerMojo extends AbstractMojo {
     /**
      * @component
      */
-    private ProcessManager processManager;
+    private DaemonManager daemonManager;
 
     /**
      * Set this to <code>true</code> to skip running tests, but still compile them. This is the same
@@ -45,8 +45,8 @@ public abstract class AbstractServerMojo extends AbstractMojo {
      */
     private boolean skipTests;
     
-    public ProcessManager getProcessManager() {
-        return processManager;
+    public final DaemonManager getDaemonManager() {
+        return daemonManager;
     }
 
     public final void execute() throws MojoExecutionException, MojoFailureException {
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
similarity index 89%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
index 1a455e4ca..9e821ba00 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
@@ -19,6 +19,8 @@
 package org.apache.axis.tools.maven.server;
 
 import java.io.File;
+import java.io.IOException;
+import java.net.ServerSocket;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -51,7 +53,7 @@
 import org.codehaus.plexus.logging.Logger;
 import org.codehaus.plexus.util.StringUtils;
 
-public abstract class AbstractStartProcessMojo extends AbstractServerMojo implements LogEnabled {
+public abstract class AbstractStartDaemonMojo extends AbstractDaemonControlMojo implements LogEnabled {
     /**
      * The maven project.
      *
@@ -171,14 +173,10 @@ public abstract class AbstractStartProcessMojo extends AbstractServerMojo implem
     
     private Logger logger;
     
-    public void enableLogging(Logger logger) {
+    public final void enableLogging(Logger logger) {
         this.logger = logger;
     }
     
-    protected boolean isDebug() {
-        return debug;
-    }
-
     protected final void addDependency(String groupId, String artifactId, String version) {
         additionalDependencies.add(artifactFactory.createArtifact(groupId, artifactId, version, Artifact.SCOPE_TEST, "jar"));
         classpath = null;
@@ -244,7 +242,18 @@ public boolean include(Artifact artifact) {
         return classpath;
     }
     
-    protected final void startJavaProcess(String description, String mainClass, String[] args, File workDir, ProcessControl processControl) throws MojoExecutionException, MojoFailureException {
+    private int allocatePort() throws MojoFailureException {
+        try {
+            ServerSocket ss = new ServerSocket(0);
+            int port = ss.getLocalPort();
+            ss.close();
+            return port;
+        } catch (IOException ex) {
+            throw new MojoFailureException("Failed to allocate port number", ex);
+        }
+    }
+    
+    protected final void startDaemon(String description, String daemonClass, String[] args, File workDir) throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
         // Locate java executable to use
@@ -259,6 +268,8 @@ protected final void startJavaProcess(String description, String mainClass, Stri
             log.debug("Java executable: " + jvm);
         }
         
+        int controlPort = allocatePort();
+        
         // Get class path
         List classpath;
         try {
@@ -290,14 +301,16 @@ protected final void startJavaProcess(String description, String mainClass, Stri
         cmdline.add("-cp");
         cmdline.add(StringUtils.join(classpath.iterator(), File.pathSeparator));
         cmdline.addAll(vmArgs);
-        cmdline.add(mainClass);
+        cmdline.add("org.apache.axis.tools.daemon.Launcher");
+        cmdline.add(daemonClass);
+        cmdline.add(String.valueOf(controlPort));
         cmdline.addAll(Arrays.asList(args));
         try {
-            getProcessManager().startProcess(
+            getDaemonManager().startDaemon(
                     description,
                     (String[])cmdline.toArray(new String[cmdline.size()]),
                     workDir,
-                    processControl);
+                    controlPort);
         } catch (Exception ex) {
             throw new MojoFailureException("Failed to start server", ex);
         }
@@ -306,4 +319,11 @@ protected final void startJavaProcess(String description, String mainClass, Stri
     private static void processVMArgs(List vmArgs, String args) {
         vmArgs.addAll(Arrays.asList(args.split(" ")));
     }
+
+    protected final void doExecute() throws MojoExecutionException, MojoFailureException {
+        addAxisDependency("daemon-launcher");
+        doStartDaemon();
+    }
+    
+    protected abstract void doStartDaemon() throws MojoExecutionException, MojoFailureException;
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
deleted file mode 100644
index 0dd60af85..000000000
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * 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.axis.tools.maven.server;
-
-import java.net.URL;
-import java.rmi.RemoteException;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis.client.AdminClient;
-import org.apache.axis.client.Call;
-import org.codehaus.plexus.logging.Logger;
-
-public class AxisServerProcessControl implements ProcessControl {
-    private final int port;
-    private final AdminClient adminClient;
-    private final int timeout;
-    
-    public AxisServerProcessControl(int port, AdminClient adminClient, int timeout) {
-        this.port = port;
-        this.adminClient = adminClient;
-        this.timeout = timeout;
-    }
-
-    public void initializeProcess(Logger logger, Process process) throws Exception {
-        // Wait for server to become ready
-        String versionUrl = "http://localhost:" + port + "/axis/services/Version";
-        Call call = new Call(new URL(versionUrl));
-        call.setOperationName(new QName(versionUrl, "getVersion"));
-        long start = System.currentTimeMillis();
-        while (true) {
-            try {
-                String result = (String)call.invoke(new Object[0]);
-                logger.info("Server ready on port " + port + ": " + result.replace('\n', ' '));
-                break;
-            } catch (RemoteException ex) {
-                if (System.currentTimeMillis() > start + timeout) {
-                    throw ex;
-                }
-            }
-            try {
-                int exitValue = process.exitValue();
-                // TODO: choose a better exception here
-                throw new RemoteException("The server process unexpectedly died with exit status " + exitValue);
-            } catch (IllegalThreadStateException ex) {
-                // This means that the process is still running; continue
-            }
-            Thread.sleep(200);
-        }
-    }
-
-    public int shutdownProcess(Logger logger) throws Exception {
-        adminClient.quit();
-        return STOPPING;
-    }
-}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
similarity index 85%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
index d0ffadea5..caa6dd273 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessManager.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-public interface ProcessManager {
-    void startProcess(String description, String[] cmdline, File workDir, ProcessControl processControl) throws Exception;
+public interface DaemonManager {
+    void startDaemon(String description, String[] cmdline, File workDir, int controlPort) throws Exception;
     void stopAll() throws Exception;
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
similarity index 68%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
index 7b8bc79b0..57c8a1515 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultProcessManager.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
@@ -27,8 +27,8 @@
 import org.codehaus.plexus.logging.LogEnabled;
 import org.codehaus.plexus.logging.Logger;
 
-public class DefaultProcessManager implements ProcessManager, LogEnabled {
-    private final List managedProcesses = new ArrayList();
+public class DefaultDaemonManager implements DaemonManager, LogEnabled {
+    private final List daemons = new ArrayList();
     
     private Logger logger;
     
@@ -36,44 +36,48 @@ public void enableLogging(Logger logger) {
         this.logger = logger;
     }
 
-    public void startProcess(String description, String[] cmdline, File workDir, ProcessControl processControl) throws Exception {
+    public void startDaemon(String description, String[] cmdline, File workDir, int controlPort) throws Exception {
         if (logger.isDebugEnabled()) {
             logger.debug("Starting process with command line: " + Arrays.asList(cmdline));
         }
         Process process = Runtime.getRuntime().exec(cmdline, null, workDir);
-        managedProcesses.add(new ManagedProcess(process, description, processControl));
+        RemoteDaemon daemon = new RemoteDaemon(process, description, controlPort);
+        daemons.add(daemon);
         new Thread(new StreamPump(process.getInputStream(), System.out)).start();
         new Thread(new StreamPump(process.getErrorStream(), System.err)).start();
-        processControl.initializeProcess(logger, process);
+        daemon.startDaemon(logger);
     }
     
     public void stopAll() throws Exception {
         Exception savedException = null;
-        for (Iterator it = managedProcesses.iterator(); it.hasNext(); ) {
-            ManagedProcess managedProcess = (ManagedProcess)it.next();
-            int result;
-            logger.debug("Executing stop action");
+        for (Iterator it = daemons.iterator(); it.hasNext(); ) {
+            RemoteDaemon daemon = (RemoteDaemon)it.next();
+            if (logger.isDebugEnabled()) {
+                logger.debug("Stopping " + daemon.getDescription());
+            }
+            boolean success;
             try {
-                result = managedProcess.getProcessControl().shutdownProcess(logger);
+                daemon.stopDaemon(logger);
+                success = true;
             } catch (Exception ex) {
                 if (savedException == null) {
                     savedException = ex;
                 }
-                result = -1;
+                success = false;
             }
             if (logger.isDebugEnabled()) {
-                logger.debug("result = " + result);
+                logger.debug("success = " + success);
             }
-            if (result == ProcessControl.STOPPING) {
-                managedProcess.getProcess().waitFor();
+            if (success) {
+                daemon.getProcess().waitFor();
             } else {
-                managedProcess.getProcess().destroy();
+                daemon.getProcess().destroy();
             }
-            logger.info(managedProcess.getDescription() + " stopped");
+            logger.info(daemon.getDescription() + " stopped");
         }
         // TODO: need to clear the collection because the same ServerManager instance may be used by multiple projects in a reactor build;
         //       note that this means that the plugin is not thread safe (i.e. doesn't support parallel builds in Maven 3)
-        managedProcesses.clear();
+        daemons.clear();
         if (savedException != null) {
             throw savedException;
         }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java
deleted file mode 100644
index 4eb70bc40..000000000
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/ProcessControl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * 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.axis.tools.maven.server;
-
-import org.codehaus.plexus.logging.Logger;
-
-/**
- * Defines the actions to be executed after a given process has been started and when a process is
- * stopped.
- * 
- * @author Andreas Veithen
- */
-public interface ProcessControl {
-    /**
-     * Indicates that the process is expected to be still running after the action is completed.
-     */
-    int RUNNING = 1;
-
-    /**
-     * Indicates that the action has sent a request to the process to initiate a clean shutdown,
-     * i.e. that the process is expected to be stopping (but not necessarily to be stopped yet).
-     */
-    int STOPPING = 2;
-    
-    /**
-     * Initialize the process. This typically involves waiting for the process to be completely
-     * started and to configure the server process, e.g. to deploy services.
-     * 
-     * @param logger
-     * @param process
-     * @throws Exception
-     */
-    void initializeProcess(Logger logger, Process process) throws Exception;
-    
-    /**
-     * Prepare the process for shutdown. Typically (but not necessarily) this involves sending a
-     * request to initiate a clean shutdown of the process.
-     * 
-     * @param logger
-     * @return
-     * @throws Exception
-     */
-    int shutdownProcess(Logger logger) throws Exception;
-}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
similarity index 74%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java
rename to maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
index 2e0767239..1c8af6fc5 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonProcessControl.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
@@ -28,16 +28,28 @@
 
 import org.codehaus.plexus.logging.Logger;
 
-public class DaemonProcessControl implements ProcessControl {
+public class RemoteDaemon {
+    private final Process process;
+    private final String description;
     private final int controlPort;
     private BufferedReader controlIn;
     private Writer controlOut;
 
-    public DaemonProcessControl(int controlPort) {
+    public RemoteDaemon(Process process, String description, int controlPort) {
+        this.process = process;
+        this.description = description;
         this.controlPort = controlPort;
     }
 
-    public void initializeProcess(Logger logger, Process process) throws Exception {
+    public Process getProcess() {
+        return process;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void startDaemon(Logger logger) throws Exception {
         logger.debug("Attempting to establish control connection on port " + controlPort);
         Socket controlSocket;
         while (true) {
@@ -45,6 +57,12 @@ public void initializeProcess(Logger logger, Process process) throws Exception {
                 controlSocket = new Socket(InetAddress.getByName("localhost"), controlPort);
                 break;
             } catch (IOException ex) {
+                try {
+                    int exitValue = process.exitValue();
+                    throw new IllegalStateException("Process terminated prematurely with exit code " + exitValue);
+                } catch (IllegalThreadStateException ex2) {
+                    // Process is still running; continue
+                }
                 Thread.sleep(100);
             }
         }
@@ -56,11 +74,10 @@ public void initializeProcess(Logger logger, Process process) throws Exception {
         logger.debug("Daemon is ready");
     }
 
-    public int shutdownProcess(Logger logger) throws Exception {
+    public void stopDaemon(Logger logger) throws Exception {
         controlOut.write("STOP\r\n");
         controlOut.flush();
         expectStatus("STOPPED");
-        return STOPPING;
     }
     
     private void expectStatus(String expectedStatus) throws IOException {
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
index 9455e8b24..40e612b31 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
@@ -19,8 +19,6 @@
 package org.apache.axis.tools.maven.server;
 
 import java.io.File;
-import java.io.IOException;
-import java.net.ServerSocket;
 
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -32,7 +30,7 @@
  * @phase pre-integration-test
  * @requiresDependencyResolution test
  */
-public class StartDaemonMojo extends AbstractStartProcessMojo {
+public class StartDaemonMojo extends AbstractStartDaemonMojo {
     /**
      * The daemon class.
      * 
@@ -56,23 +54,8 @@ public class StartDaemonMojo extends AbstractStartProcessMojo {
      */
     private File workDir;
 
-    protected void doExecute() throws MojoExecutionException, MojoFailureException {
-        int controlPort;
-        try {
-            ServerSocket ss = new ServerSocket(0);
-            controlPort = ss.getLocalPort();
-            ss.close();
-        } catch (IOException ex) {
-            throw new MojoFailureException("Failed to allocate port number", ex);
-        }
+    protected void doStartDaemon() throws MojoExecutionException, MojoFailureException {
         workDir.mkdirs();
-        String[] vmArgs = new String[args != null ? args.length + 2 : 2];
-        vmArgs[0] = daemonClass;
-        vmArgs[1] = String.valueOf(controlPort);
-        if (args != null) {
-            System.arraycopy(args, 0, vmArgs, 2, args.length);
-        }
-        addAxisDependency("daemon-launcher");
-        startJavaProcess(daemonClass, "org.apache.axis.tools.daemon.Launcher", vmArgs, workDir, new DaemonProcessControl(controlPort));
+        startDaemon(daemonClass, daemonClass, args, workDir);
     }
 }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index 16f94b323..cd5cbe587 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -27,7 +27,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.axis.client.AdminClient;
 import org.apache.axis.model.wsdd.Deployment;
 import org.apache.axis.model.wsdd.WSDDUtil;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -46,7 +45,7 @@
  * @phase pre-integration-test
  * @requiresDependencyResolution test
  */
-public class StartServerMojo extends AbstractStartProcessMojo {
+public class StartServerMojo extends AbstractStartDaemonMojo {
     /**
      * @parameter default-value="${project.build.directory}/axis-server"
      * @required
@@ -114,7 +113,7 @@ public class StartServerMojo extends AbstractStartProcessMojo {
      */
     private int foregroundPort = -1;
     
-    protected void doExecute() throws MojoExecutionException, MojoFailureException {
+    protected void doStartDaemon() throws MojoExecutionException, MojoFailureException {
         Log log = getLog();
         
         // Need to setup additional dependencies before building the default configuration!
@@ -209,15 +208,11 @@ protected void doExecute() throws MojoExecutionException, MojoFailureException {
         args.add("-m");
         args.add(String.valueOf(maxSessions));
         try {
-            AdminClient adminClient = new AdminClient(true);
-            adminClient.setTargetEndpointAddress(new URL("http://localhost:" + actualPort + "/axis/services/AdminService"));
-            startJavaProcess(
+            startDaemon(
                     "Server on port " + actualPort,
-                    "org.apache.axis.server.standalone.StandaloneAxisServer",
+                    "org.apache.axis.server.standalone.daemon.AxisServerDaemon",
                     (String[])args.toArray(new String[args.size()]),
-                    workDir,
-                    new AxisServerProcessControl(actualPort, adminClient,
-                            isDebug() || foreground ? Integer.MAX_VALUE : 20000));
+                    workDir);
         } catch (Exception ex) {
             throw new MojoFailureException("Failed to start server", ex);
         }
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java
index 5979442d6..fc3b86395 100644
--- a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java
@@ -27,10 +27,10 @@
  * @goal stop-all
  * @phase post-integration-test
  */
-public class StopAllMojo extends AbstractServerMojo {
+public class StopAllMojo extends AbstractDaemonControlMojo {
     protected void doExecute() throws MojoExecutionException, MojoFailureException {
         try {
-            getProcessManager().stopAll();
+            getDaemonManager().stopAll();
         } catch (Exception ex) {
             throw new MojoFailureException("Errors occurred while attempting to stop processes", ex);
         }
diff --git a/maven/maven-axis-server-plugin/src/main/resources/META-INF/plexus/components.xml b/maven/maven-axis-server-plugin/src/main/resources/META-INF/plexus/components.xml
index 87a9f7a8b..08879d412 100644
--- a/maven/maven-axis-server-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/maven/maven-axis-server-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -20,8 +20,8 @@
 <component-set>
     <components>
         <component>
-            <role>org.apache.axis.tools.maven.server.ProcessManager</role>
-            <implementation>org.apache.axis.tools.maven.server.DefaultProcessManager</implementation>
+            <role>org.apache.axis.tools.maven.server.DaemonManager</role>
+            <implementation>org.apache.axis.tools.maven.server.DefaultDaemonManager</implementation>
         </component>
     </components>
 </component-set>
\ No newline at end of file

From 701ca89074775425bcdafe0640a432d0dc625f96 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 11 Dec 2012 19:22:12 +0000
Subject: [PATCH 016/133] Added a goal to the maven-axis-server-plugin that
 allows to run a Jetty instance in a separate JVM (and that is more convenient
 than jetty-maven-plugin).

---
 axis-standalone-server/pom.xml                |  3 -
 jetty-daemon/pom.xml                          | 58 +++++++++++++
 .../axis/tools/daemon/jetty/WebAppDaemon.java | 85 +++++++++++++++++++
 .../tools/maven/server/StartWebAppMojo.java   | 56 ++++++++++++
 pom.xml                                       | 12 +++
 tests/spring-compat-tests/pom.xml             | 37 +++-----
 6 files changed, 223 insertions(+), 28 deletions(-)
 create mode 100644 jetty-daemon/pom.xml
 create mode 100644 jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
 create mode 100644 maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java

diff --git a/axis-standalone-server/pom.xml b/axis-standalone-server/pom.xml
index 7a0f5e937..d8d8e8180 100644
--- a/axis-standalone-server/pom.xml
+++ b/axis-standalone-server/pom.xml
@@ -46,17 +46,14 @@
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>commons-daemon</groupId>
             <artifactId>commons-daemon</artifactId>
         </dependency>
         <dependency>
-            <!-- Jetty 6.1 is the last version with support for Java 1.4 -->
             <groupId>org.mortbay.jetty</groupId>
             <artifactId>jetty</artifactId>
-            <version>6.1.26</version>
         </dependency>
     </dependencies>
     <build>
diff --git a/jetty-daemon/pom.xml b/jetty-daemon/pom.xml
new file mode 100644
index 000000000..ccf5e03da
--- /dev/null
+++ b/jetty-daemon/pom.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.axis</groupId>
+        <artifactId>axis-project</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>jetty-daemon</artifactId>
+    <name>Jetty Daemon</name>
+    <description>
+        Daemon implementation used by maven-axis-server-plugin to launch a Jetty server in a separate JVM.
+    </description>
+    <dependencies>
+        <dependency>
+            <groupId>commons-daemon</groupId>
+            <artifactId>commons-daemon</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>commons-cli</groupId>
+            <artifactId>commons-cli</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java b/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
new file mode 100644
index 000000000..f65a7fea5
--- /dev/null
+++ b/jetty-daemon/src/main/java/org/apache/axis/tools/daemon/jetty/WebAppDaemon.java
@@ -0,0 +1,85 @@
+/*
+ * 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.axis.tools.daemon.jetty;
+
+import java.io.File;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.GnuParser;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.daemon.Daemon;
+import org.apache.commons.daemon.DaemonContext;
+import org.apache.commons.daemon.DaemonInitException;
+import org.mortbay.jetty.Server;
+import org.mortbay.jetty.webapp.WebAppContext;
+import org.mortbay.resource.Resource;
+import org.mortbay.resource.ResourceCollection;
+
+/**
+ * 
+ * 
+ * @author Andreas Veithen
+ */
+public class WebAppDaemon implements Daemon {
+    private Server server;
+    
+    public void init(DaemonContext daemonContext) throws DaemonInitException, Exception {
+        Options options = new Options();
+        
+        {
+            Option option = new Option("p", true, "the HTTP port");
+            option.setArgName("port");
+            option.setRequired(true);
+            options.addOption(option);
+        }
+        
+        {
+            Option option = new Option("r", true, "a list of resource directories");
+            option.setArgName("dirs");
+            option.setRequired(true);
+            options.addOption(option);
+        }
+        
+        CommandLineParser parser = new GnuParser();
+        CommandLine cmdLine = parser.parse(options, daemonContext.getArguments());
+        
+        server = new Server(Integer.parseInt(cmdLine.getOptionValue("p")));
+        WebAppContext context = new WebAppContext(server, null, "/");
+        String[] resourceDirs = cmdLine.getOptionValue("r").split(File.pathSeparator);
+        Resource[] resources = new Resource[resourceDirs.length];
+        for (int i=0; i<resourceDirs.length; i++) {
+            resources[i] = Resource.newResource(resourceDirs[i]);
+        }
+        context.setBaseResource(new ResourceCollection(resources));
+    }
+
+    public void start() throws Exception {
+        server.start();
+    }
+
+    public void stop() throws Exception {
+        server.stop();
+    }
+
+    public void destroy() {
+        server = null;
+    }
+}
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
new file mode 100644
index 000000000..62e3ded3f
--- /dev/null
+++ b/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
@@ -0,0 +1,56 @@
+/*
+ * 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.axis.tools.maven.server;
+
+import java.io.File;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.codehaus.plexus.util.StringUtils;
+
+/**
+ * 
+ * 
+ * @goal start-webapp
+ * @phase pre-integration-test
+ * @requiresDependencyResolution test
+ */
+public class StartWebAppMojo extends AbstractStartDaemonMojo {
+    /**
+     * The HTTP port.
+     * 
+     * @parameter default-value="8080"
+     * @required
+     */
+    private int port;
+
+    /**
+     * 
+     * 
+     * @parameter
+     * @required
+     */
+    private File[] resourceBases;
+    
+    protected void doStartDaemon() throws MojoExecutionException, MojoFailureException {
+        addAxisDependency("jetty-daemon");
+        startDaemon("HTTP server on port " + port, "org.apache.axis.tools.daemon.jetty.WebAppDaemon",
+                new String[] { "-p", String.valueOf(port), "-r", StringUtils.join(resourceBases, File.pathSeparator) }, new File("."));
+    }
+}
diff --git a/pom.xml b/pom.xml
index c95820374..88132e935 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,6 +83,7 @@
         <module>distribution</module>
         <module>integration</module>
         <module>interop-mock</module>
+        <module>jetty-daemon</module>
         <module>maven</module>
         <module>samples</module>
         <module>soapmonitor-applet</module>
@@ -137,6 +138,17 @@
                 <artifactId>commons-daemon</artifactId>
                 <version>1.0.10</version>
             </dependency>
+            <dependency>
+                <groupId>commons-cli</groupId>
+                <artifactId>commons-cli</artifactId>
+                <version>1.2</version>
+            </dependency>
+            <dependency>
+                <!-- Jetty 6.1 is the last version with support for Java 1.4 -->
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty</artifactId>
+                <version>6.1.26</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <prerequisites>
diff --git a/tests/spring-compat-tests/pom.xml b/tests/spring-compat-tests/pom.xml
index 21b3a1a4e..01c34b292 100644
--- a/tests/spring-compat-tests/pom.xml
+++ b/tests/spring-compat-tests/pom.xml
@@ -105,7 +105,6 @@
                         <phase>pre-integration-test</phase>
                         <configuration>
                             <portNames>
-                                <portName>jetty.stopPort</portName>
                                 <portName>test.httpPort</portName>
                             </portNames>
                         </configuration>
@@ -113,39 +112,27 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <configuration>
-                    <stopKey>foo</stopKey>
-                    <stopPort>${jetty.stopPort}</stopPort>
-                    <connectors>
-                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
-                            <port>${test.httpPort}</port>
-                        </connector>
-                    </connectors>
-                    <webApp>
-                        <resourceBases>
-                            <resourceBase>${basedir}/src/main/webapp</resourceBase>
-                            <resourceBase>${project.build.directory}/webapp</resourceBase>
-                        </resourceBases>
-                    </webApp>
-                </configuration>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>maven-axis-server-plugin</artifactId>
+                <version>${project.version}</version>
                 <executions>
                     <execution>
-                        <id>start-jetty</id>
-                        <phase>pre-integration-test</phase>
+                        <id>start-webapp</id>
                         <goals>
-                            <goal>run</goal>
+                            <goal>start-webapp</goal>
                         </goals>
                         <configuration>
-                            <daemon>true</daemon>
+                            <port>${test.httpPort}</port>
+                            <resourceBases>
+                                <resourceBase>src/main/webapp</resourceBase>
+                                <resourceBase>${project.build.directory}/webapp</resourceBase>
+                            </resourceBases>
                         </configuration>
                     </execution>
                     <execution>
-                        <id>stop-jetty</id>
-                        <phase>post-integration-test</phase>
+                        <id>stop-all</id>
                         <goals>
-                            <goal>stop</goal>
+                            <goal>stop-all</goal>
                         </goals>
                     </execution>
                 </executions>

From a8dcc9ba3920863bc6907ec9f3ee6e94cf1fc6d3 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 16 Dec 2012 16:55:27 +0000
Subject: [PATCH 017/133] Report configurations should not be inherited by
 child projects.

---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 88132e935..cbdd6bf07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,6 +365,7 @@
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
                 <version>2.4</version>
+                <inherited>false</inherited>
                 <reportSets>
                     <reportSet>
                         <reports>
@@ -381,6 +382,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.8.1</version>
+                <inherited>false</inherited>
                 <reportSets>
                     <reportSet>
                         <id>aggregate</id>

From 070c3c077453eb97d5790bd4da00d7b2de29a8e0 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 6 Mar 2013 20:05:29 +0000
Subject: [PATCH 018/133] Improved Javadoc generation.

---
 apidocs/pom.xml | 188 ++++++++++++++++++++++++++++++++++++++++++++++++
 pom.xml         |  40 ++++++-----
 2 files changed, 209 insertions(+), 19 deletions(-)
 create mode 100644 apidocs/pom.xml

diff --git a/apidocs/pom.xml b/apidocs/pom.xml
new file mode 100644
index 000000000..9e0ffa8e2
--- /dev/null
+++ b/apidocs/pom.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.axis</groupId>
+        <artifactId>axis-project</artifactId>
+        <version>1.4.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>apidocs</artifactId>
+    <name>Javadoc</name>
+    <url>${baseUrl}/apiDocs</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/apiDocs</url>
+        </site>
+    </distributionManagement>
+    <dependencies>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-ant</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-codegen</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-jaxrpc</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-compat</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-databinding-castor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-databinding-xmlbeans</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-jws</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-management</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-provider-bsf</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-soapmonitor</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-transport-http-hc3</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-transport-http-javanet</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-transport-jms</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-rt-transport-mail</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-saaj</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-standalone-server</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>axis-tools</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>soapmonitor-client</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>tcpmon</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.9</version>
+                <executions>
+                    <execution>
+                        <id>site-javadoc</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>javadoc</goal>
+                        </goals>
+                        <configuration>
+                            <reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+                            <destDir>.</destDir>
+                        </configuration>
+                    </execution>
+                </executions>
+                <configuration>
+                    <includeDependencySources>true</includeDependencySources>
+                    <dependencySourceIncludes>
+                        <dependencySourceInclude>${project.groupId}:*</dependencySourceInclude>
+                    </dependencySourceIncludes>
+                    <!-- Exclude sources generated by axis-rt-databinding-xmlbeans -->
+                    <excludePackageNames>org.xmlsoap.schemas.*</excludePackageNames>
+                    <!-- There are no other modules that generate Javadoc we can link to -->
+                    <detectOfflineLinks>false</detectOfflineLinks>
+                    <links>
+                        <link>http://download.oracle.com/javaee/1.4/api/</link>
+                    </links>
+                    <breakiterator>true</breakiterator>
+                    <!-- The notimestamp, windowtitle and bottom parameters are chosen to minimize the number
+                         of changes between releases (to avoid mass changes when committing the site for a new release) -->
+                    <notimestamp>true</notimestamp>
+                    <windowtitle>Apache Axis</windowtitle>
+                    <bottom>Copyright &#169; {organizationName}. All Rights Reserved.</bottom>
+                    <!-- doctitle only appears in the summary and we should include the version there -->
+                    <doctitle>Apache Axis ${project.version}</doctitle>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/pom.xml b/pom.xml
index cbdd6bf07..a04db07e7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,6 +57,7 @@
     </mailingLists>
     <inceptionYear>2000</inceptionYear>
     <modules>
+        <module>apidocs</module>
         <module>axis</module>
         <module>axis-ant</module>
         <module>axis-codegen</module>
@@ -326,6 +327,26 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <!-- This serves two purposes:
+                      (1) we want to generate source JARs for all builds, not just release builds;
+                      (2) we need (some of) the source JARs to generate the Javadoc in the apidocs module. -->
+                <artifactId>maven-source-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <!-- Use the same ID as in org.apache:apache; otherwise, the goal
+                             will be executed twice when the apache-release profile is
+                             activated -->
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <attach>true</attach>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -378,25 +399,6 @@
                     </reportSet>
                 </reportSets>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.8.1</version>
-                <inherited>false</inherited>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>aggregate</report>
-                        </reports>
-                        <configuration>
-                            <source>1.4</source>
-                            <excludePackageNames>test.*:samples.*</excludePackageNames>
-                            <destDir>apiDocs</destDir>
-                        </configuration>
-                    </reportSet>
-                </reportSets>
-            </plugin>
         </plugins>
     </reporting>
     <properties>

From d79bc8732748b880f1cde164ab6fbe96f1acd9c9 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 7 Mar 2013 19:21:44 +0000
Subject: [PATCH 019/133] Migrated soapmonitor-user-guide from the old Forrest
 sources.

---
 src/site/resources/images/AfterTurnOff.jpg    | Bin 0 -> 29496 bytes
 src/site/resources/images/AfterTurnOn.jpg     | Bin 0 -> 29617 bytes
 .../resources/images/ConnectionRefused.jpg    | Bin 0 -> 6968 bytes
 src/site/resources/images/DataLoading.jpg     | Bin 0 -> 26091 bytes
 src/site/resources/images/DeployStatus.jpg    | Bin 0 -> 31186 bytes
 src/site/resources/images/InitialScreen.jpg   | Bin 0 -> 29180 bytes
 src/site/resources/images/LoginDialog.jpg     | Bin 0 -> 11293 bytes
 .../resources/images/MonitoringScreen.jpg     | Bin 0 -> 65863 bytes
 .../resources/images/ToDisableMonitoring.jpg  | Bin 0 -> 30606 bytes
 .../resources/images/ToEnableMonitoring.jpg   | Bin 0 -> 30721 bytes
 src/site/resources/images/Unauthorized.jpg    | Bin 0 -> 5247 bytes
 src/site/resources/images/UnknownHost.jpg     | Bin 0 -> 6071 bytes
 src/site/xdoc/soapmonitor-user-guide.xml      | 207 ++++++++++++++++++
 13 files changed, 207 insertions(+)
 create mode 100644 src/site/resources/images/AfterTurnOff.jpg
 create mode 100644 src/site/resources/images/AfterTurnOn.jpg
 create mode 100644 src/site/resources/images/ConnectionRefused.jpg
 create mode 100644 src/site/resources/images/DataLoading.jpg
 create mode 100644 src/site/resources/images/DeployStatus.jpg
 create mode 100644 src/site/resources/images/InitialScreen.jpg
 create mode 100644 src/site/resources/images/LoginDialog.jpg
 create mode 100644 src/site/resources/images/MonitoringScreen.jpg
 create mode 100644 src/site/resources/images/ToDisableMonitoring.jpg
 create mode 100644 src/site/resources/images/ToEnableMonitoring.jpg
 create mode 100644 src/site/resources/images/Unauthorized.jpg
 create mode 100644 src/site/resources/images/UnknownHost.jpg
 create mode 100644 src/site/xdoc/soapmonitor-user-guide.xml

diff --git a/src/site/resources/images/AfterTurnOff.jpg b/src/site/resources/images/AfterTurnOff.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0a2dbc311ae627744b53164077b0a3e7a9331546
GIT binary patch
literal 29496
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/AfterTurnOn.jpg b/src/site/resources/images/AfterTurnOn.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7604743efbef2e39d2d0675c62b0e217264c210b
GIT binary patch
literal 29617
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
QTlFD$KzEMPMKrDJKW3cAw*UYD

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/ConnectionRefused.jpg b/src/site/resources/images/ConnectionRefused.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..2392a376204c615d83a6c3b061fc7a57b52caf88
GIT binary patch
literal 6968
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
TGq|3Zx*&*K@{wo4Nn`&3GHYT?

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/DataLoading.jpg b/src/site/resources/images/DataLoading.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..34bb6d98be9ab1d5bc0e5b4514092b28480a4bc5
GIT binary patch
literal 26091
zcmeIabzD|Uw>ZA(7U>2B6c7Yyka$3(L_v^lMd?O59za2*LqI}6TDn6zq(cPhZVBmr
z;<xdX_?~m_x%ZFXz4v?H=kwXHXYZLct7gs2T5C3P1UUm-ydxto1E7FE4ipXmK#l`a
z05&Ej7A6KZ78Vu`4mK`6DFHqn9zGQ@2_Y#RH3K~zH7)HWW=@t%j2uj~w5)<`95=Z6
z`1lxDgvEq-L^*l+c+P;J;Nalk<Ka^h5K!`5roGJbpZ*~m03vLZ2~>A96h;7*2nCG@
z1=#{H000Wc8MY`Wz^^|PR5Wx9Oe}01Ts*Ks*+l>q1q}@q9Ss8m9UZLg3BCu=i7<#S
zb4y~9C_ltvv?Jy534e#pbgQV5Or?K|nfH;sFAgp_1tk^rm8&eQY}fes1q6kJZ%W;k
zmXVc{zw<y<O<hA%OWWx26JrxoGjoThj!w=lu5Qns`}x0k`6?hH@^w^n%$wM_l+?8J
zjLfX}*~KNLW#tu>RUev~TRyh7wRd!W9vJ*GG(0joHaj=Ju(-6m@^y84XLoP^;PB}9
z<cuy90PPpDey8jwx`;r!P|?xR(6P?wLP2!~FEk=_jLY1Z#FENb5A8@8d3>-*Z-u`r
zYQ$mURoNnYWZ#cV&dfJ^W&4b@@09&B!hHWrl>JWFA9RfY_-H7g@X&|=2(YK8qxr>X
zo2sxhmJGKvXs6^MDevPgH{d3&`;>WqYHnOvf*@{qMU?nauYn&HR~U~33oY%IooX2?
z`C6O76PL6o7GJqok|1AQdt2MOH2Z6;oISB|tE>;>bY9?<TeN>kiM6e2xQ{at+lom_
zYiOqwagS5=X}_wrSN|FkAV31>oq=s`rA5pE?PysKBj8A2M(vReg~h?C$5FS=2OBL4
zNW8jOCw3XThQCm*HS?n#9sFabHrtVArbTrIf#yRA#2PC}8+JuYDCv-;JZ?l0Zm)8A
z@dCb;rM-OXZ2PxWsc3cK@KmlK{t-%!j>RG>l;&rlAG5@{hNT#zn&nU=Uv!}jFbMKT
zlI13<Xicz7F%M%iU8wQ4r<@=72DjVzI2eJKlcP23N*LqjjU^$FN}C--(zGG!K8Rn&
z6}aEdVA=H>(D#|GZk>M2S@=9S)9qj3n?{-slxSMQnrWC#yQf9I2@7F`VKK07tZB1}
z+Kr4+Kt#Ez9vwXTCbTb7PV2@7li(B#Dtm4pq^3!G(b<;}zJI5VXNa!py}GdwV8fhr
zx|%(uBQs3F`LL5bHqj#~yjg%kxS^NAmv`4az^tsy{ovKZk?<*Ip(*(%S4xsjmxGL^
z#Y{ipLAT<}r>B*Akib#4!O`7)o6XE6Bmh%WQIp@;2pG=|rK`dXtlYHW4YPF!yReS$
zxHp$t<BxsaN3)2%3Tp|%()m1JOp@7QGa*p|GtG;0=!tFk?8Khhlspn>dtbj5`#bcm
zA~sSAl9~vaW=qrld@XtA1$*wM@S`uwC4LJRqQ~DwKhnNSw2*r3#)|C?%KiBOAPGT2
zr*pb?T#p3E6m7`Y*bWi;cXn&+Z-&%b+?*RF9w{o{8I+<)s~6m)^lM+3**9uSSK_a+
z5$pEl60i}sdf(UQuXsavhL>K9^%EXs>y3H+v_Vh(QMTH)Q~ok;Ljp;o*Rx2F)ZR|v
zj3*J3btc$qC=L{8%n8A@?#u7`q~2^rwwdEwlvyoypu=ZtPT+*|Ujz71LH1lZDL5S7
zwLx49JyO^=*eqC@hN-EaGNUX^qiBArh?cr&d_Tzf@dABd`+Q=Q%<O&a$G35ouFfSV
zpjC$O_L=jc86k)_G(g%aK-v_L0FF}*5)h*}gILIBS{S@}q~NG@yiy+z-BzvNie63H
z?S~2=0qVx|lm=@g(4>_O?UOvNIQsm<{Seu8ax@17aqR<y8{z5K`qmimUg_8S!mp-<
zG)Y@g=Fr_w(CK>!K4_ELdnC{&i3B_akA^O#lWG#wAKh_;9Irq&Gr*o8vuuM%U^y8H
z)WyRrE~*4@U{1rXP$$9m7!C)Z!3<lk%?*A5#UH33?LCGBo+qgwfyAVvU1%^DjQJ!6
zwg+ke*p@sx5TyhpQ6L>85wZ<x7q!8Wd>Pj<IKo50zWG74L3ZdVAl#6^d=G-Jek)=X
zvOA0f=xw%h-IS%hM?m0_${_IiGvEwc5$3<Y_PN7aNR0%x!hdg(iXaw~{S_2{7|6`;
zufY}|IlmAtodxZC@C)7dz`k`5#B@>!x1?WL_WOOY8Q8XdE6kkXx28W9_@h9o2NBbQ
zkY$jMAdk$T6`LT#ekoXRzE(EmLjn~A;G?47-k%jp&bZJ2hE19rP2toD2_W1B;d|5b
z3h-(u$ewt_2}pAz2zmf90qT7sI4(i?^uwz>e}6ls&4C$nFnI_&usK6HbfbFnczyaz
zC?+cXhJ4WSg8E;2;e%QkK>Lh;k)Svzg?I20_us&zBSvaL_<g_d!IL$m!QjUypki6-
zgZg3ey|uY_va%r;60n&1^-<`V=2`q!q3`Gm3W#zoJkJ#bKaDtrfb``2ey<8LlA^xM
z2C`fYiogVBiWsZ`yWRx5PTI~^E!8Bzw%Ig}6N+}mUnhMsP6Y|p+69$-g^2;a&vK;h
z`2zO*di`29lw0#;GelHmHfN#a%RWPiuIM8*B}UoK2nk^|rtGB7NNT}Neya87G@H$Q
zheYG8S&utR3{$hd_9_*AbIFeJVjHmJOdQ(%=%!ZIWaRNcpVYCvy<Ic}8xm|{PGM^>
ze&n|E1=i&re5X@03Ef)VR<d!y)_sTs+C&E`FUw2l>}5pLslm9>DE!^RalCjBCU^bY
zs>zLne%qVF+tNivI$ihd$4<yA6%4Jenqj?Z!GCPa9j2(H)KuotHJPmqCoT4GG~+>`
zqQk0nea$eMWKxG{J!Lq6!kC@vG)4}N4OXpoD{SZ-5}bP+>4kmqk_ca>4HR(YQ%W7&
zF6r!|J(cMozx(KVX2h~LZ^AM<T1xcN9A%;wzfconw9yAeU~Mc*+oD1+`o5kl-@B{9
zkMDQeqfk*TPgT~UwkelbSs;jou2v3@eOi8i=2=r{^m6X9s_e73?GnteiIDg)LRjFK
z3EWK@2_)m1Ql;jY#rd_pV*XG}REfPUPeb0t#zE<k%5-V|(lgad{V)R?TWcmOAzcAy
zMa$`KOK+U(!$N3rs|7;SA&0~!)0Azykhdm$A8+R~8j%{TF;66OQHja10M8o4%u}_M
z)g_Jal((i|mYL1PZCiDR%PzhTzCxuN*<sZ^>7H<*;qg)d?DEa}Ly{dR;_8QtaAG^W
z54o8~IL%%LKG|zo<B*AP$_=N6a5uKL0<YBZ#3)W{#dQvc`mN`yNMJ&#1Dwm^432J<
zLBFvqfX4cs<8@{WuGf#1c$uy6ahUOw2I7<icrS-`-<z4qpG}w-6ZihSgh!im1bOhv
zS$^?SFVFZ3MAu!==x84z+;zU24YIsBLGFy`wPu1l6Si_Q<=FFs#DqoswFfDboR=nK
zBz7W&V6`79@MsNSjED8RW7FV3-U1EY^GAPx7!6F32PEz!(B4j9=#1GQgttRCJE4BG
zjYfgzDw5W31x-QwETG`<ZmK46Ee-SVmJ#A+aqt<h%Jh7P1gZ$($4XnNZ#e9Jsj2h5
zW`c)^$0N<|gHzIIG?w?R?(Vp2h(Rfg7Mhps^eQF{F_r13Qb@p_;dCcyR`!PG0z>og
z=Nl$*6Je<PVnD;j3S0eFFxc%cz^WNaA%~ZdKs_6R?8WTqXc+-HUZ6h#n;Fp?eCx6G
z<Rp7cMWMcQzHgWYFec}u-J!D?rz!MEmJ_sbxo1;^-_yMZMBU*0B<u_t1;g)lgbg}N
z2ikzd!ZRaC_PJkzb{NJ~0sXag41#E_{&)=wz6WjkaEBEw9^{JKCc>@pIO#hpz1DuY
z&kqRzmZ7r@AI>0onZQ^P4Zq#8r=)lbZ?5AN9Ip{BL7PI?X@0%?K+TGlglMb+n}i|G
znl$}(%buL#eFIXM4_!`!#3BJ)Na45NZl}RF&_9X>>k3K7U(euHm?q<Mtt*87Qi?ex
zpGUY!fmr5svZ4`wFG-)_jA*R{`wItAWVa3gTK*`qL5sdYmeUN*`Ws8}=B_VV{<R`2
zqCE-WcGfyCjunmJlo5LTmEt=kVBPw&yK>fK{LuB^N}=oEg!BD**-A2g()#=QdIqpk
z%qgeMX4@GQZB{h)-wNr7?)cMfkbHKP0HEu)0voi%7y*Nx;WCio%?l}c@@vUp{VVi4
zw9>3({LSAAq3g%LJ_VV81i(^V(pg*aMy|twUC699>3s~s!VdTztnWw#?yt1T0^(Dk
zEJ5n^k>xNFte|kf2C4bpq*@wKIi*dSQW}P_d9{IW_dz&S(!hgLCM4hr(KaZCfX{NC
z-p5cXu0M>~Pd{Y`pF_3FqyhC)-tV{K-P2PBL%IDDWQg9gyU>z~!{}UPiHoj01>E-*
z<%Biv<2)D%@)bHnS66~D4IAv;Ft0y6h8zV<g2E;AUoyMwJj~Bx`b0i;YNb(6QFSIm
zi195Fz}_E*<5L&F5lRTg3e$8$u&TcNWs6{=`<0sM^0)2V(-qj-`#LrrOsot$YY=b`
zJ5nARqKDj8yN?N=nHXZ#=UFP>#V6ldY<?#@yf33pd8zX`5fboF56(#BSWhks-U(|h
zdT-PL7@CBdgM2Ur=TZu|hXN8P9x{^RNVE;1ZFdcZ!2@0Zn3pOi?1hh&0LQP|&h;OW
zfB`Yc_A<p1R_T}VqjhF!KKbfKu|~I_=v7XJ>4m5!5L(Cbqh0AJc8L~P8e8H%9i%Pw
z@o8P(5!yd!<9`&uNzT9_G1=W{#Aqc=7atnO&z-20N$~MOnWKBPX_!naW+kV(G_$o9
z;Uv~2`{c+F3ED4l(0G=Z#pBRLB;ah<wkX}uunjp0=0!9)O`lNa$*V)kW%&{~h<Kx0
zoeE;9tJ<L9@h1)eecSlN6VjO+%GDc#R+HuLMO1~lXr0Jvm?W?%l)YU<A&{eu8?4f}
z<2uaF7mSojd3A|TZI>n~eVZwdw}hBJzr|PJ_IbOw)6FYK_W05b5)6H}@F3b{mf^U1
zpGv`Tl1tyPme<w>^6=4kdG#+}Z)AZ&(gEY(JbWcP-fU>H+{O|qn%$!|U+(>l0FSG}
zoR98<L&Z2YUGnmki#P(oRSgW+9D)+|mkMUk!d+r1A#LNC)`RqFucz{dgdgtCBt7^D
zJPCU=pg3yG`E)4uZJIELN9x|ZsF$aC%T}5o#f?`_G*hE7oK2Q3L|#0CzVO@dhG<t5
zDMCLFgg<NE5fk4mOmm5lQ2RERbFmvG>@i#d)0=IK)ZJB&D%R^$XZkA$XUir0gN5Dc
zd?oGHtr%Ef7!nxPLIQgh!-^eLloUiL5p7pxn74QoP?dlSwSJFR+@#Fn?mCs|jh6=O
zaI?||@s?c3S&`<us-2Q~dK22$Z4ikBw)s5YLY9}fzR!a1E-F8O|4|h0P1@b1_&z5B
zlF~{CPmw^<n|c-`FlYKhdlU>Z$mjsV>k%vo3A{>O|B3`4++IpZpyd-fsVWjMQ93>j
zJe!(BOEO`wkH-)sKqB$)j?P&BZ`S>9Q-*vgwe4@=X{(VV@^piJcvdF<+@%R7!7cPR
zpKeIdIn`#3eifh)JUqm)u|O{_jetmq8+1oDphd``7M1pqm{GTEOFpsR;47qgIUj+;
zX#A3l-ta=|;+0lHsb1b^uRNd`T5I|gwF6xFi9<Bi1y_uvC)8ykxEbggJ(Krl5@nSe
zk4#hsJs|Uegjg1zq#QT|l*ps9BzK~pZ4xn>&|OB$kW`u@`0(zvv$NNw0n2ZRU((~;
zUv4jbG_$(W{4qSdMke>cr3LF&*H&Bejr7Glc($I_M6-kS@hAr;9Ss&1x~(g^7uoVO
zwnty#(Th{54#YTOC~{+DbjbuQe|mO$$%xj(Nn{X;f0caqsPk#W7#Cq%w%kE66Jtvy
zhpz8URwZ_L!qd$=4Q|+jmc3aghLuX?xp=k@MFpcZvmUPUq|rW|7n5<|H=taJyZVmI
z|D9O3Any%1Rjs>o>O!-)?=E;53b90nlr2`Aq?*zTeS#S|(5GV8O<u^2)apZ(suoc#
z(v>g54Prg6>#NRrY~!KIQxGJIX?WY!@03)-KD%d0%3BT#O>E1{|E=$`XX??5JHv=U
zzVQP7jmJCrOfF->j5ac|C@*f^bVPUJSJ2t6^O@~>XOlD8W4>{SH+EO~2z|rQPlt-C
zQK*mq?d&wp^w?3G#<qIF^}^a(Wpt;5pdMN~;7!*JjQ9op23sYM>ozax8I;cEtz&Vk
zwu5`?(G6DUcZ+pM8?7;wI+bX-si@ME>BOt&=-8Xp*<5obJ>w=9h}e%Uk00Tn;o_`h
z?z}I}Qy<U*w}VW)I&}h~h4SQE5|^?Z(chyRh7h>arDjjM<jlZZQ#}wi2Uev5jXR2K
z&urhtRuC(^e6INrTq~zh314<|FCZ~6MNl7krfCXBoU}L<c05HbY4N^IV_wK!xw$Hd
zh81E@=ewM#tS{v{|JKoif9`0m?rH7T{>evz<rpHfd9%11#ccPg0D4vY?G<OO&mPKi
zY#tA1Yp<@U?HUd}RjYcPS7Z7xJk<$5f#HoM)nt|Y^&M{sHN&cDGkTW(vPn))C8auf
zj$~skV@K03xLHPTXAA+!zB|JO2@AuHGDjkO+j>{Bk~A%Z=Ss`{(W3?Ybi!T=cg|l5
z@|A3F6%$b(=2w8yt%wsmQ?8P(@>PfrmPotmO!+z+WpN!KUD)WD&%ohqbf`<Ixpg=P
zd71A;Il2~onDlt?@*uQi`Eh`Ng3qGOl-lbJ>t}$^aEJtb(d?<G{S;nff&RE&_o4N{
zh7J8kO>7zs%9&@0=^x<pcN+8t`Dw(i^%QV@Bc2-7B1`uoQ@EiVIr8KMi_hS;dQPwS
zm0O}x7Vc^2HPE7QoEh?Rl?kkBmdli_H-eZbn`wz`X&6{LGF;#TGhesSmEjpDO?+js
zCQg>!xEV{9sH6D#c56Y)aU58Nh^wC&x0&@BA{GZ!qnz9DBrjd4R(LEhnf6f0D>)>U
ztU#a5^u!Mdd{n}m&|l@c-m~O?l>(2Ly;Yy;)jW+nzM{CU5#TF%^)=+8haQ7>>NaWI
z2L&Dr)PYV5&8GH5^&MJop?1J(OhzX%yljNiJ!)}+oLrD1Mrm<;y!CVE5sP_NhY)Qd
zmiaUJFS(9AJah{8lKM*Honx-H>dpovQlbsge_4u|VjPxzDQYphmM6{P+b3($o-p=t
zr!tr-j7<gKs`mAZ38(p`UitRIZSi`ulp~C%@LM#>Il5iwTY0Y;={avbD^ind_qr9H
z;3UjksC#f-N4@CNUPsyWJ5a{Ybajv8sfwa;h3+e<h^QVo+Zv3FPifc3+SpNdk<0{l
zHeZ_A5fWQ#E#o4!aQ33!?#Y{6)eR;`u+F${T!!-F_t1}$W;9`bYVgBy_OR2Yt_b9R
zOLK24waZQ*K1JV*n|*q8tfh%PT0&;wn#@OlF5qIA4*Es|2Zfkn4{>i8)y2E3y+zS9
zv64WTh_{x*K7HxQ&YBkgJ%xGeqD+A*PkaG&^zk=C#LBu&i-2k8{Pkg)muekC*>zaM
zFsnHNva<J%JtFJT5qivPuDC5Y7ukYJuE86YS!m>_7K;IOyu=Evlf<eF(-Y4x@cl7a
zE7Q&x{N$?Ocxx0~oQ|o?Oc|_n*9^aTI^)CEIL@#S6T{Ir6BD`*uiFqKjyU4eUL2a=
zdJ&XG%w-fNiCMKFsQjfsoWv!xMet_szy#fGD#JwVtNto?(KrgIL{V>`09Lve*g!Ft
zy`7*q5IBr3Skjr0DQ-DpvM+2G5)C1Ai>qlJ|49A%q`<d^+e&am<y1c8+uYKaP;=5m
z6?Q<oG6h>AMI{>La$@aK=p1{Jzku6f?eZu;wj;y(@hD?(#Eh%XVbl{5o#ci~j`LwC
zhE*H;N!e?0#xKL^Zf#sPd&A5P=*w${-FTT?l2EupsJ-AJHb?NJj?Kc0y1rJSTF3o%
zrOb{xPsr`Zer;PzQqAO-Fpfi+7d%va<wdP#tSTPJF6po9`9Pj}wAVRyCdG#z7K<yl
z>E@t(rB=){$~OyJ)wV=<rj6HB3GgiAt8O*WCm-aLEshnuEU*%lFK}^}e%!xadY#^4
zWau+x5l6LhtJG!Odf{0K=7r@1T#Y)BZHzrH%(}uF1(H0)p+kWs(&+0QJQ=fL3|MyU
z_(Ba>!dFH(-S!=v#YMOFQ}pHezqI>zI#pD~TAG;7g<Zsr!PXFFs<&Iy7N>uvQT{0}
zWjO!chrwazw|q?4)7<Q#QP3A?$zS!=vXMXs&(RAcU_@Jga+6vfWnKL*RD0EYXN{0(
zmBD&T@cH_(JFE4cOTNj6mrQaJKIJJd)bI1s%QvzxQ8xBE!>)@NAjo77+9C-LGRL7M
zUj5_Z;AT(In7f+RD8u#Z&Hy;LuJsL-)k2z2T<ZsyT&&c5O9S!RNfTqoE?~NJ%rjq@
ztI~7Z)Zdy6?jD}HQu5-i#kd{WMvLJj2ea2cnacH`V+O8vFO`-(bla26SB{<*4G6J;
zeR+N5jLAmY>pU{W+3~^E23^NEG+0bkqTxa0c!@by^Ve}V)k{9l);PGjqfY3^4DDn^
z^Y}GmUc(f4Hl4+k_0f9xrS?bB>5B-4HY>XWSDofCA6AJ)*(d=ytl*JeoOUd9Um@Oc
z55?h>BW2D4UMca6u~!50m8=wo+{f{qKBa{VDBd@TFI-T-=rc{JIcaVgo6x_pE$EkO
zvmp}5&Q+#)&z^`bsVnH^w4wAhtu|4jUim)SW|uat+9SIHeW=yy4GU^$I6+TM`L@ib
zYPtR@b<IIPLl@ecd{B3+D8s7t!XB~~qCWIj96YQ~!zp=+!^0%$B*~sn32m+HQksiD
zsj=r!(ff!VY8f<cOa0^l<!M(!1=TWHw^^oEala^jbRtVhc}1d-_S_UaMT;dUS18~j
zQ%A$Z&2L>nMf0=-Fd|cR3#jR#AmqZnJ4`ID6Fsxb2tFHyk^1O{6qy9o>zNneKypTK
z^z(Inwc_0LsCu{qJ0KE~#d>3#XymOfiUdk!Y4<XxT;k=51|cO=i%Ye*dU<(<5p%bd
zE21^O1cb)gC76h61e@2JBYKZ=4(dgEPOUPgMTAEW{6~Y3z=fX5jUc0dviGB_MRKB2
zvt8Bk(2HMhij`P2Eru*#$7WizmAawI(Xib#&lLyS#)mapDR?w^rM0_rgS-dQ6|a^e
zbWwG%y(_w&C5k_2Y|PMe>AF?gZ?zw5LsvRFY_I##hT|os#Bsp;5qpVd!)2x{{>3_~
zXq+0m8LR=T&Fgzf>uWyv4pp{S>0RFVuV{whT)Kd}g$bmm!*dW+<2t9ZZx=nwy!w_*
zXhho`N+8YkP(|MAI@3bk!%o(eu%-akWYqucRm1eLen-IEV1Hz|dic3Z1wy7r0Z~nz
z718H9{B%uB{j-9|>C?(`iwxse$LiPGo0%#*LkO|n%@vm-0m82ztoC9GrFkbiD4+K^
zI56*^qrZKZW_;P+!N*(abA`?AVqIx;++gP62dq;cC7S$KQ4pKy45QQqu-y{SH?RS2
zaaBsF{G4au0y|&7#jzz<M$%iB$MERXR8rD(Tc&SeVy@387+noaA~e&`miT<HAUqS4
zQ|g%9(28WQBvDl7+cu_mef-t%aL|<Wi9k*f(=h4t9Vi=9$O`7VD9LPN1m`8@*zkX;
ztvD%le=jT4s_EY)AX2WxGPv|QiLgePYXsJ1(RNBM-c_w!B`(7qoK$mcSLSAvyqDj0
z%A^K*44t5d@cN?wNHM>`@iG{yfsP}Amnq$RY*NIH=(g|di?Z(Pbrk_d(aaH^9UZyH
zrFeM3di+`h%VYDWK@}y}P<9q92`kJ-swf-Vg!87?gEbJYqoBY00Q3lep2#oI<+n+2
zBw&MJ47^d*t$!qVYmj5Hq_PBBa!)jdM4GOpDEG4nrm=0VV1iHZXe&TTx;-mKX+~rw
zGi6fhe><AY{k_)g<JJM1=!rLNG;(d?86TAXwv$gwSGTPF>{2??6pWWTwR&1Q4qi#!
zyDWU2$$w&52*NFfmE3~W;6=Z?o=IN8Cia@aq&$i%QzJmMqLWhGZuiF8r}<>m51W7A
z$9&3>>#S+%tG%etyGEjcyiJG1g%@ftb<5R?8rgkiu^3A^MS0V78%;>YZ^jFl_-bZG
z2rIv#TkclBpzt`l<2aOsC2j?Jj_0Z8<iXJ_6;-<hdErRF*e72(P?8DqG^;{>A(-?e
zELTuaUlA1XvJ+)AHj^J-RPZg|Z+b7$Xp5L5zbW3+JID3V^MsV(rQ&u;6b{VSC^)!?
zk0NRl56tL7Cads!@08!*!4@Ty4A6%7z(kTgv&=p?zm8Ep)*!0ck*CdBX<t{}XUe=K
z>!7D`Ad`axMAwnP<|%ZW6#Ce_ez&&|0fs7(0Fm??Q~Mi7Sj`ueXuqbjB+;T`FPiDS
zC1rS>L*D+R0e9xxeE=Q6xFt?=bl=P-gMb^+GLYB!e6m}k8&~zl@sZG@3pckDpV4Lh
zM|}v=qiyYfSvZUsn~0BpiBYo?`1MPA5UXCk6s*CIs!#Xv!XVRZo8On~M3&aKMvL5^
zQ2VuBdgM$D4gf_7QRn=DbL{>X^%wezpg%HRQaFrgvN?JqzciVx-}|1|`g-*J8Cqhw
z`H(NdTQc6C8u7;NF<)$>Wyg<k;Ij;`da9vv<fzhy;se+X1gzHoy?o=Vw-R5u=hWr#
z$DBB{GP<Tl&2wN~dYgvY;CDInQg)c6T4U;w((O-{*14r?T%4cR;7^I~?6krRVfk_k
zww@AHy%<lE&KVx%b2fwg;Zu77eblX~B(b1_IQNhIfxJ3$6)N9C?K*V7Ez0+GdKtu4
z9>;S)UnG*d>jWCC*G3-_Q#}q4d8N!F#|%(nsN9N31=bbC)!K~C0sh$-QPYltw#b48
zPpPE)edh9d#FfDuj!VAST4*+S&w@-S0VhiT!v+N1AYY)^)p^C<Bojo+BufO}gVkGw
z6O*pOqDc=DbN*f&!qql7D?@Hyhh{2b9hoR!Eeom?IpUIHViZnX+s6tc)HfXxWl6O-
z9IA+ms`)&j4W<oLrw<k#%L;csH$;1U!EH<IKVsIqKJzK6&-_)e(=`*b8vhD2#zZ--
zIipA#(uY+JBMXlE{1?(^Ch^o0J1wdOCk@|Op$if>6#|kpWRw`97bN=7KB=#0U}s3Y
z+gWW?l(@EDL(hBYFi=bC&F<4*!#Zp>cb%!_rgTSP?GVc#W4QILwrj-Ipz$P36f_L7
z74gyACq)UEBI%E7Z5mkLy=HcN%KXalS{L>uUvi1@rkQ!FR)EeQbhAEpmIME|pJJ_F
zL;_Eay);IPT5m3kIh(v4?RD*S&AZ7;)z>itz0i{;5GDS0S)1;SR%ZC*EfYfxV~*@9
zOF)7q{<Q6e($-<KAcOfX$JLKheWlq`y(#v!c-}|GeZs=b5lYN)UsqD*K%S!<xeeSe
zsrMgR(9^n>UK;EvLK$X)&9l7N$YgVun7c>*3E0!u6X~T$n@l4mFd}bYz1zXay^r!{
z!#W{|9xJ&`Qknvdkr4kY`9Yjt@wiBSN;>D1)<T4QjCD6((8odwpFS#~R<poav5T71
zV`4E$<nKbu%32EeB4&Up=PPx(_zpXXG6Yu261^TS49%&hf`}^<UyEJKb4|itKdeB1
zJ8FsjiD0zhJ{B73DHL->y`+&@-I{#L!44gBPTiLchsFN3&Z98RaKCxcM_|ZJ<~qo{
zy?cr$I@Q%&JX$sNVz={)`W6#1-+22)GHjr=(XkGKie&DrAt*?`%TZzXGXE}xN)yX{
zY*dLLv@N-1QM=FO?}y4ODq4-K=<3>&x~|IKiE#2?Aw>di!4jRdTL)24x;O=kMfeMZ
znD&^A&kT)ISTL1Jwk#zUEup0Dba0IruLmTuS)8{2?U1zet4A*VjChQ~6MBuzGdn!;
z9byjp&;Dk#Jt!f-EmbQxZ`98j{HQm&Invta9{tN45M`QU@VA!3K99`eZ$~7jT1wt|
z!!LW@Vr%(z{ym=HazH(x>~BZ~S2@@E)&JIrHZ5vj8$RFfd8DNO7ct|9Wounm=Jfb;
z*Uuv|pVJ<vb+=d>Ry9f{)|JiZgZdj@0wzi2w`Q~6J)uMb?Z$10dT`y=Z~Oswxew-V
z30*sY!pSX?GoFKs=L{5S()<6F3yX~lda?#Vghr&kzXGP&=$&=3qv{yX%9;{@NvbRj
z{Ctt+&GzkUOz-c4dzR0|7COyIs|EFI%Sga1UFh3Y%YJFH$9|;B5*Yu5i`3EPXg3s5
zX9Whf>@~U(e=wo$&6oQ5UdYK=5?p_W0q@aoi+$j4d6VV?qH^~?y|MUpBXU6n+<fm3
zLE#KnWK|TV5g+=%_4`8Bn!tT!X;OTUKfuoy`;XjsJXG-l^2Go;+=m#rV>fYkG$r6#
z2QF)h_kZPLU7g-uW`KKutM-+Jf>@Xi5@0e0lScG{J-KtBZ3)o*T^kU)h&q#P8(45$
z4BUwiWse&Pg!P2Ny+FKEdY+Q?B^~2~`EkSGg6@Q4SW+GhMC8qXMNVgJXw$%)u(eze
zl=z*Hw3vFhBNzdc?NA=FOil@4r35(y{CuhZz>khRn+wqFIwVk#1kZRqUm05>O{y00
zv#$NqvhrVO$BB_Tm^df|BDypUVt2)(Z*KaShM((X-4t!b2nk${XE=d_cuU8vuqQ!w
zsKE5Q0&oGor<Ly;ai;t?{wtz7Ya=Z0{%e5NBZ^M`_aT-$DhZC$8z6&#pRXVJ5f!OD
zMT-Q~Ji&<;a(a)g&5qYNfHjBtXLb9h<<vjd5dOW^JTP<84#c#l9uacqIO(_j^e3!O
zZ3rm=$o?q=5y<~ZLmaxm3$n`q-1)AQ=wUFQDZk-A70%D~>?00AyLJZZ_}a~gKZclA
zu`f9A9{!mjJI4<8t7SF9i0o5D9rPgXLCBnO52>=c+|SDP56dXBf2AQ7UxRfJqVu3e
z#6#h<QM-^p=z`^7{aR5n;k(cu>~FrudE+d1ruz;5R5U-=Tl~=oGygEeN}imJx~4z#
zk^I08^?MdB4sf+YIEd5+UnX5kPaJDXZrIPt_7BUbA%CGC!voY6FxNIvBLqMLAk4l5
zB?p->`W`xLB*7rXaL&x=9-p&9q+y`?vw8nR@%(H<P&)sx!>d1zG2>2f*qvGXf1P-K
z<VbGZ(AM%v&gKb-)R>u~$g6lhWofO;f2MQ);28$ppKC}#2LE48WZvTb=j}`tIFJ5d
zhS)BF1K`2GSciWoFtpcy7~;Vnhgr{Sa1@@|`+uE$eq@Li|BsV<f-{MLX-Yuxtv^$`
zfA9?V=3gm^!Cmven$7@E{PV`fVfhD3q;fU_{_$c5{hl3lHCOMQEvMEtx>H=G(l+=g
zbQ8=sv<1^p9NB9bnqm$QNL&TE<>DDkEg!cKq7!|JYcDJr{M<@D2-C2))=CXgDv`t_
z8?nBu(Z%VMFM_`;3Yb@U_BwsmD7ybVTOk^EeGgm*{RWr8EcCP(bc%sl@wmr_ZTeTX
zvHTrf3<vg4Uu|RreTZG3Q%4uMylmJm0;cY^3H3Z8q;Xj=lh3AEKE>-DnzOSapT5ER
zD06XU)`x1X_a^OASsY<$d43bP6VF>|9H9=8)UVTj-dV(2n>cr2U1jlyK_^|E_WnDG
zw^=OM8maJ}wQtDPU#wAqF0mnjh;8ULzkzbjB-DUWtVStQe1PHb3FytdhamOLfPCvh
z0$%Yj_N6r&YM1gQ_E$!Of>&xDX(>fs97~VlJ#;;OD@$L>6#~2CwrX&U3PD_r8O%O3
z7;Xna*+q=amb|=z1hm*aoBPw97~YZg73+eI&6@hd#sb=sZD;^j!KKoQx@plJ4!eS=
zixb_pn0MyiXC_e|y;2vjl9mg1CMar=qhbof!U}njV7SMaxysM=0Z}J)(xPN|dZiC`
z3ZmyhE#BdP1jKhhCS%sT@-Ql(2Ump0m>@101{4;Vd54HwN?^88mg=|qf-uiVEIIIq
zWrXJ<m{Ll>@VE-hVRD6TKGS~!c?pxWaJ*i6=x*%SZC$5pf`0+KoxXH;?w-8>-t{h~
zi<Fptl8sbYnYX~4Z?3GtU!aMF-uZJx7CjVll8(VCzugQ$cI_xoP0YG}2RuyR$Dr~a
z<n^VKZY9Y-ZCNQjT*iw8xFE*_(57@f8)Y$T$o9vx6v^}lAnlU-Z{AjnazdA<3{GeI
z55Sz#!x+R7e_MW$mm9dK3*kCa?aH1?EP>9a!q_|&J%{&q2y<Ij>;B+T=<h<vH*;hM
zC*AAN?S2Fq&$Mo0F?2p9^nKqi-NYk--`S&0eXTal`Ibw%6!Youp{2dRrFAjMd^PK3
zF@rrao{2kd6)UWo^7&Z?T0Z0O-_?fo^e%KV1_2j5(qOkvv{Yh_<iWTmu1b)wJmIFA
zs0-QM<$@nGz|>4w?W+aq8Fn~%mo(%NSoaRzAc1NwIG6*Sx&ba&oeWO*re}3U<I)p|
zS6k=iH1kT^nc~cXE+yOu5AD2Qiw=E|nBdS0CJTSrqJZN^fXBS*47Socs|(s-FS<`5
z&9FZ0-!W1C19(2?*fwX`TAqMl*!5C*rp|UA1uP*n@c`jIsI^JJT$9E7jYoseW5`cE
zR>CjVxch6^PKJlK_i58weer@U;A*UZF@xQke~dm^o2)TC{RypR&b2^CnP{FgQo^@Y
z?VDg|A%fjMUZ==-09x|x<GS<CP3C?pZtsAWu!e-4%C_MFEU6~Qj-X2<qDl)1u$l2&
zS@Uha8|{}S_5XRH^jGEo_SLTF^gI^q<%dl8(@-QJ<)3OtOMX+UHULi`VoDf@GrQ7~
z?M>=5q4r88Edu2lunYt%y>v4i@(^>*q|)XRe|&${r(O7E2o73So3g&U1^-upgM%r7
za@TSWTy+uS2<v9&&7B@!ia~FTr=J(11aZXcJZmXs(!Q!LhZ^a$Zuh-+G5>}H^vj9O
zI!NSgu9u~zwuxLMdR=iXFQ|Mo1|9#~N7uTT_gV$dbDsu|KiAQzy|n;ZA`%_c@^Kby
z-u7$r8CrJ(uqVSu%_*p#Z%vNqyDUx8-+x%yt=`4S+eyA#ap4V<cuG}QDDbshkif=q
zPA)l?`-8AL`or+>Fq6Jp?D=o+*oCq~?V$?}gDS7{!_)J6(kBd7OFmwW;e5+vP}?2<
z&TMR<gWJ1RY4c9fo|n<_&E=!76%~n;CWG2jpC`!tb+QWI`<f8@1<QEt;N;oYUTkF3
zx7SaY!W^&?Ehu#fVXYZyDLVGWn0k?l-`6f)dbp(?Pf#OB>=MB2Z#AVFbP4b3z_U`&
zjV@+)Pc<FZ_wDgcU(tgm60`n3uejWo<@U|Ecc@-+CYgIzQZBsp38kH(o~Y0<vNO4I
zY9^~1+G}%dG>@DulIXd*VIFFD>^KLWN3ye&YE0vaY3Zo}jG4$YzI&%;bHZ{uXk&7D
zUTB$&S)X*^aYfvmm=}vbL7ipb0$C^vn%!<8kDGBqj*3+^0{;&2`cna`Ol_BtUOoQO
zH@BvmuW!d$m=L`SAs5#vr?}jGyi??h1z3?q(oF`(_*td<(%rl#WhrqSo)(hX{bAxx
zBF^~Yvq~c0%>2*n<3~pKs&>Wu3Zw<2sG^lP8pba=8ojDS8%itP`WEkO8-4I$L4!ox
zsf|RUdxS~|)p8Frb4*32zA-e~GbG}mOR;?GAo)Z(FRdv0t;YeXBqd29Wq67qO(!m}
zD=FfGtLZy|coAAW>B{iv)awXVU+$_Snkx=-t-tC3P8Mauw8o_r4UvS$7T|2-1#W%j
z%NUOs!HlcxoY2i~D9kBcBPCLI`Wcp@)w-!J)VNQe_~V8(Q=Cp!&44Jja_cVTec3lN
zv)HVSitC26#UtO6YX+s~X@m{dZDqjJ-PEQF7qOVz{UkMXQG&vn8CbKQHAWK7gY#3p
zGMF1W7Vg1xWAm)%RIukL@v+cdFMP4Limje|7lR)iu=6sEel`<LT_UJP5o#vsLkn>|
zyc#}hO3VJHWBHq0z7Vq``iYmO7<QiWtl0|~44f+~!E-K)a&^>ipagyJQ*hLVsKJe6
zcD){-QXTN9=Uy=lCA<sqT}B+8y;2Q)*9}>G+XvrfKmxR>YpT_OBYj2E*P7JcrGhVl
z`{280FWyt!eFN>nOFCVGAcPgx_^MwNz8~>1Z+h@Cs2QR64ay4k`N3@rY%#RF1HuhV
z-;dL49#LJtruIB5n(77Y12`%dAPCMh<r_#KMkJ{hybsO&{Eh43gQ83eaA*1eI(!>(
zPq#I49<pJjNW*m`QzL7#^bHPQ42>avD1RJp*J|hUO<K3ENbe3`$ZG3xxZ=!vAql1T
zc$fOTYI!`(Lt#ueo#CkagfM&v%&9VaN74F@LF^Z$IBxlZ_D~Ifoj@?V65WR5vspi*
zOn_Ew5U)2tC(q{+sb5~dRbF6XVUp8fXZM6pndLzG(?s`klt_9kmfAa_{D#?`d_A|>
z!!+@leP!&DrVb`XPLi~hj%1#0o?xsp98p4#He@-VvEbBUz`JowO$~vCQV+x3r9n^3
zV!r!F1jQgsIVY*8nZQ>^hjMI3o{~;N@apJuYf7oMZk>dr*N!ZYrlrfu0_KGH*7kJ#
zaM&mecv<^sY9@R-R$M!JB*9|`y>F3#M6DDOKqEu~blDMs3RBu{pxcnGLojoJM?E~>
zgMI01{b+uMn!v;G=R$t|pB^l-w^43{U`Y<T$RcDmiJ`;nkj3i{zar>LUMN>Y5Zv6p
zO8DHB(>a@*#$Gb)fTbv}4;x(5OwK8tESkX5)7DcWoTvAwtF20%o+?YrpZPLS{=xO%
zzD+`Vvn_a12JYm+VX()VvqXpoQZ=3m9o}O&;kE#C)=8i_1}A63;#NSN;Z{8?_=6xE
z3i3FWyt>eUKxwTi*mI5^)aURDaLz6O8|)dWSF|J@vr;F)!S#N>yq5Uiz11r^dba}3
zlvpL;sg)bsZLlur0V;^kXx4E3Leh~GVj8k%n%c&&3pzYUaEFnAaVqE*iGa=$o_c`L
zQ!+%Pz98<}xI*=wA<VeoZO{WhYC>2fcnkyyj3*(2`Jg>lkU-@o;!`S!bOdw`37mq~
zqd()tR{b_t50={36D%Jju=E%S6p{@ix@4PeK-5j(APW6TvVZwT`d+r1mk-^XCz>>=
z#&hRC-CX~);U>|Bwk<I1_e0;RZH2;ur<g%ck2<tdyUYv;FoZ#er4f!AKQ4dFQ?8z=
zlJY;@f&cfbQoy$0OFo)=lDUoqw}ci$)S~7I{ArmuU4(jXx_L_536vY)S?14vs0dau
zeXPY~Q+~&(P#E0Nq}1jIn5%>~trM_(5LH?2nzh=P7}g-l>ER1z4nF9RSz=+Hu^Sv5
zdkw|k55A>yx>cgv6})*+MIi)S0ML@j)=Smg<&gmI>BlbmwqOI<tv;1g!Lg=}15@%T
zhP^7xkzo;8w8YHF9tt8D?}vf)^{co;L+-HWr@GIKccT~Z6OyzKwAsFcxS)9;YSDFM
z0*{18`JGZE9fY!P*h6#2D}-C!?1JV3T@X}bUk{@%`srBoB)WO#OVvN@+>wzXOn1Ld
z`a1ygR*1iw&6rm^Ii$2<XcwB^?kqDhAx!&}HpFzm=*T2>mB?TO!+(im9a`2t(tc@6
zk`5<-^>=6A&1JYb=yv2o0-vN=)ZJDQ+dHyFFTlgINq*3kOZA7Khp;FWK?1=AD@Z~&
zH^DSJ?ZJLV-eUImPg)nT!V_b219*_YEbmqU9GwDzKmrHgF?Ew!gA;5nI2=6lWT71Z
zbbv9yzNY%Uiw38s;K1rX4?d4eoPnix*J!7{zS3%MO`fisL|`N{cm#h|mm~lHHyD4{
z)|?fM<ve<_u&Z8V;E7mYaJHRBw3aSJ3u!zpW@HoUx`D=5z$jbcp8ZWkMv=#p6^-j}
zTb2>ujzVi)U3KG0c%}%R(>uBgV@Cp#7~tBV9uA&pk3G^r_<{xu3O%KMp$OWfYH%9O
zSFi6_EB?W?bq@uk{zrzGo+oHHrC+U+J<;(zPkv&#exNk%JBQx-zhQH~Y3gfE*99+u
ztx}b=K(AO8N@D}1BLdB>EBpDWa|T4ZqrH*0`n7>omv-W%>JO}U8f`)M-^-ufo_|&T
zAM3eh8-}cDAgVGEzHG&yvi{=E{^KFLfHDCy^D#-jBEbMLWFz5eX+W0GK>_FZs|mN6
z3$YC=B2LMV?PRZ|#u)BIiRg46KS=ua&{fpg8fD?ZyWj|>r6*}3_Dg!r^<ciQb01a(
z-wEr*=!Lvo{4`%`73_`E<unq=h}E<1xvQ1exq2nW527cO%6TIdQB+vxrN^?cX(JTn
znIq&EBFyBO0r^X|Vp)}BkBBCViFn_Ptx9OK-OO&FF%_Lp0KK<gw_5SW>%I!!V_qy?
z@Kf8hO?G>N#lli<ryl33>$_7;6vorCzjk-3nSp!8(BYGtS4N-@cBO*CE8_@B5;Eym
zBlEQ7GlY-4l=8)b)#65p``<=O+dZ^htsb?-_vQkEJc5M8io&(A*Mq1ib1pomrN%4b
zP@t`tS}yQ1tt6fZt{|kGEaoked^CdQ)4@E*mlpk~Tb?CC$?Xp2!>`jjf)+{pox{gs
zPWrTeL`2ww2kIBBK@mh1?6|G}5e-ng-r-Ker!0Nn_aC??QU9dQf4j@_=k?Sd@!2BI
z8vgVtU2r{0*W7ivi@W-@S9~R%H!be?A3on98~Y&0(QQ71<3lj2g$jN@V-8$*JeLBO
zok_0Xr!P2d5S$gPDeL(ETPxvGI|V;XE6p<@NxefVY^K+NCUn{|{~orM{)6rN*^7<&
z@1XSWA^Lv@rGE-c|2ruC@1Qi8<?`>K^q-`&{I)9lcToCYlUaTUVE;QP{jcdPDSxE6
z{686#j=`9(^?$na%74{(oQVvJy&~%Yd{gm@#i{W;!etZ;O5IL^nMW82nC9AS#D^Zw
zgK2d>#L(?*NVzp+IXDS{4sPaKvp$do$Fb9#YZH2|I;U@I4_Pq01kBM9wFDP%j7kW8
z*@K=o*memLXm|xV`a&UTWE{|n7zJHhi2~3gA{OwQX{qNR1|}DkNE<;dC!l>a5EwS-
zHVRfg4^jG)=4eV${W;XmLrhuWu<X~I9v5WTZS4bBmY`o}UiCc4r{w<;v3N9m>VoHx
zXE+Z~599wOcJMv{-4?&*Q$9UB&56GCG0ka29w-eO=>QTboibE;&bBEJ|ICB>Q^Hg3
z*Fy(Qj#={2AuW%_It>+ZHC@BY49#m(3AcOW{$BdoEAjug*#3V?3w8b~@sWQ1e%yvp
zfOKgvdVhO&iChbYqcv8vn3%<K=<lgocL|dV+$w(glF*ks74Bc^*X9i1(b?*jX<+F2
z&$EU8EQ5$OM@h6u(z>W~MS#Tb5#&`CY95*382D+dIfK*n{)6hI<D(eFDIW^Kf7jC?
z%x4^tdKRG^!AxM9vd}~u3#w2993aIWP05?o)4e{?S<(qO0a&6A%AWbl2rtl?Ue^Oi
zN#FY&_dgz^T~5h3)$4=76u@s1#)%Jues%~k=<_r7{{QDiQ7P5qxHVnZ$7T$t@~un4
zLPV`tD?nb{zvLqSws`xq|LjeoI=?3nyVttN{+8RA{fgrR_b>-K+){sfT{XwKRtHfB
za%0pyU4i;96YPG90i5M2V%!rv$$_3MLHDj^nVZ#r0ec(fMFQ{m0jc}Pw-jO_j#g~g
z_1imXxgHftQT{sg)Akt|Z|0mZ<sOBFV8v3`L2j6$=I**Wc|G;=Vk!%fz`L|sLt(s@
z;Q3{_piIH`iBJBplUMsyCri&QV6^RF3|fJ>ju%Ngxds=9UHiv7i=SvwZ%DMyhX`fz
zmhc7HeYk~3iyy%ox&*z6E)y<K(iuTPBj8=!K_krKq<C>lh|WE-N3E)3z?#{$DuV50
zD4KV!s!_dVVomtxd{)glB3W9yWZ`jY4D^$P3ra(g=Ih~3S3$mLI^kFDvAm}r1jhYb
zzHz4Va<gvdt6YBD+kGQ20cFP<g{9zXN{~D+BS+80Q>m7g^>A;^ibRb?7M6;;_{(u6
zmv=oTXLWjnJ+h8J?1M@dx-4N;IToIU9!3TLQDb&K@csZGAMXPj@3A>!+^rVEnMlLQ
zaoUA>`jM<dUB1ha?xdyuD&zCgQ>#k7I<$8E?k0&*Pf}$~E28m;u8^tSj8OD?Vr{Rq
ztjJD&)b7j3ct8BrMe$DnTGm>_QZNwQsMA5w<0KtxL_ptE$$UXWB#_vp4egqeTg2;&
zEV~Dn<4c3QD^Iu=9L3mJfn3N1Xu&XKorMMA9aW|21^VL*@}VP&N^lfbw3KQv(He9)
zucbn7`e*!D@MgDqww@s`@aj<D>ka%@FD|P((^?79IXff_2GZa>x!h@8r|C;db^Ki7
zo0uZX48B9ciE0+vmEGHR$H|6r_sI?3F)<aGtBE+xaCIUKk7cLklVDH1R8jN=jH_Nr
zwcpOW)MbhHT%E;y*>%xYb9;C!b(&A$k$QZ0<T}JmBn$%!$D13B53oQau8m>Ha1^!D
zCd7;g(&O&8x)DRDFF1u&N-e%@RHIU(Y@me}L#_e7Y7tcVGxAf$0h*U}F(zY-u|Ao2
z%h=vD8SJ9|kZL3P3fIq!Xo4Wy{-e;UQYN61dtcW2QybN_2FxjvFkT-&HHMbSVh6>(
z_N?ref&E0NSuiY86uBN|r%-MalZ$+*B2<(?_SK5Fc44{+Aqj(h1Wnw5-KNt${`|Xf
zg3#E`qH8aF8s-aF;$l%-bBo%jZG`Q!P^=v~&{(!p#EKZ1l|NFaV&R5o2RFYHq74tp
z@V-{kLF+IlV`mxB-rew|0nJ!~7FG8`&9T*y+|~pWWld`^Y{bYwIMw+$A%{52h4#YD
z9oP3h4TivRQKGO=FC-SW5^5>;iquXftFbA~Jk@qZ5sTUAeKO#ui(zbtDJa0>*$Y|`
z%!fw~a4#@N;h`{O4?VB58Fab99S}|S&=nk=*W7=Zp8O|nR@5KP!2EP{`^PCMFW;<q
zm7*_L<>U*|G|@N@D|4cJXM_@3ozTgU35+QM`U$EDhDAWNYf&le>0~EF5OqLSAi2=#
zg|k!1py$(G>4b2N;rmDYI4A^Jb0J5v;L<f2Q3S?Mz=iP3)blM0bth5^!LSl-B;wgg
z+xIW}f#0b-*CM6S!9Jk*JZQ*|4FWO#PhwJHv-iH>8+!dXb<_tx+#-pU?9_ro9MK3@
zmV%6H1?PnY=D1)lB<(Q_K{j{5gT<O?pcJ4hhC|TrMQD>S7x+QNzCUIEPXYtZ1YvMO
z$)9uzO9GG2Z-s!<vJ_^?pNsdr)BsRyF$jMGlQZi8o@kZ@kp#nyjo_J<KhvLcLiQ#+
zk_GMmyJuiNz<2%oPE!5e4GYM3Wjj~-XBA5RpFyw2)4Xe9SE>3rS>9&6?%q+9eAI$6
zLijBp{k(KQaj?L#_Cvojm>gwig|~;d6LD!su$tUbo{~zu@djJce}?Ube<q}J(*L77
zuqwDumV_JqDk8c68Jzpyped-|qS9s4nr~id*)9DXn<(GTq3JDx0`J#Y`?r-mH#+}k
s+3T%8wrBbk=LRBKl*88iotjGbz`zX|dELc?_E;9gQAQ~V1UdTu0h1c@#Q*>R

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/DeployStatus.jpg b/src/site/resources/images/DeployStatus.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..066782e6cee0c9038333c27d5db47c49d930e229
GIT binary patch
literal 31186
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/InitialScreen.jpg b/src/site/resources/images/InitialScreen.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f9507fcf40156712890da8269c2f64b147104539
GIT binary patch
literal 29180
zcmeFZ1yEdD)-c+*L$Kfu0fM_jfM6j&fZ*;HJZOMM0tB}JK>{SW2iG9MJ-E9Qv~g?R
z;m+KdWd1w%pP72EUVUE;Rj254diUCEt-XBheeS02mOu}lNy|xtV1Pen7-kUYZWbg7
zLPkVHLPS7DLPA18K}JQ#!$3zvLnp$)#lj;arXVLHCMBh$Wu>R2W~Lz}W#D6EX6NAM
z=BA(*5aH((X654Myaxh<f`WpMhE9lqLC8r(O2zqa|J}8Ku#sVwV140Ws6nvUFmTu~
zckLhw5C{h09$Od~&|m*xVBz2q5Rs5kP|<(^RS!V0FmQ0N@NftS@bJKBZ{T|nJT?Lj
z6^A$?uCfslwId#<U(6?D8i}%2e3jutS}tQJe-zY*1cXGybdTs67$0-<@bd8s2uePc
zl9rK`d#3tQO<hA%OWVZM%-q7#%G&w0i>sTvhiAasz@XrFA)&Ex@8c5^KO`l8&dkcr
z$<50zD6gojs;;T6tN+&4-qG3B-P1cVIyOErIW;}Ayt2BszOlKry>kRPJ~=%*zqq`*
zrwaxI_ZPDMM%h2mg$>XJ3l9$mk91EL46GY)!C}KAP;nsQh$|x*IpR`t`XS><#C$4i
zMWNwRIm9=18b*Cc%e_o@bWhrEl>KXj`Ts|h{f)4{(=`J^hl2qY4-Ok72HI=XTIp-X
z+#yy73<|H0=*-~lB92#|!^b+ubZ$88&<TEV#N69oFC7)A?s^AO=tj+jUlWhaIN1!)
zy#qz;<4krnp(V)0;vJL8H@;f3lT9RqCwGo|wNcfN-NhxcOK@IY{hcS1>K)MoR&gjN
z@@&<IaMM*%uS_k8v6WSlh1=^Cqg6$x#LD>MnmNbwI}qUk_khI8w}Uo^?2g6=yinE$
z%YLmy*h^y+hmEv%piiD`*U;u0yDv@DmI*1@lY5_eu~>%v-!N*DjqJ@05nK!3^xe?<
z^7B7bQJ>%mVdl}3*dVbHss&e`q<j|bvLdXFq<<hwx(lj>Lv46ben9Cpe+Sa|)SJ$>
zGDxIot)M%82MS!IzePI&FRtH#R$n(CHkbm_`mkN!0MpiXHjcTFG3kcsd8F)OXH-Wz
ze$gJ<q`p)xg%z8>Y;Mp+f8+|?wVgj=iKso?TZkhsv~Xk#Zv2=qT-2H|NYikc1hSn(
z59d?_@wY5B7Y-}VHHSg#<M!z1CV_dUf0{RQ^=0}AC=7ZBV!H#8lz>+d%kVo33%57U
zpit9sS~Hs}m{;T4QXCz})oNj^KATtBOLrjjG>YocQ#M4c?U@kBimmj<=3oTavyga}
z=m|f+0bPz0M^6Mt93=kKQ@B7;EDXy^XlCQ^VwCC*^a0-B{1SXI&vwHaBDMuba0@kn
z@@XYEC7Bf4)Vp-dDWTVoYR^1LcvU84xoB1`RE=-@BPr+se#>)<G!C{(5l#}O`0Ci*
z`B|%p8c1WdD+RX%x^;#{(QH86ciS1COB#uQnud!nE{|Dr4emf_$x2tCjyn)I5s;yg
zJJ7fFIH)fNcoAU!s!M$SR=sKXSxJq(BVu7e(*9bKw*1?g2-C-k{p-FU99b2;FK&ir
zx?9OlMajI)6d*-?*wr<hH1QTT@2M6oyAkI^B_c8BoEuRC5t}H0Nj?b13w<=WVU-ix
zLLj)k1?Z9oFbGw;f{_9+&;T%)Bw9u`5v;6%%u87(yEM!*j|5ZEEmOUET*e>2%HK+e
zB(UXLRV*ZjJ!f-n&zg~FVCG`Oc;gG{u0Tn>jKSez#(V-o=d<&5_e51+ziEA$qES}`
zOc4Z3aZlv^6eCgLIN<M?Y}Z%!!pnBUku#<E`s<{<56c1lwZ@0fY;(e^<mz)b->?o2
zb%a+D=Vo4dMx`AqIh2Xp<aQrPFENMKzm84ISZ;Qy<P&nMLCR(`3WgeV1Xt$IO;8YI
zi5<g-L7}C9sAN+R00NsqYjA!9tfy18wtl>DgtsHvc+Pv17sMOhS+f1D67>@6t=Qep
z>v`}Gl;B*;w<gqUv_%twme~l}xu$!(@j@fji1Ft#?OsN-l=i!R?D{yzC*ePucm&=c
zAIWvrfIgf{Ke?aqUN*BS9%ca(GXG^lBdaFj(Ng=plTDlKR2d85Q4|83tOI0*{F=v4
zQoTA-gs@1DqVlw~9;MiL8&8tItdO^Ry7th7F#KS3Kj;{#@7RRGqoU=@2}xBmhhRK`
zYBiu274)|-#&@9RuscxaHh9^l=MMD5viV@;4s=w1Y@~z_ewjIYWPCQd@5z5r42=E!
z`&gL{EwL>Og4;8I>5XfuffV-xjrMZqPV6tVoxtD8*{=7%7oo~W&y=p<fTi*V7>KR^
znsFtnKzZ-t%RNNGi%;~ou+(>;CO|{qWdqox|8!p}f_Egp^Ztzwvq<H2ny)Cm9Dv$~
z<^y2)R~Q!$D*%g?@!a4X5b-1Y&6QM!t8DVcFoNoI=Vky<A^->=s|iqo-vGw}_W<g@
z-IpN$gzbUYvgtkGyygP{ffYuXb`P;F0)pF<<{K#o|5QeAl_>j;U;t`81@`??=>BC!
zyv!BaV5pI!kIfyZT?3u*TU5dD-sSzcT8am2z&KNbWB@U|g9}Yg@OMtO0e}@N2>i;Y
z+Ir3G0PU`ehhOdqc=eZI&4=mtjGt=e0dQan!&{aaw{pE{n^mft1~m8${Vm+*o4@kt
zEkx-GN$T>Ro4S^{s0M1;v&UGrqMIgnAQV7yFoA_6yC(#^ED#6vI|8o)ggCCGF<ce1
zE`E4pbuPHP3Rocu0;mvxxk?lXK)fjSZ=;+f04DxEYVktB^bVAc+<deMeUu2rl@r_i
z#&+X&2MQ^9p&H0mF!C2_3+_N~dzCJa!XO5}4I>iU>}2Z!UnH*w3jdAR*Q*^6@X&jM
zSb!tk2N&`HAJZ9{=>RNkKKw-Ly|L1vzqypU1VkVAnXne{x#PFbx>LERqQ&wx8{{+I
zgK<!te6h_zw(E6Z8iR{x_h`yCAH?5-`*;s7|DJP0b>9JSO7u5ZQg<LPfLpkLWkTUj
zKmI{*3u(Sla9&Ac^wv(a?-yyjPHAh81rHS&ocI0(LD@9`q~>2i!UMvh4)B<uCVvj_
zXKzE5F3-ZC7r&8<gCe#$!*;z4AkvPvEWb0>;A3)jyl)G(2Ub%QaC2w?j{&mm@0tA9
z+X?pHX<6_dh}!EB+g$hy1cSXgvCX#z=idM%c%lJ4DOB0J44WO>x4r|}0sw>oMQOel
zx6$Tm+B;AhVAJna!G-}qP~%<*>{aXXcs#^5!wt^&z~A0mmxG5Gnh$0GZ7>gY$lN(;
z@G;ukapRWG2Ygb3@^8OJRnEVM3}{BP4HW+gu&{-ryW|VGPIsWQ@bqJV$tTUr>T-?h
zkB7DW`6)lt7R9LAcy=abEr^{ZWLj8kbVChhEHuxTjw9MFh$ucfPrhZG={x4jWK=u{
z$CyJ-cbPXD>aJ-WBm(Cvuv^I6;!a4%))tuXEsMoTA3WF9U|g~3)42n|EzWDrwK>}z
zk;Q&n9{w`LPZQ8hb6DU*b(j{i67|kA{cIp{#%IXPe%<GE)Nb3(`CN8rp3IvmJx#3d
z@(z?#!*p;7j+xTe{~DM&=_Y0xiTt9W+L#}1%E>1nIi9vYmd6plR(;J5(&^D9c~Z(&
ze|Q$Zoad!xk)?f`JbyAPrzPC!RTk@@s2Mjbv#!_mZmlfrTe)a9m?!Y_Y#iMfF1L!*
zaW!iBaRYzLCVe>R()eocBHJd^xMBlX12zb6jUISN$YAjChOklr+9INLsofDCWP$Uj
zAUt|j6Bg;YKmSsc^`<amzV&$;RgDt9uD-TjnDOgA^{CyW`P`#E>cTHpzMaPW$e2$y
zsqHUw_<#kNy#vYcpbm(Li7xFYkBuIE&8ZfaUmnnTIy!QuAmrR=|2X3^mLpPj2WERD
zUu3Y!eqsHFa#G=|;*YSc3QB#v?t)gWGJiz@N{x)}=hh>im?$;hv+uwtI$oj<HBTCi
zENPu$sIgF)Ptn%aV&}iY4UZLQ5sTO5VC7IQ2ZJx8;&gI6awA?J;J8;04$>XIcRiks
zgGNs}JVXZjNyL*l#|<idBHc`>Jq&Iq=_7n)7YljA?|P{Y*+Cxe^7E^bUos>`cP(`d
zR*qdk-t<4p4wAx*rEQ3RAMTGV?EhGR#}O}rH2Iy3UXpqWyuERLCpg3pZY&&i*d!-D
z)*$LKdMjstdO1-P?P&hw;h|ouvm-|NuD^hN%miHv;R}OxLO8!I#^NOd;vTyGC<`W$
zL9a8um^fBVjyboRMRugLCF1iBRYdd>hYQ@HMA7B)(L{3Uq~sa?Sf3En&l=J%FA|~G
z+|Xv#a%hwBRpXm9I6hxt14rSwq1?&}*^UL7`jDg#sj+fCaw6M{hrSn$Ez!Jbop|Oh
z;qx+8n!YG-VE91Ybfazku9dG6ki|BF(GC~R9%3XF(nCpD(afns8<YNb4lJ28<4F}4
zOQTn}ihWm?!Q(6LUix@PYuH1i@@~Ys(q+#JeSBp@8`L!I*Ch^NmM|Z4Eu|Cj-cH1(
zbMk~7yHWIq)mW#eNAs2-iC21}o-1*(U7m&=gQ1V3{`M(xa&sDNz<!2&czOtqNN`OR
zccAkKY?EbEb$*6I)w6i+XWsgw=QLOMLb9`_lxe=rQRsOuB*|X6uiU>thph(`&Gj8u
ze|`fnl%i!m_IIET<)1&FUY;3D_KWxnbBe*am(a%Gbi|nH#Uj*&Bk2YN96NEsT={7y
z2(m@Jo<(8a&8)4_upGQ7RU=aq{`TO(4I^h6%_P!~A5c>R!18X~fo{~u|Naq+jISPm
zjSpX+CdTWx8d4eN&9n>YGJ-c3tH@q?8+RV@XhZLUo@J5@&r|L7VS0E>`~=Z>e5M)o
z5hpRnyY9=Yyd_V}_`RP%nrznxEcW=65>r(-xFhy2`NCl~^&{y|ANVrAx}v-FYW=P^
z#23{D6^w++pV*8y#=G`7)a=l@toqMFWZ)q9#1|T!OkB^YQ=c89On0o<afU~)9bC6L
zJ5R>_(65maD^a?amotw2AqFLki(!_f8s*ntbh_z+s60OzJIJAD`oQ$i(~JQrRgin?
zw=XG=IG7&3<ip;BU&2A$&$YY>&h|XT^LENLyY*_DdJ2JAioyne7rO(|bOC%<4fgkv
z1mXaIO;HqgAbkA>V8XH8=F$&ukkh1v@mDCWknTWh?suSz0*6C`cVe4ufBmIKv9kP+
zDj~KX8|2^U<DwAV1E5}F5N_~|8pEL-5D<w{ToQ{xAAi*k6>Yeec%xlvj~9ooUx9DL
ze)}d>n4%Os6a|%zx&wuls(z08+q}BMR3&$y-@nQx$DS111dyenzen(s6op>?Z_<Y?
z-0m(9<gMv!H{t0wYW(g>fL;IVji(u&x9dI09l*31hiNsyv<8>>V)s<!00vYP4BT{n
zeH1EM_d9Yehb4de;=Q|$7641^CNzCjKSGK^_kKo>YveRnVYVXhP&!mf=_nTq-G<_L
z`wkSNdSmlFFY`zIUzw2}g}!qK`s+7VGC@_~%ac1$cRrM7aabN0MfC<b^}*pnF@Qz$
zJr=3L0zgnRR0@5nbX2nc8%9`0xPjzk<KRso1f!<E7!3}tQo1|^fP_GK=9Fb7c3j1G
zsU2zBu5xd#!E1mT5i4g{gOB$BWC(6-sy;^*kL?CbJzYf%$OjMAK%W{M<zk?z02G05
z-Zii4Mc{ec<(dNPM#(KA1NFWGK>$x5!Ec!yd~*$~_C35GmYF|XgecFj1vozMP#goR
zPH_)}_znbh2e1Bs@{IqEhEtmiu-s`B7gzT%tOyqWI=Cb))IcZweim--l!MFFJ5W^V
z#b{9c8^Ha8j{stbx3)5WIPV7R90?3(FMx+AZoI*rsoZ@-m+QZcofMa%&`yu`)_;UN
zYIg_POoWO8%;Nsh{M+|fN5#DiS7SH8&p8m&T>zlXN6S#|Wg}<cBM{ImLwPEG|NWD)
zIsilP#o;}pOdS6<p!oLzn&q|7O{g&Aw?Xhec=cN)u$rn6titxehjCy49y#8!4d1!g
z(Xz%?_G$hl()fzXLm<d<JH=bJXFCTgs{@4mHokx|?z%ZI7ujI+6yG>hv_g#Xs!{f-
z()QH^V)634q;C4aSjp?cA}&tmD-~IqIS;hD9x|jgrtHt3U38(e&810>S(z0A8i$=Z
zGm_iNJL(Ra<?#^1(FvXxii)tcUBaVP251X5ZUY{9eVKFpPH+lYGE{0kLgME1pt!}a
zE_g4U+13F^7T<dfHCS`}vDEjW$gXIw<n^qk-FxP5lk&1*exr1n7DW746MMVFYmm}u
z7oj(n*sew9V*)#Jw27OsZ!kGdiv<~v3$^=>?m!$)4GVXm#7n|-qa%u2B-=aCAp-cK
z{!_trX||Wx7z?>F(_<k5v`U;oog78Mt4TG@CLofIkx{(^l^BevIF0mRCF)eW0JnMI
zYZD;*AYQ$Zam0_z&s`vso>llDE-dfjO=x3VG>j9x`CRr{zP=}OsvFtcJJ1dVbm|VY
zg_u9_DEQ-oL3e_n@}rqa#gC<?2^wSTUxKU}4^^a++<0j*n8V0rA5Zs8VOUsy*Gb6~
zt;p+7%;}R#UWQJyd=cB0GV@MSDBu^)o6_M|fAm#7lobivw1&8((9Fg$&wv?yra?A(
zuF_nbY~?X*%RY?wsues;_#Q23gpziB%D2w5bM?lm1~8_iv+2aX370OXtT`2)(ILF)
zq1P8TjC9Yhf)xiRIxNpz5)SrQVRt#u^3~~e)5zIdNlByK;9^?4SHk?1I>jIiI|iqH
zSD{LTB(2LU)dW#yE_Cx*%5#)+CM=G`n-uNr9!UP2SlR}JfRbnCgD2T`nCyN$k37Q<
zU6R-;mti3Hj7lOEOv5sN0Y)|SSZ@xuXLVt8`CL-1enmP7r-<WKOx<B4U_A9B<QsZG
zL{?Ozl&!u^a%aj}gB(J{{4R^}aDC^Ybf2Sx@r?8)Wkl9~&vo1S>c`W=iL|UZ+gB~c
z-|#)g;}hJl7$~ce%|XW}grurehgEOcE8lp{k4P~IpARs<?Oa|ZneVezCqhd#O%o6R
zwb|+@$3hlb7iRZjtfR~)QAoo`a7~X3J&YBfFlXc&V~$8;@~&?;QBAPi(AztV&OV><
z2}aCz8hyHZ{_F=8G6}eQ>Ye|lkGzFtCzkE4pVe7&m4^cmURzzOA5>zUHfh8)kd#47
z*Si#NJqqNOzS6PS?j<mb!yDr(?IE>wqEHKnf)^-zU<@2U(TFH`F!A0+){hR9^%D9l
zEDE%=A5BEdZb(<t#u6IBFnI=b!-KMfc6sI%ZGM>7NA_#$S@UUo$vv=V_mDQGHK!+|
znt6el>$-f7c)j&7*5i8h?d3Vgyc{%I)XHSKtm&K(66e?2C8GHBI|~hjR|XlvYFZz4
zOX*eK)BMJJ-+7}M$uCV1{UIEj<fMy;#I^kOOIPDj)zS19VZG?IQ6C&hOrss>);swq
zmUX=*yZ{eOLA-eTHtP=b9VY^-wcN_{(-?hSS*)2~@rsV2$;*f&&C(&}4=-NWO3f4|
zv|QFUWNvG?R#+Fa2R=O?Vg@%$)}dw~1$0r4N|?<&wlD9w-2xv#z!4N?ao0d5y0``y
zyH5{>RlO6G4kUrXRoso`HFNqxFi?b~zxWQ%{c`cAfueo%=bwO_tOv>sgMrUCZ3;aR
zJHHg`jQSf`kffBtnU>gBtXrtkQRZ$r*puS=CVlnEe`okFm;Qg1CF6@`s1%tJv<|GS
zhx9kWts5d3Ah@Ba@5qQJb}t^ER}Qd6SLBqT_~!oOGW0oS`Rc7Cc$VV!p$*QE{_rWm
zv`L}nJnvG9VV#W7J9D^zNz|^b-0$PfxY`|WmTlEX-n_30dLvFUC(7Gij0W39>i{#P
zJkprbHqy6rYtxqY@JKo>gsu|8n^>S7yUp|r^}{Svs$KLZ;hIcL)Q5pk5g_(b`EsBC
zqRraKYE`4K(rJ!WqjbuVE>ZO623eL+M!M6=8O2Cuy=(m~UEM)06+JYWvo^pLHuKJF
z|KVajJUxrZ4675nW+b=OihVp6E6pVnn6}cjvKdxcXqjqdSGFK3&zap;fa|Xa<Gn9?
z@Wmvsg9&Eqk!8Yb-)?^kb(iojbG^v$esi#W>3OFG8dqmg*@IuKiK`;A`WxEa2pCE5
zdx%<T!UHZf;x1;}t!!5InA(S}zr^HNb85-uc5zm2qkb&sd+(0kVNO!cnL{4TKY20F
ztw9buy6OKkfrxGObqpbA`G+h@e?fo7DOS%%=|xt_HA%NAdD9CXn#ZC8f;|-iovv}=
zOVF2nw{K)dHZ^%Lv^z)4^;U$!-baM4g)hZ)ir*B*RD5^wmRw1^p*=9X;(7njA2DJ*
zBCE-m&})U45+;5}>8i5pT2NGEnDU6MBqmFjEZ^C4hXQ`r$VNcDg@)e{lWUMe7Bf=s
z**6SfYh3+V8B;Y~-Npi%$5S(IxZ$MXo@=Vyw<gcW8;5r1r3a6DyOPeVCKQqexhhjF
zkRYX0qdYo84{q2RzLze$&&pOd5EuoKJfLK!$pdw|vC{~rSFj88nMg_=+22q#!@Vw+
zV!62vp-n)3aNDw>CCjpCiRw<8hD6luik4O*<#DpWKelIoqx|_9^P=kTZo~~Aqg@|*
z9yVD_Tt73(Mhn%uP5xDk#9Xgulcom9bNX7_or`*PvGXGjmM35NvoFOySr6_DIQKc6
z4^&4>OSH+?)E{z0$lj}JpBN~2Uy0ZI{3<30bdyVYdctGfC^6g4cg2$1&U7ods8}_|
zd|)D1LKCWf+$aB-U<UF<9e$ro=7snw8C`Rz{f*GF7{YepnN_JvV732@Djf3O%IpK7
zNgutSqwjg5Q>_32iBcXBlkMJ$Y?v3Znx875qldRUtz5z^YjZTuOjHV+o%o0-6G-3O
zd=(3*0zde{d*D_yr8TRqU~9{hnlPv{ut>f+s3?s>`hX+VtgN;WW<-Ho{ZLLALi?gK
zdqKvqpa4;h_5`H*Bl04^1#d?4yMb!;C}t*n``p|dvW7LoH^fs5_f|pyC9WnWuI1*i
z;*AUQNdgt&3d?B0IqJa0^$g~eCo~bh4D>{g7m_}=xSk7kCRupn$4_KhAk0lcG7?<0
zDCps=<Kkl3ITlJLgLbZfyd$Iv9Gu)S_wak0bAjx4TB#c9uy><27WpvZa~vPrZ3%lO
zQ&z-6mMf1;n-rrLr}!8#??8`~H}>N*uNwxrBBtj%IRY9U?-GdE6--&H6K7$FroXXu
zL#=M3Yb>M=YT@suPsP5RL^E6cYJA*LFB*GR&E8gQ1-7lB@rroWL6+#zdl`Vz4I_HS
z1zE5Ciq%=uM0{cCqDP@HvKN0ER2@5)HCXigacirU9MU>vWN_pM0cHY`39HXF{&Jf!
z)ImI~5FrG$7o2kR8L&xK9yVa>M0Gdzx!ERHd9+~Z*49>1a&d}4kEZOETkRE~$3jlr
zTsfMut1Ukd8%8D3fS>m0((hFWZ!m(Og*`vfl|@9>;eAq%DsOLMYh>mv((bIw%sGUg
zhr^3F`e;Qn)(7fP?CS~J>O7fO$~smx;B&CT7swshJaX1!b#|IS;+jB1BmOw<<5K<M
zx-3&$_$EGY@G2Xj4LSAL>u&B_))g|omyr`YrWm-$eBC9>T7!zXBJSHkgA!kKPwGua
zrR?G3hNz{`t@YMiQ42CmW0jsDcw~A>P86NqqV}FGDvHhUm21ywKS2{o!hu)gDl8ZB
z?d|_0PHM`!WWzeCIq70k`p#)y*J|X^$5*yyfxC;Q!_xF58m~UZxedzEMGbVa-y5U#
z?DgW?0=?gAzL(R?tYjoeNbn9G@ILrF9-@J(G+FKx-yUlFq}$rN6wUY8Bf~79xm-(6
z7!#eBT?QfUZ^rmy6qdfbO4TPjqAioOxXoR@9``qQ*XgO1e&3m`;j?DPDbCD)eyQfa
znXCFJnaQ0t%>#$QMCE|yi<%l7ZLBAVX{gek><0lk%ONx_PkZW8urr}1WA*?84bOZ>
zZVoy8$S-25&$dtHVuubW`ir&%iz7F`=zX!zvfhL&umsaUgCsy2?xe};DH4=zRPbbU
z`@DM6q3{)_PH#EGE4Xlfk5-D0+9im#&o96o)#SLt%hkck6T}MAR}jrK*|7J<9VW+|
zXxtVNQ_7KbtElHIO*xBLyEjrsR_2MY=eq<BLnNF8kn@A^V0cy}$+$tTPR%d6r}g~}
zM~?!HUZ2$@Pkgj>_^^mKDH~ZwL<GO)Abw*lhBarC_&}e`vv+31wBdD)jt5`i6VS}`
z5N+xy+US1h3M)`eU^_B^wtfe1GYuPxP>(<+pyRAX`$ly&Ub_hdm=OU1{`|uJVyMZD
z!QY_FiGUztd6DGIJdJo$2rL6$dA{YcL1lD*FEX=_qc8Ho5TQ`@B2HrjN&B%iuaE6w
z@cwfg@6=b3tFOajq6uSDBc*lVVp5kLqNN4Am|xJI(*8QW-p@O+9RcZI#&&YxRDz2|
zTGiDRr9N^$Jho1su6LPJwc;=k=d7)cWYj^(^oEcYd|GUH%%0^UY^>`(ajtGp<nFmP
zJ=bdcdB722uaXTp+QUSQiOWps1AEJoUrcn1f2;HNxb|ecSe?$~iPRzIC@QHDTvpAz
z8LnfmmPjFgCdDStcfIul-`Zel`q}nTnd;QcuT>0jU|NQ}C_a^3b*-q4e+>@H9xqx>
zIzfv;t;*mCITw<yQ)j8!(2a|0-E!;$G{uw2@4J^Xm@kCemO?FZMtXv~_F!+lDkSqk
z1yh+c`d+OOCZS2%+?vI<*n?ABgXfcWYL!3a2RLU|EJp2EvT&c87{0{az~Xooq|Pr<
z9QEFxvxq<h$X!qODC9pHj`7%#$R)YG+h<kbWs2qUmmvZiq3GdY?yAg%jak0s_o*GX
z8V#rJVR?cCHEpf%@PUoTWo$JdgckaMF=wAgItS?1P=?0goNJ5VDlOtk^$$<WQ{>X=
z#*E%4C{wl4vg$Hk1_~hzS&s2UaLGaLK$TS_LSlTPzqN8!i8@!f!lMS$!TFk24$N19
zdsSJ?v+#*HMb<j-tF)00SnK+%HP~`12Dr1@x?ej#S}ctsgw^|YVm+eQJrtnpS##SP
zDVUKenA=*wK6)7Jc-D+FrS&YQ&A9s2O6*gNnt<VIL$86<(#HybTrA#}<$%q>R(BxF
z={t}GP<We6YtmSlJwJ|YbotT2ak@v&BFZA6pxwcoZ5uOJ)r&k|x5Vq9)C;EB)~B*B
z=<xI+V<{f38@qXSJ`*lY8JeiGe5sm0^H5RL<l{8IFzbGZo6yvaR)xhtql#W{h+iB3
z2aX|q3AXjq&wveGPG)*XlZJw$Y5HQDn%&Hd=C^3+Gz{49af$O9>lz8DVQy6w7f7Nq
zeD?jfuVui!U8dZDeoV{)w3V#XdV`_ncc80Npz%Jv{fVo7qKJB&TYgW})g@>L&u<zT
z9sjc#|DZ=}i5nCfjnU-|i}cn0@e5lqx2ew!rl!8t3*x9mQ?`Vx{clb;>QibM?Hs~)
zhwMTN!(;pWCgJk)n!56U{FM`YeMxW!B9P87oWC&d_0~HLlY2CJDo696&&?XwD<*2$
zaHrRkjej2Em+B~$81$;LPp4xvD|ux9Oi6I#5|(?UCpAIneW~yv9>bgiqRpFK&!}5C
zpxoOW13r4~9i@EV-o68!L)f6K@gGRPo(I_SU?E8^hg6{*ls(NSig|7<^He~M-khDi
z(HE<iQ%Rt|@xsh3&yu&EZlR%AAy@m0rLo)F_mmGr?U@`w93Wg@b|KV#=r732Or26(
zAu0ixGEfX%+1??>x224o8K+LzvB}llu<}Q;a~|waJ6pnx|5&hPU!bq88=-ymeWoS}
zN2iERa_=?EacBF-k~X5QYLDXPvK_G#^mHf`D5Z7`p8-Wyzc?Tz?{2=RS2uJz7eyV-
zCZ3$msVlcN^ZROJ&+HNQ<<k=)S<t>YEk?(O)U$%`H^L*T-%6Jo!ovCn_=?a3qP#22
zA}^+2kWHIRihe{vD!V4n1nTxZcc6ncgBv{xlQHlXk=X4G(2Nhu&9ih0ZaKpu{{op`
zkoPW>rmAmtB>1>)i&o~~hc8RWubWoa4R2A}hQY#o^2T)RREk*mKqMt7*olj?ZfO7T
ziCK5|zGpbh{OvECkNSnEJWGee8?F%*GCRi7Dw6jTO*Umrom`aOKdAS_gV5#R_K&-H
zTyD^E<g%<LIF;NX+vPGWAAi&*WiVDU=$5q9N+Gx|t<pZcEG+yJN-|%3U(LPn$eOd%
zxYDX^RN5m+uUyol3RiHN4fE|XhxK=Y^$UMf?TJC7pg<v8Ickz-wNe!>MKVz1GyE-}
z5~ihPdp0%AM&?iCDUAJlcja(INsU_pZ>ERPTxS`f88-5;TGD&gF$~Co1E->-b1J&=
zHU(A@x3~VavVy#FonX)%sCss;QUPOdH|{IEp^M2Vne3LVNYpPPwDl`t#6iKB&FI|N
zk3QDhN@a{@CCJMn48II}W7onIM4}TtJwM9a0wNS8v@&1R_E%7P8RL?m#fHXBSy7Z`
zX!NcV)4A(8$7+typNJL@1}38q*|bcamG)b~rhNR3L`&wq990x*j#~5pBKSS0x~?Ze
z$3SD_Fz>bfuF|gko}R(A*q)d*#H|flV>dqysTd8nz~5^AS(q|^;hi-xsoG>)1JhTX
z7h|&;<2XN*E3e6Bse*C3%9Lw4QgI&ONDB;djJ&;YGouJv{Z61UE>;m^ro`|;le4?G
z{ecM$RiaZhAEQaYC|T+Mg;|VlOCr>(sv}j%`jA0y-r3#g6sxiiuJKcH@R3A8>r_pz
zHYp$6fiN$4N83Devh#GT2_|u^SvGWwTf+;RR%V-C>XKGC@L$%y?o$3m14VyPd+AS~
zS~?ChC8{AleQtTJXEvj6Y|5XCSvZFW&ILbql{v4Wh<5HX-%ZEjZgVMCuz!;`6Jhaa
zhrvwmZFK9qxhx2|A_}E_H>e<f*XI|&zuJ?nF>d}XQF1HZEBv4YRyK-j!OcBhK1CBQ
z9p0ri#%ceo@aUFJ(LR45HBsmc1ZSs&wL^#Nt`$y42-_!FYHQJ54H@Vu83?-?EdEUO
z?-iyPN};J^eZ`xXobcJMGR3UQHz5oIXaCz5$mOMOi8Ln1VsgXEBC?iyZzr0F#6E<?
z-SpU1hZAGKABOII8jRhCAA{~)a(~XUA!||m$}xNHJ*kosqw!aGS=w(U#CYE4tD~dh
zQSQ_4AIf!d+EAY_2L*a87mC2pHCB~X#|=^=J~{3Sw~t9eVe$7gbPhKJ2|XzXt!O6G
z%W#x)zz0<6l+k2jo~Xb?XG+04HkNWd4&>yAN%b3Bf{EJ&os}Spup9{6uIh<GM5JeC
zH6te&N<LK^M;4;sz)(qxx6TfgAn|N*zd)ixY8!a8DDh>aqhl5DgSxjlo!kB9Hs*7r
zfkNyrV`2$OH>Vw4hgv;ZN|N%X2JFvT^SehD<sD#Rmy^Ow<3Z@So!{9#2nBe)D@(Pk
ztG1{kwK;7OcqZh(G5qd<O?zBo^rAIrzJOC)t#fY*&CgesJ8n5B5v`AwI4vJ9P7`dQ
zxbr=Zn-CSI-xRJ&*{OC}d`C{?E1oVUzUV`%vbL=D`oR)hxtQ#7l8oC?u3-9Gje%p3
z&#Q^R+_qctnFHMfnY#J_9rHJRTD^pQ51CPyB^ePSMeVrKGO))1j5bcd2v#%FpX_}`
zbr<!tXXxUK67{us4@(>h%QRAP&`47q(-gJLmh?Dhb|5=DZw91SAbq>I@~?NuK6N5L
z;!){;0%|a8QXY7HqU^vQ(nMf+e4$T))dw!%NyQEM{K$0f!y?45!j6k3*0FXC)&WFd
z*NBj-m-ESPGO;Junh*S{p-eieFX4G1U;m447zPxWE-&Ny0)|@Bh2o`RA=UK3P@9h;
z5dl^u%r{?3UnzQhEh@spba)9jr2ipS30aHo^y9`yH;<e-?P)alH|8?^Apg9l1*`so
zr<<`h8Cg<k9%)Q(v>utNna^~Ckod3r#p*5LlA>C)naRn^hxgQNOv~%!Ywf6wHbN$$
z+8mUH9BZWh94&Bg_%61@vu#ks$ya+gSNof)I*I0*+E$Nh<4Iy^bQzW~Ve?w{J@)=g
zO}BRt=>v@t7F(}qaXXI`$lf9!)yJC|5&I*HAoG-}{2Ge<;t)qFU<Ds5{o*2jQ6c7U
zYp-9X|8vW#71+I%|Ep>G2Mbbx7Bl>37z~>e(0tDN)#>~a7kut#m67^0#g_V@8yOn+
zi^2bu;xP6)GJN_!Gu#i2oc<@UL01&$S#yDJJ!iqYr*jGzr;RvDtRDrth!ahkxO@?n
zjwW$exH;rj31^9PY+U%y*c2!&z|JFBS63BK<6=Gc1QPp)+FOqnq&<e^K41r0XnjN!
zil`nnJriQbTv0C`k`?>0Gjti6`DQ7}9#?ftdquoh$&;;k*xp=6;jr90Rqlb1CVmjh
zTD|~FWjHG%N^+cggQA{in@o+p;L6Uvys<-frm2chIfq{Pp5-@o6<03MlrZ7a(LvCD
z@k-hZR4&#O%Z|D#DR~V$ZY}S5ug1kUM8<$-I}FvD!?QB`BCE1jWwxAsY7Jve!)L*`
zVrexL^zrL^B-*P)3r@KFL@i|*7k0<M2F14~L$Qd^-eC%*bQ9cq$+K7Z-9!d+HS|a^
zUAi0util>uT1gvq&6Sbg0F{J}(K0vK(Ymi1OY9*(3uiYOi>m}ZcOz#EmDiEXYCTJ7
zXsECtCD7UPs)JWx#0io(g6^RZNhq$Z+SnBdu_0Ki&$z@l3|Z=<vEa<Vb8WQ|3QABB
z)elr87(4CK{@#4Je$u6B7Oe2q|6EnR`pZ|M&<!eEJRMr&h%X^DII#FlE0KJpAWNAQ
zTpKg)<nh!54QyTS^xhgR)~CBK_}OirKq9g>QCj7M7_B3(I~T}CUoF))j0x9nhH7QP
z5)t*bKY9NORg=^1@_j^KRS1a21XBq?zbOW_3nRO*HUG9AgR}Qc$C64F#<zp?sGuHJ
zE1T|xS<?GRc`^lpHm>c&D}_!<*}Y=6Sj!PBGf}hlBl)&&c~M?by?3;!fuQ9lJgil-
z^4@lna>pio&VoS^HU9Xq<|<i?@aYvjtu!Fq)IAJRQO4oiin{v9WA@oSX0Kd?wp8ii
z5-#exWg<8vVMY^8Pd5LY;mi>nfmI{3{Hpep)YNYY_EyLg43{@$D0Ts^5dM}=UQ7jj
zOYd%k9C<S2@hT&SKP5c1>Zr&J@<2qFR$`HUz!4QobOD0P8+DOa(4Nn!^gxzjq?X6+
zptbdN*jnODeei_RlpQc=PG4@=GUYR;bwgGn8TU)jA=C>BuHsYg_!KziHj#xG;Lrjh
z2I`(5;3@x07wP!<jgLNfatJycS}<OCaB<Uk2P#d!&BRyBd-L8ulp%}#b0`DoAFo1U
zm(!-C+fuLxeWHzxW!&>?xtXwyhy0|eAWt<<g6GiL(MIvC%LS#`$|Kv2z4;3FcsCOo
z{z1nWMWK)s&!~4N5wvp=5?4Y-ucC$bD5*@evMg8W%6!q7(9b#*k$Cjk2)3LJZUgPs
zbfS;4VtVW!d$3S5Nz*cCNNWlPVnqzZ6B$0~N_jF_r6&P7gOc$MuX{7oI_NdF*%r?#
zuEpUP#(Tj8bgzZhxhyvT30GBh59r#w#w<@JL0ATB+6}I2K~!?-^|}Y?N)HeH5oVIL
znNG-B;Htzmt-q8ND6a2zCcZz|=R2(F$D>tIW4jzL+vQ>A;g6CVp&B*DRM7!~9IB`v
zYpu#Lsfk<(sbndWuNHy}YzWRK19sV~f=p{7qCU_&3i4xih)OZyoL~h<vm<<p2(eji
z=oTw?lY_Y?uX&Rv7bM)pH&gA`wLtD^`g*xe*c4X8xl27+AwYk2R?Y+I%xwN}ij;SY
zoR))gk2&~t76+xr8xn`5)feuWa(vM<Nx52dQ=Dh91=52svTIHaCei!4H1YNyr8(P#
z=MVg=m_7=g&C^$6i6qq6Wi=S`tbgmn7GryoiLvErQLLNTHq+6u{;fNK(FUBSZSBU%
z(pJ$*OO4(hw(dtAXD8~^Ee&zKsWrqvY1GSQ{c4msTl3M;#f`3v-&DDrk!+f<WZJdT
zh>%f;$oCaFdW?Is<cDRuHJCJ>khF!DTIbzmg-<)4#G}a(E~LD-SCK_W>H8PWT%Q5L
z4u<0!=TiM1k*s8q^}xPXM@L8DPE~BH%n(1>FnIg9&RW$<*d^Z#vh}a0U+2ypS|44q
z&^;LBjVbG8_H~|IcM<ly+W4}3R2}17l>MF$`x3VI&9t4_BRbhkOJB!Y&@g+<yZ2<l
zef;#P<iv-URbNIA?4gsGdCHr0er%=>Xh((m9$#8RbwH3>_#l3?o)(^90{_#n2thL9
zqg}(Y%EQ~i5R5r4;d1#6WHmF(PzFUR+C10wvNWzIWbg|t<<}^+RgrEnc6+u9Xdh^+
zVxAr|i=WAUs=nzL?<C9wIbqV)9r*-Xp395O#bg&e8+mTK4v9+0&UzVV*X4qGDMc65
zwYtvVR(%+FR9)*q?Z2>N^HrqVTV><o!`}YWF3x^VPBdS?CrGhfZhiDO)HD5QTxH`W
zY%~cABWG4UHg!F*e4#I;G{wfBnk?i;qd1`9<UVd8LjaCBydL0Pk+(@&yMAg#a)~WY
zTh1QcO<+tNyLqmHgNFl)<A7)_(5RXzZei;}w?S1q_wrKl89YDGu`}n9Y^w-Fb~nzc
zy%lQZstIJ4svoQn&+{%|ps!CDSP$aI$P$R<*m&BB5GqaL+~5@dVoEQ}0Mpu2a9hLE
z_G@^JdYN7aUD0G5{2fR({*n1{lBt{F@KS<uv!i_+j3u12+{E&j7n4b;u7|6Gu9l1k
zeG=s?YB`dCiJvc)zMyNt8I<k&et2)96LYjky#ih}q>ENTIEX(WlfjI+&G*StkQgKU
z`t$`Uy+39I&)T*(@4I^45tgx$mf#-j1X(SAOlc>4xy>8})i@czY&dJio}tNm3^XN*
zl(!Fle^^tWY{1a}@*!<rA3Vv^fb~~qzJg)t54IEhH~Z71-`MzBA4$Q-%9?Q$eZt0<
z7no{|{0@|+=lO^1iMIo^%E}SN?VZgW-6x~)LP%jBs+mQ{f5T3kug#bEqzT*0Bq{=@
z&xdP0(w0+_!4tJdSp0Br=8-`enqD#6d(`yC8>%fNuTY@IG*(iqGM-!cw4r>w_<&Rh
z7f!#oJb-XUxFsAFqDqq{x(9k4eUT}bJh-toAk1W6(;vDrqG^5^iHj{5Y&#II%Q)AP
z*8{IM!1uCpym-b&Ci<;YENz*viu4o`W+WVAD?BWsB;5A^-LHv(tRrnNt%~*@?r&2{
zMcS(DpF4z1Po6^_9HrLHC_9sQ-GKzYMGRp~8EntIj<LpBPgXgSJj-WoeA_}Iybbc;
zY)xlI<l7@<$iN8wgR&>X4>1VrnAndQrCa#P_=`fQm@sfELDvv!ub*E8?3Y4&0k|0}
zu@hW<jg``io1@ZO$AHVPkB~fm57_FhH|#vc??49X;C^-1(vsU?<#F!qQ-g{{r4<am
zUG*Wyaygc%>B38E#pk9WezUEj=5M|S4L$kXxPWXA^e`%f2W-?R?2lM(D;rot_iCc{
zW{q^c$1jn@yc~l_Xr@2m->zKHt0s)>d$=^nR$0E@x@lvM{4#jd=~a==lW59R7r?6%
zmndK?6v`Cv_3J3E>}XR@sb0_W<XFF3;sE$j_X>p8@ZkYfwZ}J(hJG<F!gG@~{FCvz
zi7E`t!PS>z39Wml8V1yRt9<M-Zm6>yF^Xs8I!q{Vc7{$`0o6-bPtx3NZP#mS6Zj27
z(0XXY@s*$S(58XlQpe)gAlBMh<QP#e1glPJl5+zNc$h-8Um3rSgd>qI3=FeRUR^^=
zL$fnVo@$JRu$btKX{a>K+pJ)S4lZB`UvhLko-WF?ke;Kn{~DdU@uEnMlB}KY%#9$C
z*I~YuZoFi%QX&@i$c{*_S3oyX+H*V<@|A=8mJ>}!Pf4xe%lEaf6U15@<L163Z@;48
zB;B-3Gj4oL`O?l6t@*I@$>G@Kq$vIf{WyHUi`ZU*dK{Uux7jdWC5WR9!iL7aJPe;h
zLI3KtQQEu;IfgcY&%)Kziw(eC>zlWL-0cw-6id!!;VDZ|1^!VOV`)hNdC&xGR|I58
zfJwBH8|xC;06fV6PJO>xo760YrxpwR7WAK7$`jx<ggo$MW%?CLDbtb0jgR{zw6^tT
z;j1c8gNuF$?6=Y%0dGBOEbTBjx?DB5T17hce2xj(%%V6wwYcecJ>EZe5&&%iMEpZR
zjpsrpLRxV)TGRzl-?wDRe&0ag5xEp3m%!}x1GO@s*1o)3j)Hd><6|Ix*OdF!;B^OD
zW`5c2-rSjEXJYIAgzVFlWLe&um~_U&*${y!zuLVLVQ*k7Eb>`g!JJjKpwo^c%8IR$
z>VqfwWthY-!r{Yp-#_>24sXv#fWw|s*8RE|vR>ZYs8NwBTb=9?IivLgA$h~YNX__D
z^|JrI;UGI_VYHhJeOPHG`wRxLfQ$4Ppf{%eOhfZDDJD)Ow5ISm^9@ZeWCnaMV0;C8
znZ%@k0aYihuZ<w4T4pr~?6dwoco8Ifuh2`@Ug5yd!27xr<AIc={;dmU;FpEh1{OA|
zZ|DlxQ8>e)rX5@-3rN!+cUHcC7h9tOc0%iZf;y>t{~{HPU5;Enp$vtz|Eehd<G9R!
zZlpYOD(*m(ERxW#_xk`9JPbmcSC2cJPdl+TPCk&W|DH!qq)1n!>sF7?bGg{#K5axN
zJu&HYW8g#(SdyoN(rEFCPy!aPP;7%K=M%<<Gam|hGN}@(F}A?`1i6tm&vz<XXk672
z!LKUnX8L>4Okt{AJJX0C&hRGXY+qGp8*~3~sSdT&=Cz1W)4(hVe|uBlX4}09k7($|
zkVBI$ia9cY6oe&;+>xDKL`5O`q{=lGQLkk^K1Gao$u-=cD~Y9%%@)3T5=U=-ZobXa
zK5a$CFZX@R#8RyqDk#DiM&kCnqM~!16i9WHd+K$eMvY&V>6?&!6epB<=3*vH(5iE^
zNZDku?!TezzjOG1x6+p+zvTrC568cnfBoaQ|1cjb#(;xL5G<bdQf$&$Oa%GefvC_9
zuGX=RV^iI5`L;fXmP>>(WWfFh7pmaUjc*m!)fvzX6X#j?c?_uM5OAbml29yVvcTq_
zd3ia%1>N5bVM%gbN?J5{ay<PQfAmGrw@`*0%708K|HXT_<X_E06`=kUiRq`uKzrJ_
zpbE<=8n8Y=e`NXbKV^WsC9a`$k~eEbS3jE$)yNg|TRdfT*?-e;{ch-BWd6BpI90HK
zKG6=oeIp07Lz5xR_~5S12=I?^ih*r*p}xN{MT6__Vb6mp0FU-RBH>?o=B%-Jbm;+v
zO=8#5j|<g*cCerJRe<JnG{FA<QxJagq4DY3#7H-9*_wa67aM%$IQM+<bLiuqf4i;y
z*O>7C)i_W?L4pK8<b(eok?=1(!?eDJim{3P*aW<Bhnn@zrH?U@UU4Zr6~aG~0rj8t
zsp5wuaPlfT@ch;(__F7|nsK5mr9~x$_X6fWxDd$xnSA^h=SjbWv8FiPqlfz2^xmie
zf}X|$1U>9vzO0r5*56}e4F%nS-(Ajjo}`f!p6Y`?BH~|o_Gg}0g*%AB5VZ{QHr7N%
zZq8e#3JB2DKj&OOPoEEi-m+aNpCySk5ZqoF9A<G6Ken&zxt(f00M6S4Qdq@Zmw^|v
zf!%7LpwN^(PO$55=Y?fvOrg65=iA_KzEpn*Cj;3sziE{I+!)wWAP>d!&QaR$xC8kl
z-Y~%a^9g>I<AI?!j`ZP%)vWMvO0h~TFBw=iD0^DgRwr|m@=M}=T0{lANA|-~_@;jt
zZ2nOI`VY_WT>j}wmA?FE0c9LqW8F5=tv6shIP`d&e+dTwM4kiE_#a6W63@>jF%LLQ
zsRkU@)E$Dp9jE(ysV_6-R;~HgS?mh;rAY5no}r6RY|H*64I;*nAwJ%T4Tj9X=n(p+
z=9jA`4VaFD{G={J;%fH0)MK_IC`se$?zzBQkX}16hfP+$w3y`%GM%&Gw5+agR7omL
zmmdwhOg5MDs3D4MD}yZ&E;7Zu<=+rm#GRWN%11s4P9q^{c%#rK7?iZmzC<a~@?p~v
zE^u>0h{Z;fBv|WO>B?n2eWtjn&-n~ErZwy}rTUeGaN(u|YhciUL%1HlXwhb#wrx-2
z%R&?K@(Khfp3UF(ZZ^}$bi!bbR1w(+&S~&&BaCN3pZ1UjJ)KjgCDAO1<?a6Z(m7_3
z)6up{MDm(m;Rts@s4b7DdQbQ>@`~I%w(A$Y>qO63IjS#HYID4=A68>)>l!GL2-x(r
zLl9|T-da(RPlfvk6uh|bSs((slX7)$7&L_+qHA;q`t`=cxIM^?SLx7*$gtJRz%TNW
z6B$2I?#sF4tyq}TY~xEKN|Oz5=ACm0G`5rLw&RUCCSjk`?O8>eHF3HFnfZTPkn(-J
z$3`0m+rH}RNbJiMsf16fjb9{YI!oKNTT`K*BfGwS3{))VZ;wry;o=5mi%K$&6vm-c
zym8Z#m~QDD`h4$i=M3|4P6x%w1iC@~v+WLjD@3p5jHcbl6^)Yxq!$XbBt1gnY3QO^
z72!zpO=ONp1&dF|{et@%Dp!n1hX)7^9i-QcHPZZ_giAX#Ga*cd5@tw5cgEzKJLP4-
z_RDju*3ri8$bBX>t^p4CM*tgIkz+mws=Z(b!DYbua-QgfCD~VXv$E>DR5wGGSqo5U
z#PL#mUU0&=whHif$`yO|kGv`=wmbFMf6H{%w<t&#(q{y(+{tH(&H;fu=_cw_u=>u0
z0c<>c6AW#Q1#gX&RQ#l$x<K~SeU5b-Kzj!o&et>lDY{AiU+bPUJp-F6oCQ<#w9$S$
z>^J1GBS#l@+#?c9c=fUGAL{hsV!H>xzKZXyNKmvcU{jaOncF+?mSMmh2muh+u;N}u
zUG)Fk5QbVp@bm%|@Tw($tQ&$TC~MTOFm>K5JFo-!VWZ?7ND`jnf{g;$!t~1zY8XB*
z83Da}_h4ucve==%*hRhAFT?GCMtB=^@CfS`{Q-EX5!fdN{(11+=P<trqs&FgA`Izk
zmB{Umh9?CH3;Hl-uWnaw7bogJ{<9c2d5*mEe}4q`QW(;KP~XLrF{OzA4*Cda&xBUK
zT(qeJjtGZ<4=QA4_Q9Jg2G_eIM8IjV-*1Nh_7a2pGh+YWJpCo}W=c$3v1)X*i&da0
z*e;JpZ})v3lIkM~DargvqyOu1!`$^6&9b^S`peLm>YiIMJ?2966E{P`@ZAgFBpTA5
zDY}jj)N=WO@l5EgRE@tSZAd1wsTR6L&>U~H30b7Lh~Nm(vumA(n#oV29R=dAc6}EV
z%kf{O*EgsdGW&=(N!fPof0-c-(`iU-4^~JRXI@e_j8!auSo<xm3bU15X>moyw!kT4
zf4V^mmg7}lX?T_8&2%!2nH59Cy1A6`X#V4@WhZRsa0{XzT4&na*caa*Fm46hyb}o(
z9V9!6te<A&+HlZ=9jLjN)*MIUbkwh2m)T5Sy-!5`;Rw$zgVXu4vn&aVrFNgT`wcos
z@U&3g3f4g0JwGhOMD`=Z<0bP;lU#(^<Es})jC^5itA~3D8PwIsxre8ndA(}Yz#vVS
zq51xZm`T3@xx63s`{|E9>x&4Pr{q4$<cH~bRXH7~D0A43^g#w5_sjmb?I@J3wjm0O
z4_Ol<+JrMZs>Bi(bMFGHJ9DkW83;iz;cBzRk2;U{nk@ssv$lc7U4w02l0F0hT~}Re
zhR3@MuqAceP3DQlvBJuW^B*3$PZhp>&_{*ZwjXN(M-z?GiUjX`HC7)HJj?CP_riS{
zBR4*Ftw%Vth5!pK!+ZG%;*Vn7#tcKjsMxtbg7!nBx=!IploN*1A5$FOsR$V!+aDR;
zFtm_7B)7xjOc|}x$5WR}j;o>ZU2kvyt~>_<ZoV)B86pE5TWhplNs6<`>FT_q-KH;x
z2k+Y;jgTiAuC3o7GV~E0A0CR(N!nN;yl26$e<d9&C)*>&Rp%;vRe^gkHiq5?z9e71
z1AQ?~zv5vk`l&Rg@d$WXfJoaN$goH3#9Bk^?|E=e&HvuofI1m8p69kD@!CYC=EWy<
z1~UAYF3@HASS8xilMcIIN{&D(1Guek0&KVF#6!SQStxbXg$y0w2m^rNycy^ox2vz?
zl^{~w(8S*RSfDa^e^7UY0oaM*WN<~ulMWoJy^;FOx&8Wx;xH1}t|5sC)C<8t`Q#n&
z_5;Al{=>seD0UCvt0(Rc0w3YmNfE$d{rm(E{4-*Ib+JD``U6~b(Ni!Gm|ZApM1WfI
zg7RDM>~UWeaS=T70;Zgw1mhoTrp2wh|6B8*f~sFrfAV#p0>y~_drk7^|4cvU_gbev
zm5p-A+6S%}J{Lv*i^Zyc+%*9k2?)X;7miPNlK**`ZN$(m@$c2*67#<`8^)-<093sD
z8T)_d^M5O`|5$zf`ToC^*#C3e&rgE?-%9NNrN#K)O6;FhWdB=<{nH-lpH*W2C-+3R
z3zO?GO(a4ZvnI-I=MW_#x?-PfVR;Tir|&?yM8LVI6N($Bw_GZreZM@3+DpH3Ob1?q
zB7O(zVw{uC#!tKjT&W@#5Q%MxU93~gik+;A-9mwSN2Ia?4?|J&&p%-J1y-0}zLeP=
z=+zx)G#ogdc7+8MkU1N=<sSlKv<%?w$M1D9o-wgqTR>BRbB4{|!AHGf)!^+;@bxXy
z9f<VvlC`oH_~+?<L4*MAPf=&6C4R4N@XKuApAnI28T(ug98>!He3?HZ!ixAmmvExV
zpZij(a{>u+Ii`@C>AnI2bxIG%QXx6Am*;s*e808(5&x*u^=kvKB4>^#e!e|teqBz5
z2Z1)i;bpZGQSf;nPi@lZpRJHy&ws_^uZr|PNiR}>OzfZRzB#d#RI&NWyE7xiDA|YB
znVl01ik1;;EEPDC!*E$uS3zdiiI(xvj~=}G{rxf4**dj%pcjj0|4)189u3vn$MG$M
z+)82SGBP7_%YBHF+#}<b+qh-MLBkY6QcdPKC?ZpC73EfV(YOvdZfWEe2c^smBjr*;
z9HfSE_GztCrj^!NXT9$~@B99@_iwFvo@YPL?^%2A-{-r(1C~mSZxmR!{K*qRaP~KO
zi|BDzif?>jx{s%Y6fW|-X&vDB?*mx>2}0)OGK35q$#B_=>9lUf!47RG91oY}tXWvx
zMTnHFI971iH~pA{qQ7D1iL?0!D5hUX-ueXYbA|CQewX+a_I);-`U?c+d|`c`4X3{H
zyD!kt`cFrzuYB;}SK9ZvSo!@9yw|^)O5bl^xqf(F0`&l0fg4zL0S$|1rxjvA<Hj+N
zmEA|3T*<t#^?=Yi`C?808Fb{|hJ}`l*>Ule)A-kwf?p0RI0P|g2obGHN>9q^6n<pY
zScH?_o9smFW*e=l5m)Kk$t1`v0i5K5g>9dmO#+nh<fNWRI0-2<I9t_kd&tv%)Hz0K
zVWA0tkg&l66RC)!A%axnAei%l1b5P<BL$$swq3b}Zf0FNC#jxbVJAIXWao4<s?yX?
z3hfKKrRHW;o+csM*yy2}#nGiE!^4S18?v@kUjT1{(C4=Um`G~<AhQASWNx{b78;I!
z%d+%u(P1()#aQBf#aX4X;l2F2={T6Wep)9cG^nVP&s*qNi&dCO6wy(GH_zvlE~;U3
zN!s1+52@-d*)lJ%$!EyZYKDnP!YMBT9^Jaf8Q79b&3%Ppbyb!9{>X-+)bTOvh+_QP
zJOhY7<VDqyVf6M(6tM^L&J2wn_aT0~nt4k1+1M0Qc<reyn#`@2Y57Wx5Z8m}rS~ov
zHK5|sFw{%(MlT&gOcW!lTQ_w+9)*RP1vFm<T6-3lZ<Jxti!>Ev{*ZH1;F$85@9XsI
z{+t|KfueM)k>=^)X%+I7-hER>M1HO6^0LhLC>letOe$`BP8#<kWQxs2R}4Z=V9Gel
zrFrpandOC!2+g;c1a}X_DZTRyhL-Mo9ldc~*5+DHuB)1(zaRGB)8`f6Uh7G|Do6eK
z<S|~A$BOvas*L~~FM`C8Z3g}7kJ9l!sTz()bGe#%#p-g*kwSC{Ge8jkd?9(4DpuEz
zMe_;p4i;S^K~L22Z3OEDmd<(9&;qVsKAP(*A0{52z)H$e`xnOs&ULiCA{#m0ZZ}eC
z?S)12zVPfq$~R5{@jn&#)r)5+jz!SgvY*P-F;8?0JoJf1${dHQ-*KR4RnI*vS(e*w
z{~ITKHrLd=tnL?o8=MP9eUQN$U}(gIC^n%2z4(yVamUats&0D9y-hn3w?6F5ipLpX
z;HS0Wm<W*rlLy^)nN$+AL(ZG<We?trO4|9F9z;uicCCc>;gve^6GZu`j9f7>t;NuS
zQ5vnK)F@r{M1G@$UMA03;09@a=HvFt?oXrG<xH}IuoY-NS?dZ48yp(iCOETeRsolW
zg(v#+Tdbcx*PnD`)!btd<Rt-0Epf)Wf2?<E<}S$s>szwRS44|w2s6vN5aPW_FB{24
zY)<<5LGe&d2?{IeMnutEyEXIrj>O3(^I^^$Zgu*X+La=PoFHLX<j|1jzWJ=M{dC%p
z>kBvTIch|}%?vd&2ce?e4dy%&656m}47taD3OA)J<!BhdMarITJr0A_s_H0Ga(DuD
z;H5gU8XR#2XQ)HX7G=*YLwg2Xsr*fgwUlV*&G}wQrqRE{fp~(w_w|iB+Lik*$;R2$
zM!jj62u&pov;~jHms^(lQ`5!;<phZ;DhBA}E#1SleDf83DRZA72ODpktG6#K)-%i9
z^NLK!OIxlMBtq0?UDPHV%Fo|FeNDL1z4`1CEGDj<$^#AippdzoX$sNUaNQlA>1Nft
z<t|vY92|P$v$H!>t$0&MLl8Q?!bq8~wN1uqThmL11a*n<QE5cWr>hEK9T!om5qt5@
zqmIbYh8giu?r6i{$BN|lQ%kdOM9{YAhyByod})iSt71tQ!MSiOp~d!fd42Du5>CnI
zy%qMop}ApXB8>uxrVcrJDD$?c6p9-719!v~8-;$YIwapQvIi+5DC1ex3i?0~#!kbz
z4aF}@>xV;lQs}~MQb02Btb8`3m=Wt}Y3IZ2NH4Y#d8gU_E9!&9?#Hb$9sXJ)R(6rq
zuWTocEjmVTplHn}$4u3oXY96`MQy{`KNv3Dp};K@&Z9(pZfv1Dc0+;IbaKpGZD7Vm
zr1f<wZksNq{Fb^XcQq&fMFEtDBvLDV=U~^h#jx74gmGjPJsP3-u7Gs48kuQ!NH+ia
z)_4`?qGca!*obJ~wgJ}M7}nmXRxs$k*h-68;N0#xnqc*{>%%zh-{P86wz&8%E`_=6
zwb|`MwJ6NDh9;OCgT|km&0=k_b(tveIoD?#aYkvmZ4c_eTWRMV#Hoid{wcxHUU$gA
z@l(K=2>aWp9;FbSqWTu)9CLJRJ6zY<piRm%$m#&eicenSZOP5!VySslzxV1DS|m7c
zmw{JdmPug3DfwrdD(ml@$)ISkqAB-X{nGcOKaRrpSAk9jC}*x>Fb{-@Hcx`~#|Ti?
zS4?JgALYx831nq8OeM17G;M39d?*i2zdYWzZ0?P{Qjf0K7(j7^@JOMrO=hajB&~p7
zW!e=dvH<*|y_3+$WspITK`+>l(p8{QnAM&L8XSMh@W;RBTm{NNH<jw_YW&(z4inG1
zhk`BxtH8T_lIyfw33P3Q1rD*GAAC>)^qKOC;-DBmhApJOwy!wuuK)V}bMl)D>EV9p
z0z*F$%+>ySwEB)Py7q8jqWgIrj~`4deSPlU{DT?gs9DJX4aFf+t3VUzC_XZ=wwaKa
zl{Jfx2cMmuPNG+Vi_n#1G0tG7?j!wq74Vgv0J;)Wdf3~U6kdOoH;%K*7joEJ>W40_
z0xMQk`b!+3LypbbAvg(kvx^qK5keH{uRlZEZ?lORzEM9o;X!wvh5ewv@i15i@HS-|
zf+vDq=WsOl4Z;EOJT*17Ekv`uCAVmo69)o)<uQ|y7u@ipcJ}LbxP^|q8I5xx6JQsU
z;&#&P1%xc-PU-01d1K9{mH5$`@&3cL7Wjw1``^itonqH=2b~!1?(QBkPoFDD5=r5n
zT!RS+=*)%WVpn~(q+rWS<*;pz!fPY!n}t7vA_@Z9wHpY^mM6x9@j&BKs{mW@n<T6O
xzxeq75Nhb`w>I{9bpDi(a}STf;y$fZE{uYIAZH&%`M~!<hdDI3Hy5@#@CReTuRs6*

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/LoginDialog.jpg b/src/site/resources/images/LoginDialog.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..9f4c2109b84545ab99dcd6805119633d57208265
GIT binary patch
literal 11293
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
J8v{d){V$88f2RNd

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/MonitoringScreen.jpg b/src/site/resources/images/MonitoringScreen.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..ba52f69664cd0a4f9f20132f84dbf5aa20382643
GIT binary patch
literal 65863
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/ToDisableMonitoring.jpg b/src/site/resources/images/ToDisableMonitoring.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..63c29f0d546886a127024034cac6a43217cd387e
GIT binary patch
literal 30606
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
aE9OVQD?P1335%SI+LZo2`5dX$-v0m$=;qG=

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/ToEnableMonitoring.jpg b/src/site/resources/images/ToEnableMonitoring.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..358e49b275e1dd110ffa2b3c4a24ceebc2239c2e
GIT binary patch
literal 30721
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/Unauthorized.jpg b/src/site/resources/images/Unauthorized.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..7757f4d3a965e148cb2ab69cc818d57fe218f60d
GIT binary patch
literal 5247
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

literal 0
HcmV?d00001

diff --git a/src/site/resources/images/UnknownHost.jpg b/src/site/resources/images/UnknownHost.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6b294e388c6756a95d5df531e633f55d86af0388
GIT binary patch
literal 6071
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
HNkjhu1U9`q

literal 0
HcmV?d00001

diff --git a/src/site/xdoc/soapmonitor-user-guide.xml b/src/site/xdoc/soapmonitor-user-guide.xml
new file mode 100644
index 000000000..88c168947
--- /dev/null
+++ b/src/site/xdoc/soapmonitor-user-guide.xml
@@ -0,0 +1,207 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>SOAPMonitor User's Guide</title>
+  </properties>
+  <body>
+
+<section name="Table of Contents">
+
+<macro name="toc"/>
+
+</section>
+
+<section name="Introduction">
+
+<p>Web service developers often have the need to see the SOAP messages being used to invoke web services along with the results of those messages. The goal of the SOAP Monitor utility is to provide a way for these developers to monitor the SOAP messages being used without requiring any special configuration or restarting of the server.</p>
+
+<subsection name="What is SOAPMonitor ?">
+
+<p>It's a utility what can be found in the org.apache.axis.utils package. It provides the monitoring capability described above to Web service developers.</p>
+
+</subsection>
+
+<subsection name="When should I use it ?">
+<p>It's a good opportunity for using this utility that you hope to monitor the SOAP messages for debugging. You can see all SOAP messages of what you want to monitor without any additional developments, special configurations or restarting of the application server.</p>
+<p><b>Please note that it doesn't display any protocol specific data such as HTTP protocol headers. If you need to do this, you should use the TCP Monitor (tcpmon). Please see the <a href="user-guide.html">Axis User's Guide</a> for details on tcpmon</b>.</p>
+
+</subsection>
+
+</section>
+
+<section name="Usage">
+
+<subsection name="Preparation">
+
+<ul>
+  <li><b>step 1:</b> Create an account for the administrator
+    <p>Open and edit the "webapps/axis/WEB-INF/users.lst".<br/>
+      The default account for administrator is "admin", set a password to anything you want.</p>
+    <p>ex.) Like as follows; -  i.e. "admin password".</p>
+    <source>user1 pass1
+user2
+user3 pass3
+admin password</source>
+  </li>
+
+  <li><b>step 2:</b> Setting CLASSPATH
+    <p>Before running this utility, you'll need to make sure that your CLASSPATH includes:</p>
+    <ul>
+      <li>axis.jar</li>
+      <li>jaxrpc.jar</li>
+      <li>saaj.jar</li>
+      <li>commons-logging.jar</li>
+      <li>commons-discovery.jar</li>
+      <li>activation.jar</li>
+      <li>mail.jar</li>
+      <li>A JAXP-1.1 compliant XML parser such as Xerces or Crimson</li>
+    </ul>
+  </li>
+  
+  <li><b>That's all.</b></li>
+</ul>
+
+</subsection>
+
+<subsection name="How to use it ?">
+
+<ul>
+  <li><b>step 0:</b> Make sure you have completed <a href="#prepare">the preparation phase.</a></li>
+
+  <li><b>step 1:</b> Start the SOAPMonitor application.
+    <p><code>% java org.apache.axis.utils.SOAPMonitor [-u admin] [-w password] [-l axisURL]</code></p>
+    <p>or</p>
+    <p><code>% javaw org.apache.axis.utils.SOAPMonitor [-u admin] [-w password] [-l axisURL]</code></p>
+  </li>
+
+  <li><b>step 2:</b> Login
+    <p>Try login with the account which you specified as an administrator.</p>
+    <p><img src="images/LoginDialog.jpg"/></p>
+  </li>
+
+  <li><b>step 3:</b> Please wait for a while.
+    <p><img src="images/DataLoading.jpg" width="400"/></p>
+  </li>
+
+  <li><b>step 4:</b> Administration screen will be displayed
+    <p><img src="images/InitialScreen.jpg"/></p>
+  </li>
+
+  <li><b>step 5-a:</b> To enable monitoring
+    <p>Click services to enable monitoring, then push "Turn On" button.</p>
+    <p><img src="images/ToEnableMonitoring.jpg"/></p>
+    <p>The following screen should be displayed.</p>
+    <p><img src="images/AfterTurnOn.jpg"/></p>
+  </li>
+
+  <li><b>step 5-b:</b> To disable monitoring
+    <p>Click services to disable monitoring, then push "Turn Off" button.</p>
+    <p><img src="images/ToDisableMonitoring.jpg"/></p>
+    <p>The following screen should be displayed.</p>
+    <p><img src="images/AfterTurnOff.jpg"/></p>
+  </li>
+
+  <li><b>step 6:</b> Save changes
+    <p>Push "Save changes" button to save the current state.</p>
+    <p>The following screen should be displayed.</p>
+    <p><img src="images/DeployStatus.jpg"/></p>
+  </li>
+
+  <li><b>step 7:</b> Monitoring
+    <p>Push "Monitoring" tab to start monitoring with the current settings.</p>
+    <p>The following screen should be displayed.</p>
+    <p><img src="images/MonitoringScreen.jpg"/></p>
+  </li>
+</ul>
+
+</subsection>
+
+</section>
+
+<section name="Appendixes">
+
+<subsection name="Version comparison chart">
+
+<table>
+  <tr>
+    <th>Item</th>
+    <th>SOAPMonitorApplet(Old version)</th>
+    <th>SOAPMonitor(<a href="http://cvs.apache.org/viewcvs.cgi/ws-axis/java/src/org/apache/axis/utils/SOAPMonitor.java?view=markup">This version</a>)</th>
+  </tr>
+  <tr>
+    <td>App Type</td>
+    <td>Applet</td>
+    <td>Swing application</td>
+  </tr>
+  <tr>
+    <td>Security</td>
+    <td>N/A (No authentication)</td>
+    <td>OK (Authentication added)</td>
+  </tr>
+  <tr>
+    <td>Install &amp; Use</td>
+    <td>
+      <ol>
+        <li>Compile the component, at first</li>
+        <li>Deploy the soapmonitor handler to "server-config.wsdd"</li>
+        <li>Deploy a service which to be monitored with the soapmonitor handler</li>
+        <li>Have an access to "http://localhost:8080/axis/SOAPMonitor"</li>
+        <li>Redeploy the service with no soapmonitor to disable monitoring</li>
+      </ol>
+      <ul>
+        <li>More detail is <a href="http://www.sosnoski.com/presents/java-xml/axis/axis-monitor.html">here</a>.</li>
+        <li>All of steps are the non-GUI based operations and these process are complicated for users</li>
+      </ul>
+    </td>
+    <td>Just do "java org.apache.axis.utils.SOAPMonitor" (within the axis.jar)
+       <ul>
+         <li>All of steps are the GUI based operations</li>
+       </ul>
+    </td>
+  </tr>
+</table>
+
+</subsection>
+
+<subsection name="Error Messages">
+
+<p>You may meet the following screens, if you have an access denied.</p>
+
+<ul>
+  <li><b>In case of "Unknown host":</b>
+    <p><img src="images/UnknownHost.jpg"/></p>
+  </li>
+  <li><b>In case of "Port mismatch":</b>
+    <p><img src="images/ConnectionRefused.jpg"/></p>
+  </li>
+  <li><b>In case of "Authorization failure":</b>
+    <p><img src="images/Unauthorized.jpg"/></p>
+  </li>
+</ul>
+
+</subsection>
+
+</section>
+
+  </body>
+</document>

From a98332190f09ff483e326d4b48b0e05aad6d4b2d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 7 Mar 2013 19:36:28 +0000
Subject: [PATCH 020/133] Migrated the remaining ant task documentation.

---
 axis-ant/src/site/site.xml                    |   2 +
 axis-ant/src/site/xdoc/foreach.xml            | 100 ++++++++++++++++++
 .../src/site/xdoc/runaxisfunctionaltests.xml  |  73 +++++++++++++
 3 files changed, 175 insertions(+)
 create mode 100644 axis-ant/src/site/xdoc/foreach.xml
 create mode 100644 axis-ant/src/site/xdoc/runaxisfunctionaltests.xml

diff --git a/axis-ant/src/site/site.xml b/axis-ant/src/site/site.xml
index 7da4ca318..75f1bc137 100644
--- a/axis-ant/src/site/site.xml
+++ b/axis-ant/src/site/site.xml
@@ -27,6 +27,8 @@
             <item name="axis-admin" href="axis-admin.html"/>
             <item name="axis-java2wsdl" href="axis-java2wsdl.html"/>
             <item name="axis-wsdl2java" href="axis-wsdl2java.html"/>
+            <item name="foreach" href="foreach.html"/>
+            <item name="runaxisfunctionaltests" href="runaxisfunctionaltests.html"/>
         </menu>
     </body>
 </project>
diff --git a/axis-ant/src/site/xdoc/foreach.xml b/axis-ant/src/site/xdoc/foreach.xml
new file mode 100644
index 000000000..a0faa4d0b
--- /dev/null
+++ b/axis-ant/src/site/xdoc/foreach.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>Foreach Task</title>
+  </properties>
+  <body>
+
+<section name="Description">
+
+<p>Call a target foreach entry in a set of parameters based on a fileset.</p>
+<p><i>For Axis development; there is no support or stability associated with this task</i></p>
+<source>&lt;target name="target1"&gt;
+      &lt;foreach target="target2"&gt;
+        &lt;param name="param1"&gt;
+            &lt;fileset refid="fset1"/&gt;
+        &lt;/param&gt;
+        &lt;param name="param2"&gt;
+          &lt;item value="jar" /&gt;
+          &lt;item value="zip" /&gt;
+        &lt;/param&gt;
+       &lt;/foreach&gt;
+    &lt;/target&gt;
+
+    &lt;target name="target2"&gt;
+      &lt;echo message="prop is ${param1}.${param2}" /&gt;
+    &lt;/target&gt;</source>
+<p>Really this just a wrapper around "AntCall"<br/>
+                Added a "type" attribute that works precisely like
+                its equivalent in <CODE>ExecuteOn</CODE>. It allows
+                the user to specify whether directories, files, or
+                both directories and files from the filesets are
+                included as entries in the parameter set.</p>
+
+</section>
+
+<section name="Parameters">
+
+<table>
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Type</th>
+  </tr>
+  <tr>
+    <td>fork</td>
+    <td>If true, forks the ant invocation.</td>
+    <td>boolean</td>
+  </tr>
+  <tr>
+    <td>inheritall</td>
+    <td>If true, pass all properties to the new Ant project. Defaults to true.</td>
+    <td>boolean</td>
+  </tr>
+  <tr>
+    <td>inheritrefs</td>
+    <td>If true, pass all references to the new Ant project. Defaults to false</td>
+    <td>boolean</td>
+  </tr>
+  <tr>
+    <td>target</td>
+    <td>Target to execute, required.</td>
+    <td>java.lang.String</td>
+  </tr>
+  <tr>
+    <td>verbose</td>
+    <td>Enable verbose output when signing ; optional: default false</td>
+    <td>boolean</td>
+  </tr>
+</table>
+
+</section>
+
+<section name="Parameters as nested elements">
+
+<p>param (org.apache.axis.tools.ant.foreach.ParamSet)<br/></p>
+
+</section>
+
+  </body>
+</document>
diff --git a/axis-ant/src/site/xdoc/runaxisfunctionaltests.xml b/axis-ant/src/site/xdoc/runaxisfunctionaltests.xml
new file mode 100644
index 000000000..4904ca257
--- /dev/null
+++ b/axis-ant/src/site/xdoc/runaxisfunctionaltests.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>Runaxisfunctionaltests Task</title>
+  </properties>
+  <body>
+
+<section name="Description">
+
+<p>Ant task for starting / stopping servers and running junit in the middle. Based on the Cactus org.apache.commons.cactus.ant package, heavily munged and cruftily dumped into one file.</p>
+<p><i>For Axis development; there is no support or stability associated with this task</i></p>
+
+</section>
+
+<section name="Parameters">
+
+<table>
+  <tr>
+    <th>Attribute</th>
+    <th>Description</th>
+    <th>Type</th>
+  </tr>
+  <tr>
+    <td>httpservertarget</td>
+    <td>Sets the target to call to start server 2.</td>
+    <td>java.lang.String</td>
+  </tr>
+  <tr>
+    <td>httpstoptarget</td>
+    <td>Sets the stop target. This is the target which does a HTTP admin shutdown on the simple server.</td>
+    <td>java.lang.String</td>
+  </tr>
+  <tr>
+    <td>tcpservertarget</td>
+    <td>Sets the target to call to start server 1.</td>
+    <td>java.lang.String</td>
+  </tr>
+  <tr>
+    <td>testtarget</td>
+    <td>Sets the target to call to run the tests.</td>
+    <td>java.lang.String</td>
+  </tr>
+  <tr>
+    <td>url</td>
+    <td>Sets the target URL (just http://host:port)</td>
+    <td>java.lang.String</td>
+  </tr>
+</table>
+
+</section>
+
+  </body>
+</document>

From e4b262745e2f896b4b230710540eb3b8a3af1b2a Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 7 Mar 2013 19:59:30 +0000
Subject: [PATCH 021/133] Added a replacement page for the outdated
 building-axis.html page.

---
 src/site/apt/building-axis.apt | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 src/site/apt/building-axis.apt

diff --git a/src/site/apt/building-axis.apt b/src/site/apt/building-axis.apt
new file mode 100644
index 000000000..c83e6d185
--- /dev/null
+++ b/src/site/apt/building-axis.apt
@@ -0,0 +1,38 @@
+~~ 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.
+
+           ----------------------
+           Guide to building Axis
+           ----------------------
+  
+  The current Axis trunk uses {{{http://maven.apache.org/}Maven 3}} and the build is fully automated.
+  To build Axis, first check out the sources from SVN:
+
+---------------------------------------------------------
+svn checkout https://svn.apache.org/repos/asf/axis/axis1/java/trunk axis
+---------------------------------------------------------
+
+  Then change to the <<<axis>>> directory and execute the Maven build:
+  
+---------------------------------------------------------
+mvn clean install
+---------------------------------------------------------
+
+  At the time of writing, the Axis build requires at least Maven 3.0.4 and Java 1.5. The build
+  is configured to fail early if an incompatible Maven or Java version is detected.
+  Note that the compatibility of the produced artifacts with Java 1.4 is enforced using the
+  {{{http://mojo.codehaus.org/animal-sniffer-maven-plugin/}Animal Sniffer Plugin}}.

From 486c16b3075858208b05bf6f81bdf3924fff5ee7 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 10 Mar 2013 10:49:31 +0000
Subject: [PATCH 022/133] Some site improvements.

---
 axis-ant/pom.xml                              |  2 +-
 axis-ant/src/site/site.xml                    |  2 +-
 axis-ant/src/site/xdoc/{index.xml => ant.xml} |  0
 axis/pom.xml                                  | 15 ++++++++-------
 maven/maven-axis-server-plugin/pom.xml        |  2 +-
 maven/maven-java2wsdl-plugin/pom.xml          |  2 +-
 maven/maven-wsdl2java-plugin/pom.xml          |  2 +-
 maven/pom.xml                                 |  2 +-
 maven/src/site/site.xml                       |  1 +
 src/site/site.xml                             |  2 +-
 src/site/xdoc/overview.xml.vm                 |  2 +-
 11 files changed, 17 insertions(+), 15 deletions(-)
 rename axis-ant/src/site/xdoc/{index.xml => ant.xml} (100%)

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index be246235b..50e456504 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-ant</artifactId>
-    <name>Axis :: Ant tasks</name>
+    <name>Ant tasks</name>
     <url>${baseUrl}/ant</url>
     <distributionManagement>
         <site>
diff --git a/axis-ant/src/site/site.xml b/axis-ant/src/site/site.xml
index 75f1bc137..28f8d4769 100644
--- a/axis-ant/src/site/site.xml
+++ b/axis-ant/src/site/site.xml
@@ -20,7 +20,7 @@
 <project name="Ant tasks">
     <body>
         <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
+            <item name="Introduction" href="ant.html"/>
             <item name="Dependencies" href="dependencies.html"/>
         </menu>
         <menu name="Tasks">
diff --git a/axis-ant/src/site/xdoc/index.xml b/axis-ant/src/site/xdoc/ant.xml
similarity index 100%
rename from axis-ant/src/site/xdoc/index.xml
rename to axis-ant/src/site/xdoc/ant.xml
diff --git a/axis/pom.xml b/axis/pom.xml
index e1ac11092..2ad6a62ca 100644
--- a/axis/pom.xml
+++ b/axis/pom.xml
@@ -28,13 +28,7 @@
     <artifactId>axis</artifactId>
     <name>Axis Uber-JAR</name>
     <description>Uber-JAR containing the same packages as the corresponding JAR from Axis 1.4. For compatibility only.</description>
-    <url>${baseUrl}/core</url>
-    <distributionManagement>
-        <site>
-            <id>axis</id>
-            <url>${baseSiteUrl}/core</url>
-        </site>
-    </distributionManagement>
+    <url>${baseUrl}</url>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -100,6 +94,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/maven/maven-axis-server-plugin/pom.xml b/maven/maven-axis-server-plugin/pom.xml
index 7c4b29139..ace7138ed 100644
--- a/maven/maven-axis-server-plugin/pom.xml
+++ b/maven/maven-axis-server-plugin/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <artifactId>maven-axis-server-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>Axis :: Maven :: maven-axis-server-plugin</name>
+    <name>maven-axis-server-plugin</name>
     <description>
         Axis server Maven plugin.
     </description>
diff --git a/maven/maven-java2wsdl-plugin/pom.xml b/maven/maven-java2wsdl-plugin/pom.xml
index 26057ba35..737362044 100644
--- a/maven/maven-java2wsdl-plugin/pom.xml
+++ b/maven/maven-java2wsdl-plugin/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <artifactId>maven-java2wsdl-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>Axis :: Maven :: maven-java2wsdl-plugin</name>
+    <name>maven-java2wsdl-plugin</name>
     <description>
         Axis java2wsdl Maven plugin.
     </description>
diff --git a/maven/maven-wsdl2java-plugin/pom.xml b/maven/maven-wsdl2java-plugin/pom.xml
index 6e984b02d..8bf96d8c9 100644
--- a/maven/maven-wsdl2java-plugin/pom.xml
+++ b/maven/maven-wsdl2java-plugin/pom.xml
@@ -27,7 +27,7 @@
     </parent>
     <artifactId>maven-wsdl2java-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>Axis :: Maven :: maven-wsdl2java-plugin</name>
+    <name>maven-wsdl2java-plugin</name>
     <description>
         Axis wsdl2java Maven plugin.
     </description>
diff --git a/maven/pom.xml b/maven/pom.xml
index 6a0a927ae..f38813f77 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>maven</artifactId>
-    <name>Axis :: Maven</name>
+    <name>Axis Maven Plugins</name>
     <packaging>pom</packaging>
     <description>
         Root POM for the Axis Maven plugins.
diff --git a/maven/src/site/site.xml b/maven/src/site/site.xml
index 1b0772ebd..005634d1f 100644
--- a/maven/src/site/site.xml
+++ b/maven/src/site/site.xml
@@ -25,6 +25,7 @@
         <menu name="Plugins">
             <item name="maven-wsdl2java-plugin" href="wsdl2java/index.html"/>
             <item name="maven-java2wsdl-plugin" href="java2wsdl/index.html"/>
+            <item name="maven-wsdd-plugin" href="wsdd/index.html"/>
             <item name="maven-axis-server-plugin" href="axis-server/index.html"/>
         </menu>
     </body>
diff --git a/src/site/site.xml b/src/site/site.xml
index e8f9c8aa9..28fdfc79a 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -72,7 +72,7 @@
             <item name="Reading Guide" href="reading.html"/>
         </menu>
         <menu name="More...">
-            <item name="Ant tasks" href="ant/index.html"/>
+            <item name="Ant tasks" href="ant/ant.html"/>
             <item name="Maven plugins" href="maven/index.html"/>
             <item name="Castor support" href="castor/index.html"/>
             <item name="JMS transport" href="transports/jms/index.html"/>
diff --git a/src/site/xdoc/overview.xml.vm b/src/site/xdoc/overview.xml.vm
index d6d6f5302..a36c1bc5b 100644
--- a/src/site/xdoc/overview.xml.vm
+++ b/src/site/xdoc/overview.xml.vm
@@ -46,7 +46,7 @@
 <subsection name="Documentation for Axis Developers">
 
 <ul>
-  <li><a href="http://ws.apache.org/axis/java/apiDocs/index.html">API Documentation</a></li>
+  <li><a href="apiDocs/index.html">API Documentation</a></li>
   <li><a href="building-axis.html">Building Axis</a> - Guidelines for building Axis with/without optional components.</li>
   <li><a href="developers-guide.html">Developer's Guide</a> - Collection of guidelines for developing code in Axis.</li>
   <li><a href="integration-guide.html">Integration Guide</a> - Description of APIs and development direction to allow integration into an existing web application server.</li>

From 2f1ca946f140b67affa73bbb12f76323cdb293eb Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 30 Apr 2013 10:33:19 +0000
Subject: [PATCH 023/133] Switched to the latest version of maven-fluido-skin.

---
 src/site/site.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/site/site.xml b/src/site/site.xml
index 28fdfc79a..e576b9d8b 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -21,13 +21,15 @@
     <skin>
         <groupId>org.apache.maven.skins</groupId>
         <artifactId>maven-fluido-skin</artifactId>
-        <version>1.0</version>
+        <version>1.3.0</version>
     </skin>
     <publishDate format="yyyy-MM-dd" position="right"/>
     <version position="right"/>
     <custom>
         <fluidoSkin>
-            <searchEnabled>true</searchEnabled>
+            <googleSearch>
+                <sitesearch>ws.apache.org/axis/java</sitesearch>
+            </googleSearch>
         </fluidoSkin>
     </custom>
     <bannerRight>

From ea0f367b8c549fdecaa17a05423cef55dfc8d2b1 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 30 Apr 2013 21:16:56 +0000
Subject: [PATCH 024/133] * Clarified the relationship between the individual
 artifacts and the all-in-one artifact. * Some general site improvements.

---
 axis-ant/pom.xml                              |   2 +-
 axis-ant/src/site/site.xml                    |   2 +-
 axis-codegen/pom.xml                          |   1 +
 axis-codegen/src/site/site.xml                |  24 +++
 axis-jaxrpc/pom.xml                           |  32 +++-
 axis-jaxrpc/src/site/site.xml                 |  24 +++
 axis-rt-compat/pom.xml                        |  24 +++
 axis-rt-compat/src/site/site.xml              |  24 +++
 axis-rt-core/pom.xml                          |   2 +
 axis-rt-core/src/site/site.xml                |   5 +-
 axis-rt-databinding-castor/pom.xml            |   3 +-
 axis-rt-databinding-castor/src/site/site.xml  |   7 +-
 axis-rt-databinding-xmlbeans/pom.xml          |  24 +++
 .../src/site/site.xml                         |  24 +++
 axis-rt-jws/pom.xml                           |  24 +++
 axis-rt-management/pom.xml                    |  24 +++
 axis-rt-management/src/site/site.xml          |  24 +++
 axis-rt-provider-bsf/pom.xml                  |  24 +++
 axis-rt-provider-bsf/src/site/site.xml        |  24 +++
 axis-rt-soapmonitor/pom.xml                   |  26 ++-
 axis-rt-soapmonitor/src/site/site.xml         |  24 +++
 axis-rt-transport-http-hc3/pom.xml            |   1 +
 axis-rt-transport-http-hc3/src/site/site.xml  |  24 +++
 axis-rt-transport-http-javanet/pom.xml        |   3 +-
 .../src/site/site.xml                         |   7 +-
 axis-rt-transport-jms/pom.xml                 |   3 +-
 axis-rt-transport-jms/src/site/site.xml       |   7 +-
 axis-rt-transport-mail/pom.xml                |  24 +++
 axis-rt-transport-mail/src/site/site.xml      |  24 +++
 axis-saaj/pom.xml                             |  32 +++-
 axis-saaj/src/site/site.xml                   |  24 +++
 axis-standalone-server/pom.xml                |   3 +-
 axis-standalone-server/src/site/site.xml      |   7 +-
 axis-tools/pom.xml                            |   1 +
 axis-tools/src/site/site.xml                  |  24 +++
 axis/pom.xml                                  |   7 +
 src/site/site.xml                             |  16 +-
 src/site/xdoc/artifacts.xml                   | 149 ++++++++++++++++++
 tcpmon/pom.xml                                |  24 +++
 tcpmon/src/site/site.xml                      |  24 +++
 40 files changed, 720 insertions(+), 52 deletions(-)
 create mode 100644 axis-codegen/src/site/site.xml
 create mode 100644 axis-jaxrpc/src/site/site.xml
 create mode 100644 axis-rt-compat/src/site/site.xml
 create mode 100644 axis-rt-databinding-xmlbeans/src/site/site.xml
 create mode 100644 axis-rt-management/src/site/site.xml
 create mode 100644 axis-rt-provider-bsf/src/site/site.xml
 create mode 100644 axis-rt-soapmonitor/src/site/site.xml
 create mode 100644 axis-rt-transport-http-hc3/src/site/site.xml
 create mode 100644 axis-rt-transport-mail/src/site/site.xml
 create mode 100644 axis-saaj/src/site/site.xml
 create mode 100644 axis-tools/src/site/site.xml
 create mode 100644 src/site/xdoc/artifacts.xml
 create mode 100644 tcpmon/src/site/site.xml

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 50e456504..50a8a77c1 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-ant</artifactId>
-    <name>Ant tasks</name>
+    <name>Ant Tasks</name>
     <url>${baseUrl}/ant</url>
     <distributionManagement>
         <site>
diff --git a/axis-ant/src/site/site.xml b/axis-ant/src/site/site.xml
index 28f8d4769..5690e9b05 100644
--- a/axis-ant/src/site/site.xml
+++ b/axis-ant/src/site/site.xml
@@ -17,7 +17,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="Ant tasks">
+<project>
     <body>
         <menu name="Overview">
             <item name="Introduction" href="ant.html"/>
diff --git a/axis-codegen/pom.xml b/axis-codegen/pom.xml
index 3356c9376..7684a34e9 100644
--- a/axis-codegen/pom.xml
+++ b/axis-codegen/pom.xml
@@ -64,6 +64,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-codegen/src/site/site.xml b/axis-codegen/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-codegen/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-jaxrpc/pom.xml b/axis-jaxrpc/pom.xml
index f52517077..c94641a55 100644
--- a/axis-jaxrpc/pom.xml
+++ b/axis-jaxrpc/pom.xml
@@ -26,7 +26,15 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-jaxrpc</artifactId>
-    <name>Axis :: JAX-RPC</name>
+    <name>JAX-RPC API</name>
+    <description>Contains the JAX-RPC 1.1 API</description>
+    <url>${baseUrl}/jaxrpc</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/jaxrpc</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -58,13 +66,23 @@
                     </archive>
                 </configuration>
             </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
             <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                </configuration>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
             </plugin>
         </plugins>
-    </build>
+    </reporting>
 </project>
diff --git a/axis-jaxrpc/src/site/site.xml b/axis-jaxrpc/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-jaxrpc/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-compat/pom.xml b/axis-rt-compat/pom.xml
index 89e21e504..38df925f0 100644
--- a/axis-rt-compat/pom.xml
+++ b/axis-rt-compat/pom.xml
@@ -30,6 +30,13 @@
     <description>
         Contains deprecated classes that are required for compatibility with older Axis versions.
     </description>
+    <url>${baseUrl}/compat</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/compat</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -49,4 +56,21 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-compat/src/site/site.xml b/axis-rt-compat/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-compat/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index 8a6ac8b95..4cb049f75 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -223,6 +223,8 @@
                 <reportSets>
                     <reportSet>
                         <reports>
+                            <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-rt-core/src/site/site.xml b/axis-rt-core/src/site/site.xml
index 6d9b412b9..e36a18137 100644
--- a/axis-rt-core/src/site/site.xml
+++ b/axis-rt-core/src/site/site.xml
@@ -19,9 +19,6 @@
   -->
 <project name="Core">
     <body>
-        <menu name="Reports">
-            <item name="Dependencies" href="dependencies.html"/>
-            <item name="JDepend" href="jdepend-report.html"/>
-        </menu>
+        <menu ref="reports"/>
     </body>
 </project>
diff --git a/axis-rt-databinding-castor/pom.xml b/axis-rt-databinding-castor/pom.xml
index b5e5cf1ae..13c811934 100644
--- a/axis-rt-databinding-castor/pom.xml
+++ b/axis-rt-databinding-castor/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-rt-databinding-castor</artifactId>
-    <name>Castor databinding support</name>
+    <name>Castor Databinding</name>
     <description>
         Contains serializers and deserializers for Castor.
     </description>
@@ -58,6 +58,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-rt-databinding-castor/src/site/site.xml b/axis-rt-databinding-castor/src/site/site.xml
index fea33660d..18866594a 100644
--- a/axis-rt-databinding-castor/src/site/site.xml
+++ b/axis-rt-databinding-castor/src/site/site.xml
@@ -17,11 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="Castor support">
+<project>
     <body>
-        <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
-            <item name="Dependencies" href="dependencies.html"/>
-        </menu>
+        <menu ref="reports"/>
     </body>
 </project>
diff --git a/axis-rt-databinding-xmlbeans/pom.xml b/axis-rt-databinding-xmlbeans/pom.xml
index ea045f4f1..69fb9daec 100644
--- a/axis-rt-databinding-xmlbeans/pom.xml
+++ b/axis-rt-databinding-xmlbeans/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>axis-rt-databinding-xmlbeans</artifactId>
     <name>XmlBeans Databinding</name>
+    <url>${baseUrl}/xmlbeans</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/xmlbeans</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -55,4 +62,21 @@
             </plugin>        
         </plugins>
     </build>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-databinding-xmlbeans/src/site/site.xml b/axis-rt-databinding-xmlbeans/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-databinding-xmlbeans/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-jws/pom.xml b/axis-rt-jws/pom.xml
index b34ffeee2..efe7115ae 100644
--- a/axis-rt-jws/pom.xml
+++ b/axis-rt-jws/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>axis-rt-jws</artifactId>
     <name>JWS Support</name>
+    <url>${baseUrl}/jws</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/jws</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -34,4 +41,21 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-management/pom.xml b/axis-rt-management/pom.xml
index f8a7e4c68..b119dfa5a 100644
--- a/axis-rt-management/pom.xml
+++ b/axis-rt-management/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>axis-rt-management</artifactId>
     <name>JMX Support</name>
+    <url>${baseUrl}/jmx</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/jmx</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -49,4 +56,21 @@
             </exclusions>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-management/src/site/site.xml b/axis-rt-management/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-management/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-provider-bsf/pom.xml b/axis-rt-provider-bsf/pom.xml
index 9a403497c..e61532f14 100644
--- a/axis-rt-provider-bsf/pom.xml
+++ b/axis-rt-provider-bsf/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>axis-rt-provider-bsf</artifactId>
     <name>BSF Provider</name>
+    <url>${baseUrl}/bsf</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/bsf</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -39,4 +46,21 @@
             <version>2.3.0</version>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-provider-bsf/src/site/site.xml b/axis-rt-provider-bsf/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-provider-bsf/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-soapmonitor/pom.xml b/axis-rt-soapmonitor/pom.xml
index 8ece718ff..1eb5663c9 100644
--- a/axis-rt-soapmonitor/pom.xml
+++ b/axis-rt-soapmonitor/pom.xml
@@ -26,7 +26,14 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-rt-soapmonitor</artifactId>
-    <name>SOAP Monitor Handler and Service</name>
+    <name>SOAP Monitor Handler/Service</name>
+    <url>${baseUrl}/soapmonitor/runtime</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/soapmonitor/runtime</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -34,4 +41,21 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-soapmonitor/src/site/site.xml b/axis-rt-soapmonitor/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-soapmonitor/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-transport-http-hc3/pom.xml b/axis-rt-transport-http-hc3/pom.xml
index 8e3b6b5f7..0f58cb026 100644
--- a/axis-rt-transport-http-hc3/pom.xml
+++ b/axis-rt-transport-http-hc3/pom.xml
@@ -64,6 +64,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-rt-transport-http-hc3/src/site/site.xml b/axis-rt-transport-http-hc3/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-transport-http-hc3/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
index 4a68e9089..07d00ef72 100644
--- a/axis-rt-transport-http-javanet/pom.xml
+++ b/axis-rt-transport-http-javanet/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-rt-transport-http-javanet</artifactId>
-    <name>Axis :: java.net HTTP Transport</name>
+    <name>java.net HTTP Transport</name>
     <description>
     	An alternative HTTP transport that uses the java.net.HttpURLConnection API. This transport only works with Java 1.5.
     </description>
@@ -232,6 +232,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-rt-transport-http-javanet/src/site/site.xml b/axis-rt-transport-http-javanet/src/site/site.xml
index 0d54edecf..18866594a 100644
--- a/axis-rt-transport-http-javanet/src/site/site.xml
+++ b/axis-rt-transport-http-javanet/src/site/site.xml
@@ -17,11 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="java.net HTTP transport">
+<project>
     <body>
-        <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
-            <item name="Dependencies" href="dependencies.html"/>
-        </menu>
+        <menu ref="reports"/>
     </body>
 </project>
diff --git a/axis-rt-transport-jms/pom.xml b/axis-rt-transport-jms/pom.xml
index 024208756..e37c4e8bc 100644
--- a/axis-rt-transport-jms/pom.xml
+++ b/axis-rt-transport-jms/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-rt-transport-jms</artifactId>
-    <name>Axis :: JMS transport</name>
+    <name>JMS Transport</name>
     <description>
         Contains the Axis JMS transport.
     </description>
@@ -71,6 +71,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-rt-transport-jms/src/site/site.xml b/axis-rt-transport-jms/src/site/site.xml
index ea9de8bd8..18866594a 100644
--- a/axis-rt-transport-jms/src/site/site.xml
+++ b/axis-rt-transport-jms/src/site/site.xml
@@ -17,11 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="JMS transport">
+<project>
     <body>
-        <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
-            <item name="Dependencies" href="dependencies.html"/>
-        </menu>
+        <menu ref="reports"/>
     </body>
 </project>
diff --git a/axis-rt-transport-mail/pom.xml b/axis-rt-transport-mail/pom.xml
index ebd66d230..73c52ebe3 100644
--- a/axis-rt-transport-mail/pom.xml
+++ b/axis-rt-transport-mail/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>axis-rt-transport-mail</artifactId>
     <name>Mail Transport</name>
+    <url>${baseUrl}/transports/mail</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/transports/mail</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -43,4 +50,21 @@
             <version>1.0.0</version>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/axis-rt-transport-mail/src/site/site.xml b/axis-rt-transport-mail/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-rt-transport-mail/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-saaj/pom.xml b/axis-saaj/pom.xml
index 26cdafbaa..64f264b96 100644
--- a/axis-saaj/pom.xml
+++ b/axis-saaj/pom.xml
@@ -26,7 +26,15 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-saaj</artifactId>
-    <name>Axis :: SAAJ</name>
+    <name>SAAJ API</name>
+    <description>Contains the SAAJ 1.2 API</description>
+    <url>${baseUrl}/saaj</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/saaj</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>javax.activation</groupId>
@@ -52,13 +60,23 @@
                     </archive>
                 </configuration>
             </plugin>
+        </plugins>
+    </build>
+    <reporting>
+        <plugins>
             <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                </configuration>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
             </plugin>
         </plugins>
-    </build>
+    </reporting>
 </project>
diff --git a/axis-saaj/src/site/site.xml b/axis-saaj/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-saaj/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis-standalone-server/pom.xml b/axis-standalone-server/pom.xml
index d8d8e8180..256b0788d 100644
--- a/axis-standalone-server/pom.xml
+++ b/axis-standalone-server/pom.xml
@@ -26,7 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>axis-standalone-server</artifactId>
-    <name>Axis :: Stand-alone server</name>
+    <name>Stand-alone Server</name>
     <description>
         A Jetty based stand-alone Axis server that replaces the former SimpleAxisServer.
     </description>
@@ -80,6 +80,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-standalone-server/src/site/site.xml b/axis-standalone-server/src/site/site.xml
index fa988a1fe..18866594a 100644
--- a/axis-standalone-server/src/site/site.xml
+++ b/axis-standalone-server/src/site/site.xml
@@ -17,11 +17,8 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="Stand-alone server">
+<project>
     <body>
-        <menu name="Overview">
-            <item name="Introduction" href="index.html"/>
-            <item name="Dependencies" href="dependencies.html"/>
-        </menu>
+        <menu ref="reports"/>
     </body>
 </project>
diff --git a/axis-tools/pom.xml b/axis-tools/pom.xml
index 4db3ca30f..c0a92175b 100644
--- a/axis-tools/pom.xml
+++ b/axis-tools/pom.xml
@@ -58,6 +58,7 @@
                     <reportSet>
                         <reports>
                             <report>index</report>
+                            <report>summary</report>
                             <report>dependencies</report>
                         </reports>
                     </reportSet>
diff --git a/axis-tools/src/site/site.xml b/axis-tools/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/axis-tools/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/axis/pom.xml b/axis/pom.xml
index 2ad6a62ca..85de8f9c3 100644
--- a/axis/pom.xml
+++ b/axis/pom.xml
@@ -79,13 +79,20 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
+                                    <include>${project.groupId}:axis-rt-compat</include>
                                     <include>${project.groupId}:axis-rt-core</include>
                                     <include>${project.groupId}:axis-rt-databinding-castor</include>
+                                    <include>${project.groupId}:axis-rt-databinding-xmlbeans</include>
+                                    <include>${project.groupId}:axis-rt-management</include>
                                     <include>${project.groupId}:axis-rt-jws</include>
                                     <include>${project.groupId}:axis-rt-provider-bsf</include>
+                                    <include>${project.groupId}:axis-rt-soapmonitor</include>
+                                    <include>${project.groupId}:axis-rt-transport-jms</include>
+                                    <include>${project.groupId}:axis-rt-transport-http-hc3</include>
                                     <include>${project.groupId}:axis-rt-transport-mail</include>
                                     <include>${project.groupId}:axis-codegen</include>
                                     <include>${project.groupId}:axis-tools</include>
+                                    <include>${project.groupId}:tcpmon</include>
                                 </includes>
                             </artifactSet>
                             <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
diff --git a/src/site/site.xml b/src/site/site.xml
index e576b9d8b..00f8f6501 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -49,7 +49,7 @@
             <item name="Issue Tracking" href="issue-tracking.html"/>
             <item name="Mailing Lists" href="mail-lists.html"/>
             <item name="Source Repository" href="source-repository.html"/>
-            <item name="Dependencies" href="core/dependencies.html"/>
+            <item name="Artifacts &amp; Dependencies" href="artifacts.html"/>
             <item name="Javadocs" href="apiDocs/index.html"/>
         </menu>
         <menu name="Downloads">
@@ -74,12 +74,14 @@
             <item name="Reading Guide" href="reading.html"/>
         </menu>
         <menu name="More...">
-            <item name="Ant tasks" href="ant/ant.html"/>
-            <item name="Maven plugins" href="maven/index.html"/>
-            <item name="Castor support" href="castor/index.html"/>
-            <item name="JMS transport" href="transports/jms/index.html"/>
-            <item name="java.net HTTP transport" href="transports/http-javanet/index.html"/>
-            <item name="Stand-alone server" href="standalone-server/index.html"/>
+            <item name="Ant Tasks" href="ant/ant.html"/>
+            <item name="Maven Plugins" href="maven/index.html"/>
+            <item name="Castor Databinding" href="castor/index.html"/>
+            <item name="XmlBeans Databinding" href="xmlbeans/index.html"/>
+            <item name="JMS Transport" href="transports/jms/index.html"/>
+            <item name="HttpClient 3 Transport" href="transports/http-hc3/index.html"/>
+            <item name="java.net HTTP Transport" href="transports/http-javanet/index.html"/>
+            <item name="Stand-alone Server" href="standalone-server/index.html"/>
         </menu>
         <menu name="Apache" inherit="bottom">
             <item name="License" href="http://www.apache.org/licenses/LICENSE-2.0.html" />
diff --git a/src/site/xdoc/artifacts.xml b/src/site/xdoc/artifacts.xml
new file mode 100644
index 000000000..26aaeb5f3
--- /dev/null
+++ b/src/site/xdoc/artifacts.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+    <properties>
+        <title>Artifacts and dependencies</title>
+    </properties>
+    <body>
+        <section name="Artifacts and dependencies">
+            <p>
+                Axis 1.4 was packaged into four JAR artifacts: <tt>axis-saaj</tt>, <tt>axis-jaxrpc</tt>, <tt>axis</tt> and <tt>axis-ant</tt>
+                (respectively named <tt>saaj.jar</tt>, <tt>jaxrpc.jar</tt>, <tt>axis.jar</tt> and <tt>axis-ant.jar</tt> in the
+                Axis 1.4 binary distribution).
+                In Axis 1.4.1, the <tt>axis</tt> JAR has been split into several smaller artifacts. This reduces the volume of
+                code that needs to be added to the dependencies of an Axis based project and makes dependency management easier (provided
+                that the project is built using Maven or a tool that can access Maven repositories). It also makes security auditing easier:
+                e.g. the <tt>axis</tt> artifact contains the code for the SOAP monitor, which may be considered as a security risk if it is not properly
+                disabled in production systems.
+            </p>
+            <p>
+                Nevertheless, Axis 1.4.1 also contains an all-in-one <tt>axis</tt> JAR that contains the same components
+                as in Axis 1.4. This can be used as a drop-in replacement for the <tt>axis.jar</tt> from earlier versions,
+                although it is strongly recommended to use the new modularized artifacts.
+                The table below shows the relationships between the new modularized artifacts and the all-in-one JAR in Axis 1.4.1,
+                and the artifacts included in Axis 1.4.
+                Note that new components introduced in Axis 1.4.1 are not included in the all-in-one JAR.
+            </p>
+            <p>
+                To see the dependencies of an artifact, click on the artifact's name.
+            </p>
+            <table class="table table-bordered" style="width: auto">
+                <col width="25%"/>
+                <col width="25%"/>
+                <col width="25%"/>
+                <col width="25%"/>
+                <thead>
+                    <tr>
+                        <td rowspan="2"></td>
+                        <td style="text-align: center; vertical-align:middle" rowspan="2">Axis 1.4</td>
+                        <td style="text-align: center" colspan="2">Axis 1.4.1</td>
+                    </tr>
+                    <tr>
+                        <td style="text-align: center">All-in-one</td>
+                        <td style="text-align: center">Modularized</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>SAAJ API</td>
+                        <td style="text-align: center" colspan="3"><a href="saaj/dependencies.html">axis-saaj</a></td>
+                    </tr>
+                    <tr>
+                        <td>JAX-RPC API</td>
+                        <td style="text-align: center" colspan="3"><a href="jaxrpc/dependencies.html">axis-jaxrpc</a></td>
+                    </tr>
+                    <tr>
+                        <td>Runtime Core</td>
+                        <td style="text-align: center; vertical-align:middle" colspan="2" rowspan="14">axis</td>
+                        <td style="text-align: center"><a href="core/dependencies.html">axis-rt-core</a></td>
+                    </tr>
+                    <tr>
+                        <td>Castor Databinding</td>
+                        <td style="text-align: center"><a href="castor/dependencies.html">axis-rt-databinding-castor</a></td>
+                    </tr>
+                    <tr>
+                        <td>XmlBeans Databinding</td>
+                        <td style="text-align: center"><a href="xmlbeans/dependencies.html">axis-rt-databinding-xmlbeans</a></td>
+                    </tr>
+                    <tr>
+                        <td>JWS Support</td>
+                        <td style="text-align: center"><a href="jws/dependencies.html">axis-rt-jws</a></td>
+                    </tr>
+                    <tr>
+                        <td>JMX Support</td>
+                        <td style="text-align: center"><a href="jmx/dependencies.html">axis-rt-management</a></td>
+                    </tr>
+                    <tr>
+                        <td>BSF Provider</td>
+                        <td style="text-align: center"><a href="bsf/dependencies.html">axis-rt-provider-bsf</a></td>
+                    </tr>
+                    <tr>
+                        <td>JMS Transport</td>
+                        <td style="text-align: center"><a href="transports/jms/dependencies.html">axis-rt-transport-jms</a></td>
+                    </tr>
+                    <tr>
+                        <td>HttpClient 3 Transport</td>
+                        <td style="text-align: center"><a href="transports/http-hc3/dependencies.html">axis-rt-transport-http-hc3</a></td>
+                    </tr>
+                    <tr>
+                        <td>Mail Transport</td>
+                        <td style="text-align: center"><a href="transports/mail/dependencies.html">axis-rt-transport-mail</a></td>
+                    </tr>
+                    <tr>
+                        <td>Code Generator</td>
+                        <td style="text-align: center"><a href="codegen/dependencies.html">axis-codegen</a></td>
+                    </tr>
+                    <tr>
+                        <td>Command Line Tools</td>
+                        <td style="text-align: center"><a href="tools/dependencies.html">axis-tools</a></td>
+                    </tr>
+                    <tr>
+                        <td>SOAP Monitor Handler/Service</td>
+                        <td style="text-align: center"><a href="soapmonitor/runtime/dependencies.html">axis-rt-soapmonitor</a></td>
+                    </tr>
+                    <tr>
+                        <td>TCP Monitor</td>
+                        <td style="text-align: center"><a href="tcpmon/dependencies.html">tcpmon</a></td>
+                    </tr>
+                    <tr>
+                        <td>Compatibility Classes</td>
+                        <td style="text-align: center"><a href="compat/dependencies.html">axis-rt-compat</a></td>
+                    </tr>
+                    <tr>
+                        <td>Ant Tasks</td>
+                        <td style="text-align: center" colspan="3"><a href="ant/dependencies.html">axis-ant</a></td>
+                    </tr>
+                    <tr>
+                        <td>Stand-alone Server</td>
+                        <td style="text-align: center">N/A</td>
+                        <td style="text-align: center" colspan="2"><a href="standalone-server/dependencies.html">axis-standalone-server</a></td>
+                    </tr>
+                    <tr>
+                        <td>java.net HTTP Transport</td>
+                        <td style="text-align: center">N/A</td>
+                        <td style="text-align: center" colspan="2"><a href="transports/http-javanet/dependencies.html">axis-rt-transport-http-javanet</a></td>
+                    </tr>
+                </tbody>
+            </table>
+        </section>
+    </body>
+</document>
diff --git a/tcpmon/pom.xml b/tcpmon/pom.xml
index a7c1e47e9..cff15bd2d 100644
--- a/tcpmon/pom.xml
+++ b/tcpmon/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>tcpmon</artifactId>
     <name>TCP Monitor</name>
+    <url>${baseUrl}/tcpmon</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/tcpmon</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -34,4 +41,21 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>2.4</version>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>index</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
diff --git a/tcpmon/src/site/site.xml b/tcpmon/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/tcpmon/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>

From 1a6e535b845a7418f39d7075220c1ef62ba13233 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 30 Apr 2013 22:11:41 +0000
Subject: [PATCH 025/133] Simplified site configuration.

---
 axis-ant/pom.xml                       | 16 -------------
 axis-codegen/pom.xml                   | 17 --------------
 axis-jaxrpc/pom.xml                    | 17 --------------
 axis-rt-compat/pom.xml                 | 17 --------------
 axis-rt-core/pom.xml                   | 13 -----------
 axis-rt-databinding-castor/pom.xml     | 17 --------------
 axis-rt-databinding-xmlbeans/pom.xml   | 17 --------------
 axis-rt-jws/pom.xml                    | 17 --------------
 axis-rt-management/pom.xml             | 17 --------------
 axis-rt-provider-bsf/pom.xml           | 17 --------------
 axis-rt-soapmonitor/pom.xml            | 17 --------------
 axis-rt-transport-http-hc3/pom.xml     | 17 --------------
 axis-rt-transport-http-javanet/pom.xml | 17 --------------
 axis-rt-transport-jms/pom.xml          | 17 --------------
 axis-rt-transport-mail/pom.xml         | 17 --------------
 axis-saaj/pom.xml                      | 17 --------------
 axis-standalone-server/pom.xml         | 17 --------------
 axis-tools/pom.xml                     | 17 --------------
 maven/pom.xml                          | 28 +++++++++++++---------
 pom.xml                                | 32 +++++++++++++++++++++-----
 tcpmon/pom.xml                         | 17 --------------
 21 files changed, 43 insertions(+), 335 deletions(-)

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 50a8a77c1..13a2c6d55 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -142,20 +142,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-codegen/pom.xml b/axis-codegen/pom.xml
index 7684a34e9..05d683536 100644
--- a/axis-codegen/pom.xml
+++ b/axis-codegen/pom.xml
@@ -55,21 +55,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-jaxrpc/pom.xml b/axis-jaxrpc/pom.xml
index c94641a55..5d7eec729 100644
--- a/axis-jaxrpc/pom.xml
+++ b/axis-jaxrpc/pom.xml
@@ -68,21 +68,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-compat/pom.xml b/axis-rt-compat/pom.xml
index 38df925f0..43defcbf2 100644
--- a/axis-rt-compat/pom.xml
+++ b/axis-rt-compat/pom.xml
@@ -56,21 +56,4 @@
             <optional>true</optional>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index 4cb049f75..13878340a 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -217,19 +217,6 @@
     </build>
     <reporting>
         <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>jdepend-maven-plugin</artifactId>
diff --git a/axis-rt-databinding-castor/pom.xml b/axis-rt-databinding-castor/pom.xml
index 13c811934..5f2e8c2ce 100644
--- a/axis-rt-databinding-castor/pom.xml
+++ b/axis-rt-databinding-castor/pom.xml
@@ -49,21 +49,4 @@
             <version>0.9.4.2</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-databinding-xmlbeans/pom.xml b/axis-rt-databinding-xmlbeans/pom.xml
index 69fb9daec..5e2562387 100644
--- a/axis-rt-databinding-xmlbeans/pom.xml
+++ b/axis-rt-databinding-xmlbeans/pom.xml
@@ -62,21 +62,4 @@
             </plugin>        
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-jws/pom.xml b/axis-rt-jws/pom.xml
index efe7115ae..fb885b1f0 100644
--- a/axis-rt-jws/pom.xml
+++ b/axis-rt-jws/pom.xml
@@ -41,21 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-management/pom.xml b/axis-rt-management/pom.xml
index b119dfa5a..319b87650 100644
--- a/axis-rt-management/pom.xml
+++ b/axis-rt-management/pom.xml
@@ -56,21 +56,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-provider-bsf/pom.xml b/axis-rt-provider-bsf/pom.xml
index e61532f14..590baebe6 100644
--- a/axis-rt-provider-bsf/pom.xml
+++ b/axis-rt-provider-bsf/pom.xml
@@ -46,21 +46,4 @@
             <version>2.3.0</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-soapmonitor/pom.xml b/axis-rt-soapmonitor/pom.xml
index 1eb5663c9..cd4c1c4a2 100644
--- a/axis-rt-soapmonitor/pom.xml
+++ b/axis-rt-soapmonitor/pom.xml
@@ -41,21 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-transport-http-hc3/pom.xml b/axis-rt-transport-http-hc3/pom.xml
index 0f58cb026..293b5ceb8 100644
--- a/axis-rt-transport-http-hc3/pom.xml
+++ b/axis-rt-transport-http-hc3/pom.xml
@@ -55,21 +55,4 @@
             </exclusions>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
index 07d00ef72..f31add548 100644
--- a/axis-rt-transport-http-javanet/pom.xml
+++ b/axis-rt-transport-http-javanet/pom.xml
@@ -223,21 +223,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-transport-jms/pom.xml b/axis-rt-transport-jms/pom.xml
index e37c4e8bc..cfb3c78bd 100644
--- a/axis-rt-transport-jms/pom.xml
+++ b/axis-rt-transport-jms/pom.xml
@@ -62,21 +62,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-rt-transport-mail/pom.xml b/axis-rt-transport-mail/pom.xml
index 73c52ebe3..14307f2ae 100644
--- a/axis-rt-transport-mail/pom.xml
+++ b/axis-rt-transport-mail/pom.xml
@@ -50,21 +50,4 @@
             <version>1.0.0</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-saaj/pom.xml b/axis-saaj/pom.xml
index 64f264b96..b0f11fdf4 100644
--- a/axis-saaj/pom.xml
+++ b/axis-saaj/pom.xml
@@ -62,21 +62,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-standalone-server/pom.xml b/axis-standalone-server/pom.xml
index 256b0788d..d77f4435d 100644
--- a/axis-standalone-server/pom.xml
+++ b/axis-standalone-server/pom.xml
@@ -71,21 +71,4 @@
             </plugin>
         </plugins>
     </build>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/axis-tools/pom.xml b/axis-tools/pom.xml
index c0a92175b..baac8149e 100644
--- a/axis-tools/pom.xml
+++ b/axis-tools/pom.xml
@@ -49,21 +49,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/maven/pom.xml b/maven/pom.xml
index f38813f77..450046ecd 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -73,21 +73,27 @@
         <module>maven-java2wsdl-plugin</module>
         <module>maven-axis-server-plugin</module>
     </modules>
-    <reporting>
+    <build>
         <plugins>
             <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
+                <!-- This overrides the set of reports just for this project (we don't want to
+                     generate the reports defined in the parent POM) -->
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <version>2.6</version>
+                            <reports>
+                                <report>index</report>
+                            </reports>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
             </plugin>
         </plugins>
-    </reporting>
+    </build>
     
     <!-- TODO: remove this once a ulog release is deployed to Maven Central -->
     <repositories>
diff --git a/pom.xml b/pom.xml
index a04db07e7..b3bc9710a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -347,6 +347,26 @@
                     <attach>true</attach>
                 </configuration>
             </plugin>
+            <plugin>
+                <!-- Override the set of reports just for this project -->
+                <artifactId>maven-site-plugin</artifactId>
+                <inherited>false</inherited>
+                <configuration>
+                    <reportPlugins>
+                        <plugin>
+                            <artifactId>maven-project-info-reports-plugin</artifactId>
+                            <version>2.6</version>
+                            <reports>
+                                <report>index</report>
+                                <report>issue-tracking</report>
+                                <report>mailing-list</report>
+                                <!-- report>project-team</report -->
+                                <report>scm</report>
+                            </reports>
+                        </plugin>
+                    </reportPlugins>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -382,19 +402,19 @@
         </profile>
     </profiles>
     <reporting>
+        <!-- Note that the reporting plugins configured here are only executed in submodules
+             (because the configuration of the maven-site-plugin in this POM overrides the
+             reports configured here). -->
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <inherited>false</inherited>
+                <version>2.6</version>
                 <reportSets>
                     <reportSet>
                         <reports>
                             <report>index</report>
-                            <report>issue-tracking</report>
-                            <report>mailing-list</report>
-                            <!-- report>project-team</report -->
-                            <report>scm</report>
+                            <report>summary</report>
+                            <report>dependencies</report>
                         </reports>
                     </reportSet>
                 </reportSets>
diff --git a/tcpmon/pom.xml b/tcpmon/pom.xml
index cff15bd2d..a6a9f2db5 100644
--- a/tcpmon/pom.xml
+++ b/tcpmon/pom.xml
@@ -41,21 +41,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports>
-                            <report>index</report>
-                            <report>summary</report>
-                            <report>dependencies</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>

From 411ae3eaf12b44ed31ac18e6891ccc1b00064a31 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 1 May 2013 07:38:04 +0000
Subject: [PATCH 026/133] Fixed a mistake in the documentation of
 writeStubToTestSources.

---
 .../apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java b/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
index b95cb565c..d910208be 100644
--- a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
+++ b/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
@@ -39,7 +39,7 @@ public class GenerateSourcesMojo extends AbstractWsdl2JavaMojo {
     /**
      * Flag indicating whether the stub and locator should be written to
      * {@link #sourceOutputDirectory} (<code>false</code>) or to {@link #testSourceOutputDirectory}
-     * (<code>false</code>). Set this parameter to <code>true</code> if the main artifact of your
+     * (<code>true</code>). Set this parameter to <code>true</code> if the main artifact of your
      * project should not contain client-side code, but you need it in your test cases. Note that
      * this parameter is only meaningful if <code>generate</code> is set to <code>both</code>.
      * 

From 233e19a9c8de2bfac300c3989c72b21cffd5f011 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 1 May 2013 10:00:07 +0000
Subject: [PATCH 027/133] Improved the documentation of the Maven plugins.

---
 maven/maven-axis-server-plugin/pom.xml        |  8 ---
 .../src/site/site.xml                         |  2 +-
 maven/maven-java2wsdl-plugin/pom.xml          |  8 ---
 .../maven/java2wsdl/GenerateWsdlMojo.java     |  2 +-
 .../maven-java2wsdl-plugin/src/site/site.xml  |  2 +-
 maven/maven-wsdd-plugin/pom.xml               |  8 ---
 .../maven-wsdd-plugin/src/site/apt/index.apt  | 53 ++++++++++++++
 maven/maven-wsdd-plugin/src/site/site.xml     | 27 +++++++
 maven/maven-wsdl2java-plugin/pom.xml          | 17 -----
 .../maven-wsdl2java-plugin/src/site/site.xml  |  2 +-
 maven/pom.xml                                 |  9 ++-
 maven/src/site/xdoc/index.xml                 | 70 +++++++++++++++++++
 12 files changed, 160 insertions(+), 48 deletions(-)
 create mode 100644 maven/maven-wsdd-plugin/src/site/apt/index.apt
 create mode 100644 maven/maven-wsdd-plugin/src/site/site.xml
 create mode 100644 maven/src/site/xdoc/index.xml

diff --git a/maven/maven-axis-server-plugin/pom.xml b/maven/maven-axis-server-plugin/pom.xml
index ace7138ed..ea718bbbe 100644
--- a/maven/maven-axis-server-plugin/pom.xml
+++ b/maven/maven-axis-server-plugin/pom.xml
@@ -79,12 +79,4 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/maven/maven-axis-server-plugin/src/site/site.xml b/maven/maven-axis-server-plugin/src/site/site.xml
index 73c49a403..d4b6a8e25 100644
--- a/maven/maven-axis-server-plugin/src/site/site.xml
+++ b/maven/maven-axis-server-plugin/src/site/site.xml
@@ -17,7 +17,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="maven-axis-server-plugin">
+<project>
     <body>
         <menu name="Overview">
             <item name="Introduction" href="index.html"/>
diff --git a/maven/maven-java2wsdl-plugin/pom.xml b/maven/maven-java2wsdl-plugin/pom.xml
index 737362044..bad8ec5a5 100644
--- a/maven/maven-java2wsdl-plugin/pom.xml
+++ b/maven/maven-java2wsdl-plugin/pom.xml
@@ -76,12 +76,4 @@
             <version>1.8.1</version>
         </dependency>
     </dependencies>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java b/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java
index 4cd0775b2..40404f23d 100644
--- a/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java
+++ b/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java
@@ -25,7 +25,7 @@
 import org.apache.maven.plugin.MojoFailureException;
 
 /**
- * 
+ * Generates a WSDL description from a Java class.
  * 
  * @goal generate-wsdl
  * @requiresDependencyResolution compile
diff --git a/maven/maven-java2wsdl-plugin/src/site/site.xml b/maven/maven-java2wsdl-plugin/src/site/site.xml
index 67069f888..06b1870ea 100644
--- a/maven/maven-java2wsdl-plugin/src/site/site.xml
+++ b/maven/maven-java2wsdl-plugin/src/site/site.xml
@@ -17,7 +17,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="maven-java2wsdl-plugin">
+<project>
     <body>
         <menu name="Overview">
             <item name="Introduction" href="index.html"/>
diff --git a/maven/maven-wsdd-plugin/pom.xml b/maven/maven-wsdd-plugin/pom.xml
index fe881a11a..a9b14c6ff 100644
--- a/maven/maven-wsdd-plugin/pom.xml
+++ b/maven/maven-wsdd-plugin/pom.xml
@@ -57,12 +57,4 @@
             <artifactId>ulog</artifactId>
         </dependency>
     </dependencies>
-    <!-- reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-        </plugins>
-    </reporting -->
 </project>
diff --git a/maven/maven-wsdd-plugin/src/site/apt/index.apt b/maven/maven-wsdd-plugin/src/site/apt/index.apt
new file mode 100644
index 000000000..f28b35724
--- /dev/null
+++ b/maven/maven-wsdd-plugin/src/site/apt/index.apt
@@ -0,0 +1,53 @@
+~~ 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.
+
+           ------------
+           Introduction
+           ------------
+
+maven-wsdd-plugin
+
+  Historically, the recommended way to deploy Axis services was based on the following procedure:
+  
+    [[1]] Deploy the Axis WAR to a servlet container or application server.
+    
+    [[2]] Add the Web service code to the <<<WEB-INF/classes>>> or <<<WEB-INF/lib>>> folder in the
+          (exploded) Axis WAR.
+    
+    [[3]] Create a WSDD file (or use the WSDD file generated by wsdl2java) and deploy it using
+          the admin client. This will add the definitions contained in the submitted WSDD file
+          to the <<<server-config.wsdd>>> file.
+  
+  This procedure is described in more details in the {{{../../install.html}Installation Guide}}.
+  
+  However, nowadays the preferred approach - especially for enterprise projects - is to have a build
+  process that packages the Web service(s) together with the Axis libraries into a WAR that is then
+  deployed to the application server. This requires that the <<<server-config.wsdd>>> file is
+  constructed before the WAR is built. With Axis 1.4, developers would typically maintain that file
+  by hand, either by editing it directly (and copying the contents of WSDD files created by wsdl2java)
+  or by using e.g. the Axis 1.4 tooling in Eclipse. The file is then added to the project files under source control
+  so that it is available during the build.
+  
+  This approach is suboptimal because in most cases the <<<server-config.wsdd>>> file contains
+  content generated by wsdl2java. That content should not be under source control. Instead,
+  the <<<server-config.wsdd>>> file should be assembled automatically during the build process,
+  based on the output of wsdl2java.
+  
+  This is exactly what the maven-wsdd-plugin does: it takes a set of WSDD files and merges them
+  into a single output WSDD. The input WSDD files are typically generated by
+  {{{../wsdl2java/index.html}maven-wsdl2java-plugin}}, but the set may also contain
+  manually created WSDD files, e.g. to configure custom handlers or to override configuration properties.
diff --git a/maven/maven-wsdd-plugin/src/site/site.xml b/maven/maven-wsdd-plugin/src/site/site.xml
new file mode 100644
index 000000000..06b1870ea
--- /dev/null
+++ b/maven/maven-wsdd-plugin/src/site/site.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu name="Overview">
+            <item name="Introduction" href="index.html"/>
+            <item name="Goals" href="plugin-info.html"/>
+        </menu>
+    </body>
+</project>
diff --git a/maven/maven-wsdl2java-plugin/pom.xml b/maven/maven-wsdl2java-plugin/pom.xml
index 8bf96d8c9..95e900e86 100644
--- a/maven/maven-wsdl2java-plugin/pom.xml
+++ b/maven/maven-wsdl2java-plugin/pom.xml
@@ -114,21 +114,4 @@
             </build>
         </profile>
     </profiles>
-    <reporting>
-        <plugins>
-            <plugin>
-                <artifactId>maven-plugin-plugin</artifactId>
-                <version>2.9</version>
-            </plugin>
-            <plugin>
-                <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.4</version>
-                <reportSets>
-                    <reportSet>
-                        <reports/>
-                    </reportSet>
-                </reportSets>
-            </plugin>
-        </plugins>
-    </reporting>
 </project>
diff --git a/maven/maven-wsdl2java-plugin/src/site/site.xml b/maven/maven-wsdl2java-plugin/src/site/site.xml
index 907f76539..a34d38f5e 100644
--- a/maven/maven-wsdl2java-plugin/src/site/site.xml
+++ b/maven/maven-wsdl2java-plugin/src/site/site.xml
@@ -17,7 +17,7 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<project name="maven-wsdl2java-plugin">
+<project>
     <body>
         <menu name="Overview">
             <item name="Introduction" href="index.html"/>
diff --git a/maven/pom.xml b/maven/pom.xml
index 450046ecd..ae732cee9 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -76,12 +76,15 @@
     <build>
         <plugins>
             <plugin>
-                <!-- This overrides the set of reports just for this project (we don't want to
-                     generate the reports defined in the parent POM) -->
+                <!-- This overrides the set of reports (we don't want to generate the reports defined in the parent POM) -->
                 <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
                 <configuration>
                     <reportPlugins>
+                        <plugin>
+                            <!-- This will be ignored for this project, but executed in submodules -->
+                            <artifactId>maven-plugin-plugin</artifactId>
+                            <version>2.9</version>
+                        </plugin>
                         <plugin>
                             <artifactId>maven-project-info-reports-plugin</artifactId>
                             <version>2.6</version>
diff --git a/maven/src/site/xdoc/index.xml b/maven/src/site/xdoc/index.xml
new file mode 100644
index 000000000..4f5d6681d
--- /dev/null
+++ b/maven/src/site/xdoc/index.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+    <properties>
+        <title>Introduction</title>
+    </properties>
+    <body>
+        <section name="Axis Maven Plugins">
+            <p>
+                Starting with version 1.4.1, Axis provides a set of Maven plugins that can be used
+                as an alternative to the existing <a href="../ant/index.html">Ant tasks</a>.
+                The plugins also introduce a couple of features not found in the Ant tasks and that
+                are essential to properly support the Maven build lifecycle.
+            </p>
+            <p>
+                The following table provides an overview of these plugins and their relationships
+                with the existing Ant tasks:
+            </p>
+            <table class="table table-bordered">
+                <thead>
+                    <tr>
+                        <td>Maven plugin</td>
+                        <td>Description</td>
+                        <td>Corresponding Ant tasks</td>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><a href="wsdl2java/index.html">maven-wsdl2java-plugin</a></td>
+                        <td>Generates Java artifacts from a WSDL file</td>
+                        <td><a href="../ant/axis-wsdl2java.html">axis-wsdl2java</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="java2wsdl/index.html">maven-java2wsdl-plugin</a></td>
+                        <td>Generates a WSDL description from a Java class</td>
+                        <td><a href="../ant/axis-java2wsdl.html">axis-java2wsdl</a></td>
+                    </tr>
+                    <tr>
+                        <td><a href="wsdd/index.html">maven-wsdd-plugin</a></td>
+                        <td></td>
+                        <td rowspan="2" style="vertical-align: middle">N/A</td>
+                    </tr>
+                    <tr>
+                        <td><a href="axis-server/index.html">maven-axis-server-plugin</a></td>
+                        <td>Starts/stops a stand-alone Axis server</td>
+                    </tr>
+                </tbody>
+            </table>
+        </section>
+    </body>
+</document>

From 90e34a21fedb16054f8ae94aad87a7f60692dcee Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 1 May 2013 10:13:23 +0000
Subject: [PATCH 028/133] Don't include dependency locations in reports.
 Anyway, all dependencies are available from Maven central.

---
 pom.xml                     | 3 +++
 src/site/xdoc/artifacts.xml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/pom.xml b/pom.xml
index b3bc9710a..641eca5dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,6 +418,9 @@
                         </reports>
                     </reportSet>
                 </reportSets>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
             </plugin>
         </plugins>
     </reporting>
diff --git a/src/site/xdoc/artifacts.xml b/src/site/xdoc/artifacts.xml
index 26aaeb5f3..585135a87 100644
--- a/src/site/xdoc/artifacts.xml
+++ b/src/site/xdoc/artifacts.xml
@@ -144,6 +144,9 @@
                     </tr>
                 </tbody>
             </table>
+            <p>
+                All artifacts and dependencies are available from the <a href="http://search.maven.org/">Maven Central Repository</a>.
+            </p>
         </section>
     </body>
 </document>

From 588fcc30a8835b63925149c0b721ee17f3ece2ff Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 1 May 2013 14:06:25 +0000
Subject: [PATCH 029/133] Added a front page.

---
 src/site/apt/index.apt | 48 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 src/site/apt/index.apt

diff --git a/src/site/apt/index.apt b/src/site/apt/index.apt
new file mode 100644
index 000000000..c942c40aa
--- /dev/null
+++ b/src/site/apt/index.apt
@@ -0,0 +1,48 @@
+~~ 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.
+
+      -----
+      About
+      -----
+
+  Apache Axis\u2122 is a second generation SOAP engine, the successor to the Apache SOAP project,
+  itself based on the original SOAP4J code that IBM contributed to Apache in April 2000.
+  In contrast to its predecessor, Axis is fully WSDL aware. It also supports the JAX-RPC API.
+
+~~ Ref.: http://markmail.org/thread/qa7w2e6onva2sn5m
+
+  Today, Apache Axis is to a large extend superseded by a new generation of SOAP stacks
+  such as {{{http://axis.apache.org/axis2/java/core/}Apache Axis2}},
+  {{{http://cxf.apache.org/}Apache CXF}} and {{{http://metro.java.net/}Metro}}.
+  However, Axis is still relevant for the following type of projects:
+  
+    * Projects that need to use JAX-RPC. There are only two Open Source implementations
+      of that API: Axis and {{{http://java.net/projects/jax-rpc/}Sun's reference implementation}}.
+    
+    * Projects that need to consume or expose Web services that use SOAP encoding.
+      SOAP encoding has been deprecated and is no longer supported by modern Web service
+      frameworks. However, there are still legacy services that use type of encoding.
+    
+    * Existing projects that were built using Axis and for which the return on investment
+      of rewriting them using a modern Web service framework would be too low.
+
+  []
+  
+=====================
+
+  Apache Axis, Axis, Apache, the Apache feather logo, and the Apache Axis project logo are
+  trademarks of The Apache Software Foundation.
\ No newline at end of file

From 26bb8aa909f318efa46c4e01c9d862f13dd79b52 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 1 May 2013 14:21:47 +0000
Subject: [PATCH 030/133] Configured maven-scm-publish-plugin.

---
 pom.xml | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 641eca5dc..ed254f8b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -367,6 +367,20 @@
                     </reportPlugins>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-site-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <!-- Required by maven-scm-publish-plugin -->
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-scm-publish-plugin</artifactId>
+                <version>1.0-beta-2</version>
+            </plugin>
         </plugins>
     </build>
     <profiles>
@@ -427,8 +441,7 @@
     <properties>
         <javaVersion>1.4</javaVersion>
         <baseUrl>http://axis.apache.org/axis/java</baseUrl>
-        <!-- Dummy site URL to be able to use site:stage -->
-        <baseSiteUrl>dav:http://localhost/sites/axis</baseSiteUrl>
+        <baseSiteUrl>scm:svn:https://svn.apache.org/repos/asf/axis/site/axis/java</baseSiteUrl>
     </properties>
     <distributionManagement>
         <site>

From e000cda9bc2fd9cd1446a338acf1077d7afd6518 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 1 May 2013 15:06:25 +0000
Subject: [PATCH 031/133] Some site fixes.

---
 axis-model/pom.xml                   |  8 ++++++++
 axis/pom.xml                         |  1 +
 soapmonitor-applet/pom.xml           |  7 +++++++
 soapmonitor-applet/src/site/site.xml | 24 ++++++++++++++++++++++++
 soapmonitor-client/pom.xml           |  7 +++++++
 soapmonitor-client/src/site/site.xml | 24 ++++++++++++++++++++++++
 src/site/xdoc/artifacts.xml          | 14 +++++++++++---
 7 files changed, 82 insertions(+), 3 deletions(-)
 create mode 100644 soapmonitor-applet/src/site/site.xml
 create mode 100644 soapmonitor-client/src/site/site.xml

diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index a5532b1bd..5c6fcd99b 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -99,6 +99,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <!-- TODO: skipping for now -->
+                <artifactId>maven-site-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                    <skipDeploy>true</skipDeploy>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/axis/pom.xml b/axis/pom.xml
index 85de8f9c3..d790d7cb3 100644
--- a/axis/pom.xml
+++ b/axis/pom.xml
@@ -92,6 +92,7 @@
                                     <include>${project.groupId}:axis-rt-transport-mail</include>
                                     <include>${project.groupId}:axis-codegen</include>
                                     <include>${project.groupId}:axis-tools</include>
+                                    <include>${project.groupId}:soapmonitor-client</include>
                                     <include>${project.groupId}:tcpmon</include>
                                 </includes>
                             </artifactSet>
diff --git a/soapmonitor-applet/pom.xml b/soapmonitor-applet/pom.xml
index 8ccbd7c5a..4c3ac6cfa 100644
--- a/soapmonitor-applet/pom.xml
+++ b/soapmonitor-applet/pom.xml
@@ -27,4 +27,11 @@
     </parent>
     <artifactId>soapmonitor-applet</artifactId>
     <name>SOAP Monitor Applet</name>
+    <url>${baseUrl}/soapmonitor/applet</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/soapmonitor/applet</url>
+        </site>
+    </distributionManagement>
 </project>
diff --git a/soapmonitor-applet/src/site/site.xml b/soapmonitor-applet/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/soapmonitor-applet/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/soapmonitor-client/pom.xml b/soapmonitor-client/pom.xml
index c919a3024..b3de22cf9 100644
--- a/soapmonitor-client/pom.xml
+++ b/soapmonitor-client/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>soapmonitor-client</artifactId>
     <name>SOAP Monitor Client</name>
+    <url>${baseUrl}/soapmonitor/client</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/soapmonitor/client</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/soapmonitor-client/src/site/site.xml b/soapmonitor-client/src/site/site.xml
new file mode 100644
index 000000000..18866594a
--- /dev/null
+++ b/soapmonitor-client/src/site/site.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+  ~ 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.
+  -->
+<project>
+    <body>
+        <menu ref="reports"/>
+    </body>
+</project>
diff --git a/src/site/xdoc/artifacts.xml b/src/site/xdoc/artifacts.xml
index 585135a87..4536663ee 100644
--- a/src/site/xdoc/artifacts.xml
+++ b/src/site/xdoc/artifacts.xml
@@ -73,7 +73,7 @@
                     </tr>
                     <tr>
                         <td>Runtime Core</td>
-                        <td style="text-align: center; vertical-align:middle" colspan="2" rowspan="14">axis</td>
+                        <td style="text-align: center; vertical-align:middle" colspan="2" rowspan="15">axis</td>
                         <td style="text-align: center"><a href="core/dependencies.html">axis-rt-core</a></td>
                     </tr>
                     <tr>
@@ -120,6 +120,10 @@
                         <td>SOAP Monitor Handler/Service</td>
                         <td style="text-align: center"><a href="soapmonitor/runtime/dependencies.html">axis-rt-soapmonitor</a></td>
                     </tr>
+                    <tr>
+                        <td>SOAP Monitor Client</td>
+                        <td style="text-align: center"><a href="soapmonitor/client/dependencies.html">soapmonitor-client</a></td>
+                    </tr>
                     <tr>
                         <td>TCP Monitor</td>
                         <td style="text-align: center"><a href="tcpmon/dependencies.html">tcpmon</a></td>
@@ -132,14 +136,18 @@
                         <td>Ant Tasks</td>
                         <td style="text-align: center" colspan="3"><a href="ant/dependencies.html">axis-ant</a></td>
                     </tr>
+                    <tr>
+                        <td>SOAP Monitor Applet</td>
+                        <td style="text-align: center">N/A (not included in any JAR)</td>
+                        <td style="text-align: center" colspan="2"><a href="soapmonitor/applet/dependencies.html">soapmonitor-applet</a></td>
+                    </tr>
                     <tr>
                         <td>Stand-alone Server</td>
-                        <td style="text-align: center">N/A</td>
+                        <td style="text-align: center; vertical-align:middle" rowspan="2">N/A (added in Axis 1.4.1)</td>
                         <td style="text-align: center" colspan="2"><a href="standalone-server/dependencies.html">axis-standalone-server</a></td>
                     </tr>
                     <tr>
                         <td>java.net HTTP Transport</td>
-                        <td style="text-align: center">N/A</td>
                         <td style="text-align: center" colspan="2"><a href="transports/http-javanet/dependencies.html">axis-rt-transport-http-javanet</a></td>
                     </tr>
                 </tbody>

From 9fb7755588c82e26fb2f6f7bc6a53cdc1a91769c Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 5 May 2013 11:09:23 +0000
Subject: [PATCH 032/133] Upgraded to maven-site-plugin 3.2 and fixed mvn
 site:stage (see
 http://veithen.blogspot.be/2013/05/maven-patterns-skipping-site-generation.html).

---
 apidocs/pom.xml | 15 ++++++++++++---
 pom.xml         |  3 +--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 9e0ffa8e2..141a70c3c 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -179,9 +179,18 @@
             </plugin>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
+                <executions>
+                    <execution>
+                        <id>default-site</id>
+                        <phase>site</phase>
+                        <goals>
+                            <goal>site</goal>
+                        </goals>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
diff --git a/pom.xml b/pom.xml
index ed254f8b0..5b0898e03 100644
--- a/pom.xml
+++ b/pom.xml
@@ -209,7 +209,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.0</version>
+                    <version>3.2</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
@@ -370,7 +370,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
-                <version>3.2</version>
                 <configuration>
                     <!-- Required by maven-scm-publish-plugin -->
                     <skipDeploy>true</skipDeploy>

From 55d9459b4a91eb5305a1be440457c0d0f1744961 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 28 May 2013 19:31:59 +0000
Subject: [PATCH 033/133] AXIS-2889: Fixed download link for Axis 1.4.

---
 src/site/xdoc/releases.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/site/xdoc/releases.xml b/src/site/xdoc/releases.xml
index a8385160f..c3d9376d4 100644
--- a/src/site/xdoc/releases.xml
+++ b/src/site/xdoc/releases.xml
@@ -34,7 +34,7 @@
     <td><b>Description</b></td>
   </tr>
   <tr>
-    <td><a href="http://www.apache.org/dyn/closer.cgi/ws/axis/1_4/">1.4</a></td>
+    <td><a href="http://www.apache.org/dyn/closer.cgi/axis/axis/java/1.4/">1.4</a></td>
     <td>April 22, 2006</td>
     <td>Final Version 1.4</td>
   </tr>

From 64525780ae671bc56edd98fd42d60efef424ac3a Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 5 Feb 2014 14:44:41 +0000
Subject: [PATCH 034/133] Fixed a build issue with OpenJDK 7.

---
 distribution/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/distribution/pom.xml b/distribution/pom.xml
index 7b2617f4c..ec92e918a 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -190,10 +190,9 @@
             <id>tools-include</id>
             <!-- Required on non Mac OS X platforms to use the javac Ant task with fork=false -->
             <activation>
-                <property>
-                    <name>java.vendor</name>
-                    <value>Sun Microsystems Inc.</value>
-                </property>
+                <file>
+                    <exists>${java.home}/../lib/tools.jar</exists>
+                </file>
             </activation>
             <build>
                 <pluginManagement>

From 56a0b486e78165b457b52ffbdec3eeff1c544279 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 24 Feb 2014 15:20:01 +0000
Subject: [PATCH 035/133] Added an assertion to avoid NPE if the test fails.

---
 .../src/test/java/test/wsdl/attachments/AttachmentTestCase.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java b/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java
index de8edbc95..d71d95c78 100644
--- a/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java
+++ b/integration/src/test/java/test/wsdl/attachments/AttachmentTestCase.java
@@ -56,6 +56,7 @@ public void testGetCompanyInfo() throws Exception {
         getBinding().getCompanyInfo("IBM", result, docs, logo);
         assertEquals(134, (int)(result.value*10));
         assertEquals("IBM", docs.value);
+        assertNotNull(logo.value);
         assertEquals(24, logo.value.getWidth(null));
         assertEquals(24, logo.value.getHeight(null));
     }

From b54f119aed1a33495c71d1f220bf6c376cae312c Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 25 Feb 2014 08:07:28 +0000
Subject: [PATCH 036/133] Avoid connections to remote resources during unit
 tests.

---
 .../test/java/test/saaj/TestAttachment.java   |   4 +-
 .../src/test/resources/test/saaj/LICENSE.txt  | 366 ++++++++++++++++++
 .../src/test/resources/test/saaj/slashdot.xml | 184 +++++++++
 3 files changed, 552 insertions(+), 2 deletions(-)
 create mode 100644 axis-rt-core/src/test/resources/test/saaj/LICENSE.txt
 create mode 100644 axis-rt-core/src/test/resources/test/saaj/slashdot.xml

diff --git a/axis-rt-core/src/test/java/test/saaj/TestAttachment.java b/axis-rt-core/src/test/java/test/saaj/TestAttachment.java
index f855d3faa..8b062b534 100644
--- a/axis-rt-core/src/test/java/test/saaj/TestAttachment.java
+++ b/axis-rt-core/src/test/java/test/saaj/TestAttachment.java
@@ -50,8 +50,8 @@ public void testMultipleAttachments() throws Exception {
 
         MessageFactory factory = MessageFactory.newInstance();
         SOAPMessage msg = factory.createMessage();
-        java.net.URL url1 = new java.net.URL("http://slashdot.org/slashdot.xml");
-        java.net.URL url2 = new java.net.URL("http://www.apache.org/LICENSE.txt");
+        java.net.URL url1 = TestAttachment.class.getResource("slashdot.xml");
+        java.net.URL url2 = TestAttachment.class.getResource("LICENSE.txt");
 
         AttachmentPart a1 = msg.createAttachmentPart(new javax.activation.DataHandler(url1));
         a1.setContentType("text/xml");
diff --git a/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt b/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt
new file mode 100644
index 000000000..27561b72e
--- /dev/null
+++ b/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt
@@ -0,0 +1,366 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html lang="en">
+  <head>
+    <title>Licenses</title>
+
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
+
+    <link rel="stylesheet" type="text/css" media="screen" href="/css/style.css">
+    <link rel="stylesheet" type="text/css" media="screen" href="/css/code.css">
+
+    <script type="text/javascript" src="/js/jquery.js"></script>
+    <script type="text/javascript" src="/js/apache_boot.js"></script>
+
+    
+
+    
+    <!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
+  </head>
+
+  <body>
+    <div id="page" class="container_16">
+      <div id="header" class="grid_8">
+        <img src="/images/feather-small.gif" alt="The Apache Software Foundation">
+        <h1>The Apache Software Foundation</h1>
+        <h2>Licenses</h2>
+      </div>
+      <div id="nav" class="grid_8">
+        <ul>
+          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
+          <li><a href="/foundation/" title="The Foundation">Foundation</a></li>
+          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
+          <li><a href="http://people.apache.org" title="The People">People</a></li>
+          <li><a href="/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
+          <li><a href="/dyn/closer.cgi" title="Download">Download</a></li>
+          <li><a href="/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
+        </ul>
+        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/licenses/">Licenses</a></p>
+        <form name="search" id="search" action="http://www.google.com/search" method="get">
+          <input value="apache.org" name="sitesearch" type="hidden"/>
+          <input type="text" name="q" id="query">
+          <input type="submit" id="submit" value="Search">
+        </form>
+      </div>
+      <div class="clear"></div>
+      <div id="content" class="grid_16"><div class="section-content"><p>The Apache Software Foundation uses various licenses to <a href="#distributions">distribute
+software and documentation</a>, to accept regular
+<a href="#clas">contributions from individuals and corporations</a>, and to accept
+larger <a href="#grants">grants of existing software products</a>.</p>
+<p>These licenses help us achieve our goal of providing reliable and
+long-lived software products through collaborative open source software
+development. In all cases, contributors retain full rights to use their
+original contributions for any other purpose outside of Apache while
+providing the ASF and its projects the right to distribute and build upon
+their work within Apache.</p>
+<h1 id="distributions">Licensing of Distributions</h1>
+<p>All software produced by The Apache Software Foundation or any of its
+projects or subjects is licensed according to the terms of the documents
+listed below.</p>
+<h2 id="2.0">Apache License, Version 2.0 (current)</h2>
+<p><a href="LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> (
+<a href="LICENSE-2.0.txt">TXT</a> or <a href="LICENSE-2.0.html">HTML</a> )</p>
+<p>The 2.0 version of the Apache License was approved by the ASF in 2004. The
+goals of this license revision have been to reduce the number of frequently
+asked questions, to allow the license to be reusable without modification
+by any project (including non-ASF projects), to allow the license to be
+included by reference instead of listed in every file, to clarify the
+license on submission of contributions, to require a patent license on
+contributions that necessarily infringe the contributor's own patents, and
+to move comments regarding Apache and other inherited attribution notices
+to a location outside the license terms (the <a href="example-NOTICE.txt">NOTICE
+file</a> ).</p>
+<p>The result is a license that is supposed to be compatible with other open
+source licenses, while remaining true to the original goals of the Apache
+Group and supportive of collaborative development across both nonprofit and
+commercial organizations. The Apache Software Foundation is still trying to
+determine if this version of the Apache License is <a href="GPL-compatibility.html">compatible with the
+GPL</a>.</p>
+<p>All packages produced by the ASF are implicitly licensed under the Apache
+License, Version 2.0, unless otherwise explicitly stated. More developer
+documentation on how to apply the Apache License to your work can be found
+in * <a href="../dev/apply-license.html">Applying the Apache License, Version 2.0</a>
+*.</p>
+<h2 id="1.1">Apache License, Version 1.1 (historic)</h2>
+<p><a href="LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a> </p>
+<p>The 1.1 version of the Apache License was approved by the ASF in 2000. The
+primary change from the 1.0 license is in the 'advertising clause' (section
+3 of the 1.0 license); derived products are no longer required to include
+attribution in their advertising materials, only in their documentation.</p>
+<p>Individual packages licensed under the 1.1 version may have used different
+wording due to varying requirements for attribution or mark identification,
+but the binding terms were all the same.</p>
+<h2 id="1.0">Apache License, Version 1.0 (historic)</h2>
+<p><a href="LICENSE-1.0">http://www.apache.org/licenses/LICENSE-1.0</a> </p>
+<p>This is the original Apache License which applies only to older versions of
+Apache packages (such as version 1.2 of the Web server).</p>
+<h1 id="clas">Contributor License Agreements</h1>
+<p>The ASF desires that all contributors of ideas, code, or documentation to
+the Apache projects complete, sign, and submit (via postal mail, fax or
+email) an <a href="icla.txt">Individual Contributor License Agreement</a> (1) (CLA) [ <a href="icla.pdf">PDF
+form</a> ]. The purpose of this agreement is to clearly define the
+terms under which intellectual property has been contributed to the ASF and
+thereby allow us to defend the project should there be a legal dispute
+regarding the software at some future time. A signed CLA is required to be
+on file before an individual is given commit rights to an ASF project.</p>
+<p>For a corporation that has assigned employees to work on an Apache project,
+a <a href="cla-corporate.txt">Corporate CLA</a> (CCLA) is available for contributing
+intellectual property via the corporation, that may have been assigned as
+part of an employment agreement. Note that a Corporate CLA does not remove
+the need for every developer to sign their own CLA as an individual, to
+cover any of their contributions which are not owned by the corporation
+signing the CCLA.</p>
+<p>CLAs may be submitted by traditional postal mail, fax, or by emailing a
+scan of the signed copy to secretary@apache.org. You can also fill out the <a href="icla.pdf">pdf
+document</a> or edit the <a href="icla.txt">text document</a>, create a detached gpg signature, and
+send both the document and the detached signature via email to secretary.</p>
+<p>Note: If you choose to send this document via fax then be absolutely sure
+that you have sent it correctly. Faxes are often received back-to-front,
+blank, or totally illegible.</p>
+<p>The ICLA is not tied to any employer you may have, so it is recommended to
+use one's personal email address in the contact details, rather than an @work
+address.</p>
+<p>Your Full name will be published unless you provide an alternative Public name.
+For example if your full name is Andrew Bernard Charles Dickens, but you wish
+to be known as Andrew Dickens, please enter the latter as your Public name.</p>
+<p>The email address and other contact details are not published.</p>
+<p>(1) Please use overwrite mode when typing in the underlined fields.
+Otherwise the fields will wrap, making the result harder to read.</p>
+<h1 id="grants">Software Grants</h1>
+<p>When an individual or corporation decides to donate a body of existing
+software or documentation to one of the Apache projects, they need to
+execute a formal <a href="software-grant.txt">Software Grant Agreement</a> (SGA) with
+the ASF. Typically, this is done after negotiating approval with the ASF
+<a href="http://incubator.apache.org/">Incubator</a> or one of the PMCs, since the ASF
+will not accept software unless there is a viable community available to
+support a collaborative project.</p>
+<p>Grants may be submitted by traditional postal mail, fax, or by emailing a
+scan of the signed copy to secretary@.
+You can also edit the text document, create a detached gpg signature, and
+send both the document and the detached signature via email to secretary.</p>
+<p>Note: If you choose to send this document via fax then be absolutely sure
+that you have sent it correctly. Faxes are often received back-to-front,
+blank, or totally illegible.</p>
+<h1 id="crypto">Export restrictions</h1>
+<p>For export restriction information, please consult our <a href="/licenses/exports/">ASF Export
+Classifications</a> page.</p>
+<h1 id="trademarks">Trademark and Logo Usage</h1>
+<p>For ASF trademark and logo usage information, please consult our <a href="/foundation/marks/">ASF
+Trademark Use Policy</a> page.</p>
+<h1 id="questions">Questions?</h1>
+<p>For answers to frequently asked licensing questions, please consult our 
+<a href="/foundation/license-faq.html">Licensing Frequently Asked Questions</a> page.</p></div></div>
+      <div class="clear"></div>
+    </div>
+    <div id="footer" class="container_16">
+      <div class="links grid_16">
+      <div class="grid_3">
+        <h4>Projects</h4>
+        <ul>
+<li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li>
+<li><a href="http://abdera.apache.org/" title="Atom Publishing Protocol Implementation">Abdera</a></li>
+<li><a href="http://accumulo.apache.org/" title="Sorted, distributed key/value store">Accumulo</a></li>
+<li><a href="http://ace.apache.org/" title="Centralized life cycle management and deployment of OSGi based and related modular software artifacts for distribution.">ACE</a></li>
+<li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li>
+<li><a href="http://airavata.apache.org/" title="Workflow and Computational Job Management Middleware">Airavata</a></li>
+<li><a href="http://ambari.apache.org/" title="Hadoop cluster management">Ambari</a></li>
+<li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li>
+<li><a href="http://any23.apache.org/" title="Anything to Triples">Any23</a></li>
+<li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li>
+<li><a href="http://archiva.apache.org/" title="Build Artifact Repository Manager">Archiva</a></li>
+<li><a href="http://aries.apache.org/" title="Enterprise OSGi application programming model">Aries</a></li>
+<li><a href="http://avro.apache.org/" title="A Serialization System">Avro</a></li>
+<li><a href="http://axis.apache.org/" title="Java SOAP Engine">Axis</a></li>
+<li><a href="http://bigtop.apache.org/" title="Apache Hadoop ecosystem integration and distribution project">Bigtop</a></li>
+<li><a href="http://bloodhound.apache.org/" title="Issue tracking, wiki and repository browser">Bloodhound</a></li>
+<li><a href="http://buildr.apache.org/" title="Simple and intuitive build system for Java applications">Buildr</a></li>
+<li><a href="http://bval.apache.org/" title="Apache BVal: JSR-303 Bean Validation Implementation and Extensions">BVal</a></li>
+<li><a href="http://camel.apache.org/" title="Spring based Integration Framework which implements the Enterprise Integration Patterns">Camel</a></li>
+<li><a href="http://cassandra.apache.org/" title="Highly scalable second-generation distributed database">Cassandra</a></li>
+<li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li>
+<li><a href="http://chemistry.apache.org/" title="CMIS (Content Managment Interoperability Services) Clients and Servers">Chemistry</a></li>
+<li><a href="http://chukwa.apache.org/" title="Open source data collection system for monitoring large distributed systems.">Chukwa</a></li>
+<li><a href="http://clerezza.apache.org/" title="Semantically linked data for OSGi">Clerezza</a></li>
+<li><a href="http://click.apache.org/" title="User-friendly page and component oriented web framework">Click</a></li>
+<li><a href="http://cloudstack.apache.org/" title="Infrastructure as a Service solution">CloudStack</a></li>
+<li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li>
+<li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li>
+<li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li>
+<li><a href="http://cordova.apache.org/" title="Platform for building native mobile applications using HTML, CSS and JavaScript">Cordova</a></li>
+<li><a href="http://couchdb.apache.org/" title="RESTful document database">CouchDB</a></li>
+<li><a href="http://creadur.apache.org/" title="Comprehension and auditing of software distributions">Creadur</a></li>
+<li><a href="http://crunch.apache.org/" title="Simple and Efficient MapReduce Pipelines">Crunch</a></li>
+<li><a href="http://ctakes.apache.org/" title="Natural language processing (NLP) tool for information extraction from electronic medical record clinical free-text">cTAKES</a></li>
+<li><a href="http://curator.apache.org/" title="Java libraries that make using Apache ZooKeeper easier">Curator</a></li>
+<li><a href="http://cxf.apache.org/" title="Service Framework">CXF</a></li>
+<li><a href="http://db.apache.org/" title="Database access">DB</a></li>
+<li><a href="http://deltacloud.apache.org/" title="RESTful cloud management interface">Deltacloud</a></li>
+<li><a href="http://directmemory.apache.org/" title="An off-heap cache for the Java Virtual Machine">DirectMemory</a></li>
+<li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li>
+<li><a href="http://empire-db.apache.org/" title="Relational Data Persistence">Empire-db</a></li>
+<li><a href="http://etch.apache.org/" title="Cross-platform, language- and transport-independent RPC-like messaging framework">Etch</a></li>
+<li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li>
+<li><a href="http://flex.apache.org/" title="Application framework for expressive web applications that deploy to all major browsers, desktops and devices.">Flex</a></li>
+<li><a href="http://flume.apache.org/" title="A reliable service for efficiently collecting, aggregating, and moving large amounts of log data">Flume</a></li>
+<li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li>
+<li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li>
+<li><a href="http://giraph.apache.org/" title="Iterative graph processing system built for high scalability">Giraph</a></li>
+<li><a href="http://gora.apache.org/" title="ORM framework for column stores such as Apache HBase and Apache Cassandra with a specific focus on Hadoop">Gora</a></li>
+<li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li>
+<li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li>
+<li><a href="http://hama.apache.org/" title="a Bulk Synchronous Parallel computing framework on top of Hadoop">Hama</a></li>
+<li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</a></li>
+<li><a href="http://hive.apache.org/" title="Data warehouse infrastructure using the Hadoop Database">Hive</a></li>
+<li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li>
+<li><a href="http://isis.apache.org/" title="Framework for rapidly developing domain-driven apps in Java">Isis</a></li>
+<li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li>
+<li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li>
+<li><a href="http://jclouds.apache.org/" title="Java cloud APIs and abstractions">jclouds</a></li>
+<li><a href="http://jena.apache.org/" title="Java framework for building Semantic Web applications">Jena</a></li>
+<li><a href="http://jmeter.apache.org/" title="Java performance and functional testing">JMeter</a></li>
+<li><a href="http://jspwiki.apache.org/" title="Leading open source WikiWiki engine, feature-rich and built around standard J2EE components (Java, servlets, JSP). ">JSPWiki</a></li>
+<li><a href="http://juddi.apache.org/" title="Java implementation of the Universal Description, Discovery, and Integration specification">jUDDI</a></li>
+<li><a href="http://kafka.apache.org/" title="Distributed publish-subscribe messaging system">Kafka</a></li>
+<li><a href="http://karaf.apache.org/" title="Server-side OSGi distribution">Karaf</a></li>
+<li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li>
+<li><a href="http://libcloud.apache.org/" title="Unified interface to the cloud">Libcloud</a></li>
+<li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li>
+<li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li>
+<li><a href="http://lucenenet.apache.org/" title="Search engine library targeted at .NET runtime users.">Lucene.Net</a></li>
+<li><a href="http://lucy.apache.org/" title="Search engine library for dynamic languages">Lucy</a></li>
+<li><a href="http://mahout.apache.org/" title="Scalable machine learning library">Mahout</a></li>
+<li><a href="http://manifoldcf.apache.org/" title="Framework for connecting source content repositories to target repositories or indexes.">ManifoldCF</a></li>
+<li><a href="http://marmotta.apache.org/" title="An Open Platform for Linked Data">Marmotta</a></li>
+<li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li>
+<li><a href="http://mesos.apache.org/" title="a cluster manager that provides efficient resource isolation and sharing across distributed applications">Mesos</a></li>
+<li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">MINA</a></li>
+<li><a href="http://mrunit.apache.org/" title="Java library that helps developers unit test Apache Hadoop map reduce jobs">MRUnit</a></li>
+<li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li>
+<li><a href="http://nutch.apache.org/" title="Open Source Web Search Software">Nutch</a></li>
+<li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service composition.">ODE</a></li>
+<li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li>
+<li><a href="http://oltu.apache.org/" title="OAuth protocol implementation in Java">Oltu</a></li>
+<li><a href="http://onami.apache.org/" title="Development and maintenance of a set of Google Guice extensions">Onami</a></li>
+<li><a href="http://oodt.apache.org/" title="Object Oriented Data Technology (middleware metadata)">OODT</a></li>
+<li><a href="http://oozie.apache.org/" title="A workflow scheduler system to manage Apache Hadoop jobs.">Oozie</a></li>
+<li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li>
+<li><a href="http://openmeetings.apache.org/" title="OpenMeetings: Web-Conferencing and real-time collaboration">OpenMeetings</a></li>
+<li><a href="http://opennlp.apache.org/" title="Machine learning based toolkit for the processing of natural language text">OpenNLP</a></li>
+<li><a href="http://openoffice.apache.org/" title="An open-source, office-document productivity suite">OpenOffice</a></li>
+<li><a href="http://openwebbeans.apache.org/" title="OpenWebBeans: JSR-299 Context and Dependency Injection for Java EE Platform Implementation">OpenWebBeans</a></li>
+<li><a href="http://pdfbox.apache.org/" title="Java library for working with PDF documents">PDFBox</a></li>
+<li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li>
+<li><a href="http://pig.apache.org/" title="Platform for analyzing large data sets">Pig</a></li>
+<li><a href="http://pivot.apache.org/" title="Rich Internet applications in Java">Pivot</a></li>
+<li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound and OOXML Documents">POI</a></li>
+<li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li>
+<li><a href="http://qpid.apache.org/" title="Multiple language implementation of the latest Advanced Message Queuing Protocol (AMQP)">Qpid</a></li>
+<li><a href="http://rave.apache.org/" title="Web and social mashup engine">Rave</a></li>
+<li><a href="http://river.apache.org/" title="Jini service oriented architecture">River</a></li>
+<li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li>
+<li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li>
+<li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li>
+<li><a href="http://shindig.apache.org/" title="Opensocial Reference Implementation">Shindig</a></li>
+<li><a href="http://shiro.apache.org/" title="Powerful and easy-to-use application security framework">Shiro</a></li>
+<li><a href="http://sis.apache.org/" title="Spatial Information System">SIS</a></li>
+<li><a href="http://sling.apache.org/" title="Web Framework for JCR Content Repositories">Sling</a></li>
+<li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li>
+<li><a href="http://sqoop.apache.org/" title="Bulk Data Transfer for Hadoop and Structured Datastores">Sqoop</a></li>
+<li><a href="http://stanbol.apache.org/" title="Reusable components for semantic content management">Stanbol</a></li>
+<li><a href="http://steve.apache.org/" title="Apache's Python based single transferable vote software system">STeVe</a></li>
+<li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li>
+<li><a href="http://subversion.apache.org/" title="Version Control">Subversion</a></li>
+<li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li>
+<li><a href="http://syncope.apache.org/" title="Managing digital identities in enterprise environments">Syncope</a></li>
+<li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li>
+<li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">Tcl</a></li>
+<li><a href="http://thrift.apache.org/" title="Framework for scalable cross-language services development">Thrift</a></li>
+<li><a href="http://tika.apache.org" title="Content Analysis and Detection Toolkit">Tika</a></li>
+<li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li>
+<li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li>
+<li><a href="http://tomee.apache.org/" title="Java EE Web Profile built on Tomcat">TomEE</a></li>
+<li><a href="http://trafficserver.apache.org/" title="A fast, scalable and extensible HTTP/1.1 compliant caching proxy server">Traffic Server</a></li>
+<li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">Turbine</a></li>
+<li><a href="http://tuscany.apache.org/" title="An SCA based Service Composition Framework">Tuscany</a></li>
+<li><a href="http://uima.apache.org/" title="Framework and annotators for unstructured information analysis">UIMA</a></li>
+<li><a href="http://vcl.apache.org/" title="Virtual Computing Lab">VCL</a></li>
+<li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li>
+<li><a href="http://ws.apache.org/" title="Projects related to Web Services">Web Services</a></li>
+<li><a href="http://whirr.apache.org/" title="Libraries for running Cloud Services">Whirr</a></li>
+<li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li>
+<li><a href="http://wink.apache.org/" title="RESTful Web services Framework">Wink</a></li>
+<li><a href="http://wookie.apache.org/" title="Widgets for Applications">Wookie</a></li>
+<li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li>
+<li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li>
+<li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li>
+<li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li>
+<li><a href="http://zookeeper.apache.org/" title="Centralized service for maintaining configuration information">ZooKeeper</a></li>
+</ul>
+      </div>
+      <div class="grid_3">
+        <h4>Foundation</h4>
+        <ul>
+          <li><a href="/foundation/faq.html">FAQ</a></li> 
+          <li><a href="/foundation/glossary.html">Glossary</a></li> 
+          <li><a href="/licenses/" title="Overview of the Apache Licenese">Licenses</a></li> 
+          <li><a href="/foundation/marks/" title="Apache marks policies and listing">Trademarks</a></li>  
+          <li><a href="/foundation/news.html" title="Official news feed of Foundation announcements">News</a></li> 
+          <li><a href="/press/" title="Press, Media, and Analyst contact">Press Inquiries</a></li> 
+          <li><a href="/foundation/records/" title="Formal corporate records and board meeting minutes">Public Records</a></li> 
+          <li><a href="/foundation/mailinglists.html" title="Mailing lists and Apache">Mailing Lists</a></li> 
+          <li><a href="/foundation/sponsorship.html" title="Sponsor the Foundation">Sponsorship</a></li> 
+          <li><a href="/foundation/contributing.html" title="Donate to the Foundation">Donations</a></li> 
+          <li><a href="/foundation/buy_stuff.html" title="Buy Apache branded merchandise">Buy Stuff</a></li> 
+          <li><a href="/foundation/thanks.html" title="Thank you to our Sponsors">Thanks</a></li> 
+          <li><a href="/foundation/contact.html" title="Contact Us">Contact</a></li> 
+        </ul>
+      </div>
+      <div class="grid_3 suffix_1">
+        <h4>Foundation Projects</h4>
+        <ul>
+          <li><a href="http://attic.apache.org/" title="Inactive projects repository">Attic</a></li> 
+          <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
+          <li><a href="http://community.apache.org/" title="Helping newcomers to the ASF">Community Development</a></li> 
+          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
+          <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
+          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
+          <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
+          <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
+          <li><a href="/security/" title="Security">Security</a></li> 
+          <li><a href="/travel/" title="Travel Assistance">Travel Assistance</a></li> 
+        </ul>
+      </div>
+      
+      <div class="grid_3">
+        <h4>Community</h4>
+        <ul>
+          <li><a href="http://people.apache.org/" title="Apache committer homepages">People</a></li> 
+          <li><a href="/memorials/" title="In memoriam of past committers">Memorials</a></li> 
+          <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
+          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
+          <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
+        </ul>
+      </div>
+      <div class="grid_3">
+        <h4>How It Works</h4>
+        <ul>
+          <li><a href="/foundation/how-it-works.html">Introduction</a></li> 
+          <li><a href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li> 
+          <li><a href="/foundation/how-it-works.html#structure">Structure</a></li> 
+          <li><a href="/foundation/how-it-works.html#roles">Roles</a></li> 
+          <li><a href="/foundation/how-it-works.html#management">Collaboration</a></li> 
+          <li><a href="/foundation/how-it-works.html#incubator">Incubator</a></li> 
+          <li><a href="/foundation/how-it-works.html#other">Other entities</a></li> 
+          <li><a href="/foundation/glossary.html">Glossary</a></li> 
+          <li><a href="/foundation/voting.html">Voting</a></li> 
+        </ul>
+      </div>
+    </div>
+    <div class="clear"></div>
+    
+    </div>
+    <div id="copyright" class="container_16">
+      <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+    </div>
+  </body>
+</html>
diff --git a/axis-rt-core/src/test/resources/test/saaj/slashdot.xml b/axis-rt-core/src/test/resources/test/saaj/slashdot.xml
new file mode 100644
index 000000000..021c3e622
--- /dev/null
+++ b/axis-rt-core/src/test/resources/test/saaj/slashdot.xml
@@ -0,0 +1,184 @@
+<?xml version="1.0"?><backslash
+xmlns:backslash="http://slashdot.org/backslash.dtd">
+
+	<story>
+		<title>Ford Dumping Windows For QNX In New Vehicles</title>
+		<url>http://slashdot.org/story/14/02/25/0256235/ford-dumping-windows-for-qnx-in-new-vehicles</url>
+		<time>2014-02-25 05:02:00</time>
+		<author>Unknown Lamer</author>
+		<department>back-to-the-classics</department>
+		<topic>3017</topic>
+		<comments>0</comments>
+		<section>technology</section>
+		<image>os_64.png</image>
+	</story>
+
+	<story>
+		<title>The Higgs Boson Re-Explained By the Mick Jagger of Physics</title>
+		<url>http://slashdot.org/story/14/02/25/0318219/the-higgs-boson-re-explained-by-the-mick-jagger-of-physics</url>
+		<time>2014-02-25 04:05:00</time>
+		<author>Unknown Lamer</author>
+		<department>just-before-he-turned-into-a-cup-of-oj</department>
+		<topic>100</topic>
+		<comments>12</comments>
+		<section>science</section>
+		<image>science_64.png</image>
+	</story>
+
+	<story>
+		<title>Complete Microsoft EMET Bypass Developed</title>
+		<url>http://slashdot.org/story/14/02/25/0139202/complete-microsoft-emet-bypass-developed</url>
+		<time>2014-02-25 03:04:00</time>
+		<author>Unknown Lamer</author>
+		<department>just-a-teeny-tiny-bug</department>
+		<topic>77</topic>
+		<comments>34</comments>
+		<section>technology</section>
+		<image>windows_64.png</image>
+	</story>
+
+	<story>
+		<title>US War Machine Downsizing?</title>
+		<url>http://slashdot.org/story/14/02/25/0045203/us-war-machine-downsizing</url>
+		<time>2014-02-25 01:04:00</time>
+		<author>Unknown Lamer</author>
+		<department>how-will-we-defeat-zombie-stalin-now?</department>
+		<topic>363</topic>
+		<comments>192</comments>
+		<section>technology</section>
+		<image>military_64.png</image>
+	</story>
+
+	<story>
+		<title>New Release of DICE, the CPU-Less Arcade Game Emulator, Adds Four Games</title>
+		<url>http://slashdot.org/story/14/02/25/001257/new-release-of-dice-the-cpu-less-arcade-game-emulator-adds-four-games</url>
+		<time>2014-02-25 00:56:00</time>
+		<author>Unknown Lamer</author>
+		<department>knew-you-got-that-16-core-machine-for-a-reason</department>
+		<topic>509</topic>
+		<comments>19</comments>
+		<section>games</section>
+		<image>emulation_64.png</image>
+	</story>
+
+	<story>
+		<title>Publishers Withdraw More Than 120 Fake Papers</title>
+		<url>http://slashdot.org/story/14/02/25/006257/publishers-withdraw-more-than-120-fake-papers</url>
+		<time>2014-02-25 00:31:00</time>
+		<author>Unknown Lamer</author>
+		<department>trolling-journals-for-no-particular-reason</department>
+		<topic>357583</topic>
+		<comments>41</comments>
+		<section>news</section>
+		<image>themedia_64.png</image>
+	</story>
+
+	<story>
+		<title>SpaceX Testing Landing Legs On Next Falcon9 Rocket</title>
+		<url>http://slashdot.org/story/14/02/24/2311234/spacex-testing-landing-legs-on-next-falcon9-rocket</url>
+		<time>2014-02-24 23:52:00</time>
+		<author>Unknown Lamer</author>
+		<department>crazy-enough-to-work</department>
+		<topic>147</topic>
+		<comments>36</comments>
+		<section>science</section>
+		<image>space_64.png</image>
+	</story>
+
+	<story>
+		<title>Oklahoma Schools Required To Teach Students Personal Finance</title>
+		<url>http://slashdot.org/story/14/02/24/2139226/oklahoma-schools-required-to-teach-students-personal-finance</url>
+		<time>2014-02-24 23:12:00</time>
+		<author>samzenpus</author>
+		<department>value-of-a-dollar</department>
+		<topic>253</topic>
+		<comments>196</comments>
+		<section>news</section>
+		<image>money_64.png</image>
+	</story>
+
+	<story>
+		<title>Why Nissan Is Talking To Tesla Model S Owners</title>
+		<url>http://slashdot.org/story/14/02/24/2131219/why-nissan-is-talking-to-tesla-model-s-owners</url>
+		<time>2014-02-24 22:29:00</time>
+		<author>samzenpus</author>
+		<department>how-do-you-like-us-now?</department>
+		<topic>1971</topic>
+		<comments>183</comments>
+		<section>technology</section>
+		<image>transportation_64.png</image>
+	</story>
+
+	<story>
+		<title>DARPA Looks To End the Scourge of Counterfeit Computer Gear</title>
+		<url>http://slashdot.org/story/14/02/24/1948202/darpa-looks-to-end-the-scourge-of-counterfeit-computer-gear</url>
+		<time>2014-02-24 21:47:00</time>
+		<author>samzenpus</author>
+		<department>knocking-out-knock-offs</department>
+		<topic>828</topic>
+		<comments>67</comments>
+		<section>hardware</section>
+		<image>crime_64.png</image>
+	</story>
+
+	<story>
+		<title>Does Relying On an IDE Make You a Bad Programmer?</title>
+		<url>http://slashdot.org/story/14/02/24/1845209/does-relying-on-an-ide-make-you-a-bad-programmer</url>
+		<time>2014-02-24 21:02:00</time>
+		<author>samzenpus</author>
+		<department>speak-up</department>
+		<topic>22</topic>
+		<comments>439</comments>
+		<section>developers</section>
+		<image>programming_64.png</image>
+	</story>
+
+	<story>
+		<title>The Ever So Unlikely Tale of How ARM Came To Rule the World</title>
+		<url>http://slashdot.org/story/14/02/24/1840217/the-ever-so-unlikely-tale-of-how-arm-came-to-rule-the-world</url>
+		<time>2014-02-24 20:20:00</time>
+		<author>samzenpus</author>
+		<department>top-of-the-class</department>
+		<topic>84</topic>
+		<comments>81</comments>
+		<section>mobile</section>
+		<image>business_64.png</image>
+	</story>
+
+	<story>
+		<title>Harold Ramis Dies At 69</title>
+		<url>http://slashdot.org/story/14/02/24/203208/harold-ramis-dies-at-69</url>
+		<time>2014-02-24 20:11:00</time>
+		<author>samzenpus</author>
+		<department>print-is-dead</department>
+		<topic>359</topic>
+		<comments>116</comments>
+		<section>entertainment</section>
+		<image>movies_64.png</image>
+	</story>
+
+	<story>
+		<title>Apocalypse NAO: College Studies the Theological Ramifications of Robotics</title>
+		<url>http://slashdot.org/story/14/02/24/192203/apocalypse-nao-college-studies-the-theological-ramifications-of-robotics</url>
+		<time>2014-02-24 19:55:00</time>
+		<author>samzenpus</author>
+		<department>why-did-you-program-me-to-sin?</department>
+		<topic>2248</topic>
+		<comments>135</comments>
+		<section>idle</section>
+		<image>robot_64.png</image>
+	</story>
+
+	<story>
+		<title>Book Review: Sudo Mastery: User Access Control For Real People</title>
+		<url>http://slashdot.org/story/14/02/24/1415216/book-review-sudo-mastery-user-access-control-for-real-people</url>
+		<time>2014-02-24 19:36:00</time>
+		<author>samzenpus</author>
+		<department>read-all-about-it</department>
+		<topic>172</topic>
+		<comments>76</comments>
+		<section>bookreview</section>
+		<image>books_64.png</image>
+	</story>
+
+</backslash>

From ab82d6ae7eb1fefc4c0cdb0f0a5466b74e83a04c Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 25 Feb 2014 08:29:38 +0000
Subject: [PATCH 037/133] Added .gitignore.

---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..23bb21a23
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+.project
+.classpath
+.settings
+target
\ No newline at end of file

From f6d3217e4c51ba94250ecc650c62c53e54742380 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 25 Feb 2014 13:16:40 +0000
Subject: [PATCH 038/133] Avoid connections to remote resources during unit
 tests, especially if they are no longer available.

---
 .../src/main/resources/xmethods/README.txt    |   3 +
 .../xmethods/delayed-quotes-request.xml       |  10 ++
 .../xmethods/delayed-quotes-response.xml      |  10 ++
 .../webapp/WEB-INF/dispatcher-servlet.xml     |  13 ++
 samples/jaxm-sample/pom.xml                   | 116 ++++++++++++++++++
 .../java/samples/jaxm/DelayedStockQuote.java  |  12 +-
 .../java/test/functional/TestJAXMSamples.java |  42 +------
 7 files changed, 165 insertions(+), 41 deletions(-)
 create mode 100644 interop-mock/src/main/resources/xmethods/README.txt
 create mode 100644 interop-mock/src/main/resources/xmethods/delayed-quotes-request.xml
 create mode 100644 interop-mock/src/main/resources/xmethods/delayed-quotes-response.xml

diff --git a/interop-mock/src/main/resources/xmethods/README.txt b/interop-mock/src/main/resources/xmethods/README.txt
new file mode 100644
index 000000000..5d09e1f45
--- /dev/null
+++ b/interop-mock/src/main/resources/xmethods/README.txt
@@ -0,0 +1,3 @@
+* delayed-quotes-request.xml is basically the request produced by the JAXM sample.
+* delayed-quotes-response.xml is a response constructed from samples found on the Web
+  (the original SOAP endpoint is no longer availalbe).
\ No newline at end of file
diff --git a/interop-mock/src/main/resources/xmethods/delayed-quotes-request.xml b/interop-mock/src/main/resources/xmethods/delayed-quotes-request.xml
new file mode 100644
index 000000000..1291e49ac
--- /dev/null
+++ b/interop-mock/src/main/resources/xmethods/delayed-quotes-request.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <ns:getQuote xmlns:ns="urn:xmethods-delayed-quotes">
+      <symbol>SUNW</symbol>
+    </ns:getQuote>
+  </env:Body>
+</env:Envelope>
diff --git a/interop-mock/src/main/resources/xmethods/delayed-quotes-response.xml b/interop-mock/src/main/resources/xmethods/delayed-quotes-response.xml
new file mode 100644
index 000000000..8674fc85e
--- /dev/null
+++ b/interop-mock/src/main/resources/xmethods/delayed-quotes-response.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<env:Envelope xmlns:env="http://schemas.xmlsoap.org/soap/envelope/"
+              xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+              xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <env:Body>
+    <ns:getQuoteResponse xmlns:ns="urn:xmethods-delayed-quotes" env:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/">
+      <Result xsi:type="xsd:float">3.67</Result>
+    </ns:getQuoteResponse>
+  </env:Body>
+</env:Envelope>
diff --git a/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index bfe9fbc47..02d54db64 100644
--- a/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -293,4 +293,17 @@
             </list>
         </property>
     </bean>
+    
+    <!-- Mock for XMethods stock quote service (http://64.124.140.30/soap) -->
+    
+    <bean name="/xmethods/delayed-quotes" class="org.apache.axis.test.interop.mock.MockPostHandler">
+        <property name="exchanges">
+            <list>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:xmethods/delayed-quotes-request.xml"/>
+                    <property name="response" value="classpath:xmethods/delayed-quotes-response.xml"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
 </beans>
diff --git a/samples/jaxm-sample/pom.xml b/samples/jaxm-sample/pom.xml
index de488611e..525c7871e 100644
--- a/samples/jaxm-sample/pom.xml
+++ b/samples/jaxm-sample/pom.xml
@@ -38,5 +38,121 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>interop-mock</artifactId>
+            <version>${project.version}</version>
+            <type>war</type>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <skip>true</skip>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>reserve-network-port</id>
+                        <goals>
+                            <goal>reserve-network-port</goal>
+                        </goals>
+                        <phase>pre-integration-test</phase>
+                        <configuration>
+                            <portNames>
+                                <portName>jetty.httpPort</portName>
+                                <portName>jetty.stopPort</portName>
+                            </portNames>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <includeTypes>war</includeTypes>
+                            <stripVersion>true</stripVersion>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <configuration>
+                    <war>${project.build.directory}/interop-mock.war</war>
+                    <stopKey>foo</stopKey>
+                    <stopPort>${jetty.stopPort}</stopPort>
+                    <connectors>
+                        <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+                            <port>${jetty.httpPort}</port>
+                            <maxIdleTime>60000</maxIdleTime>
+                        </connector>
+                    </connectors>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>start-jetty</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>deploy-war</goal>
+                        </goals>
+                        <configuration>
+                            <daemon>true</daemon>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>stop-jetty</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                        <configuration>
+                            <includes>
+                                <include>**/Test*.java</include>
+                            </includes>
+                            <systemPropertyVariables>
+                                <jetty.httpPort>${jetty.httpPort}</jetty.httpPort>
+                            </systemPropertyVariables>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>
diff --git a/samples/jaxm-sample/src/main/java/samples/jaxm/DelayedStockQuote.java b/samples/jaxm-sample/src/main/java/samples/jaxm/DelayedStockQuote.java
index cc68ac91f..9929392d9 100644
--- a/samples/jaxm-sample/src/main/java/samples/jaxm/DelayedStockQuote.java
+++ b/samples/jaxm-sample/src/main/java/samples/jaxm/DelayedStockQuote.java
@@ -30,6 +30,16 @@
 import java.util.Iterator;
 
 public class DelayedStockQuote {
+    private final String url;
+    
+    public DelayedStockQuote() {
+        this("http://64.124.140.30/soap");
+    }
+    
+    public DelayedStockQuote(String url) {
+        this.url = url;
+    }
+    
     public static void main(String[] args) throws Exception {
         DelayedStockQuote stockQuote = new DelayedStockQuote();
         System.out.print("The last price for SUNW is " + stockQuote.getStockQuote("SUNW"));
@@ -57,7 +67,7 @@ public String getStockQuote(String tickerSymbol) throws Exception {
         SOAPElement symbol = gltp.addChildElement(name);
         symbol.addTextNode(tickerSymbol);
 
-        URLEndpoint endpoint = new URLEndpoint("http://64.124.140.30/soap");
+        URLEndpoint endpoint = new URLEndpoint(url);
         SOAPMessage response = con.call(message, endpoint);
         con.close();
 
diff --git a/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java b/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
index b5326d792..282493cb7 100644
--- a/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
+++ b/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
@@ -17,24 +17,10 @@
 package test.functional;
 
 import junit.framework.TestCase;
-import org.apache.axis.AxisFault;
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.commons.logging.Log;
 import samples.jaxm.DelayedStockQuote;
 
-import javax.xml.messaging.URLEndpoint;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Name;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPBodyElement;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPMessage;
-import java.net.SocketException;
-
-
 /**
  * Test the JAX-RPC compliance samples.
  */
@@ -76,32 +62,8 @@ public TestJAXMSamples(String name) {
 //    } // testGetQuote
 
     public void testDelayedStockQuote() throws Exception {
-        try {
-            log.info("Testing JAXM DelayedStockQuote sample.");
-            DelayedStockQuote stockQuote = new DelayedStockQuote();
-            System.out.print("The last price for SUNW is " + stockQuote.getStockQuote("SUNW"));
-            log.info("Test complete.");
-        } catch (javax.xml.soap.SOAPException e) {
-            Throwable t = e.getCause();
-            if (t != null) {
-                t.printStackTrace();
-                if (t instanceof AxisFault) {
-                  AxisFault af = (AxisFault) t;
-                  if ((af.detail instanceof SocketException)
-							|| (af.getFaultCode().getLocalPart().equals("HTTP"))) {
-						System.out.println("Connect failure caused JAXM DelayedStockQuote to be skipped.");
-						return;
-					}
-                }
-                throw new Exception("Fault returned from test: " + t);
-            } else {
-                e.printStackTrace();
-                throw new Exception("Exception returned from test: " + e);
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-            throw new Exception("Fault returned from test: " + t);
-        }
+        DelayedStockQuote stockQuote = new DelayedStockQuote("http://localhost:" + System.getProperty("jetty.httpPort") + "/xmethods/delayed-quotes");
+        assertEquals("3.67", stockQuote.getStockQuote("SUNW"));
     } // testGetQuote
     
     public static void main(String args[]) throws Exception {

From 2ff08b70a165572e9923f5585058d808ac2c80cf Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 25 Feb 2014 13:17:16 +0000
Subject: [PATCH 039/133] Ensure that the wsdl2java Ant task correctly reports
 any kind of failure, not only failures that trigger a java.lang.Exception,
 but also failures that trigger a java.lang.Error.

---
 .../java/org/apache/axis/wsdl/gen/Parser.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
index 2ddc0cfdd..866028596 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
@@ -345,7 +345,14 @@ public void run(String wsdlURI) throws Exception {
         }
 
         if (runnable.getFailure() != null) {
-            throw runnable.getFailure();
+            Throwable failure = runnable.getFailure();
+            if (failure instanceof Exception) {
+                throw (Exception)failure;
+            } else if (failure instanceof Error){
+                throw (Error)failure;
+            } else {
+                throw new Error(failure);
+            }
         }
     }    // run
 
@@ -363,7 +370,7 @@ private class WSDLRunnable implements Runnable {
         private String wsdlURI;
 
         /** Field failure */
-        private Exception failure = null;
+        private Throwable failure = null;
 
         /**
          * Constructor WSDLRunnable
@@ -384,7 +391,7 @@ public void run() {
             try {
                 symbolTable.populate(wsdlURI, username, password);
                 generate(symbolTable);
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 failure = e;
             }
         }    // run
@@ -394,7 +401,7 @@ public void run() {
          *
          * @return
          */
-        public Exception getFailure() {
+        public Throwable getFailure() {
             return failure;
         }    // getFailure
     }    // WSDLRunnable

From 611e15223ea94385a9a07ef5e67da3f529e35f06 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 25 Feb 2014 13:17:32 +0000
Subject: [PATCH 040/133] Get rid of the commons-lang depenceny introduced in
 r1418233.

---
 axis-codegen/pom.xml                          |  4 ---
 .../axis/wsdl/toJava/JavaDeployWriter.java    |  2 +-
 .../org/apache/axis/utils/StringUtils.java    | 26 +++++++++++++++++++
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/axis-codegen/pom.xml b/axis-codegen/pom.xml
index 05d683536..f53a6f228 100644
--- a/axis-codegen/pom.xml
+++ b/axis-codegen/pom.xml
@@ -45,10 +45,6 @@
             <artifactId>axis-model</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
index 2de5905bb..2a2168753 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
@@ -32,6 +32,7 @@
 import org.apache.axis.model.wsdd.WSDDUtil;
 import org.apache.axis.utils.JavaUtils;
 import org.apache.axis.utils.Messages;
+import org.apache.axis.utils.StringUtils;
 import org.apache.axis.wsdl.symbolTable.BindingEntry;
 import org.apache.axis.wsdl.symbolTable.FaultInfo;
 import org.apache.axis.wsdl.symbolTable.Parameter;
@@ -39,7 +40,6 @@
 import org.apache.axis.wsdl.symbolTable.SchemaUtils;
 import org.apache.axis.wsdl.symbolTable.SymbolTable;
 import org.apache.axis.wsdl.symbolTable.TypeEntry;
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 
 import javax.wsdl.Binding;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
index 383fd37db..7fa7c838a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
@@ -19,6 +19,8 @@
 import org.apache.axis.InternalException;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
 import java.util.List;
 import java.io.Writer;
 import java.io.IOException;
@@ -120,6 +122,30 @@ public static String[] split(String str, char separatorChar) {
         return (String[]) list.toArray(new String[list.size()]);
     }
 
+    /**
+     * Joins the elements of the provided collection into a single string using
+     * the given separator.
+     * 
+     * @param items
+     *            the collection of strings to join together
+     * @param separatorChar
+     *            the separator character to use
+     * @return the joined string
+     */
+    public static String join(Collection items, char separatorChar) {
+        StringBuffer buffer = new StringBuffer();
+        boolean first = true;
+        for (Iterator it = items.iterator(); it.hasNext(); ) {
+            if (first) {
+                first = false;
+            } else {
+                buffer.append(separatorChar);
+            }
+            buffer.append((String)it.next());
+        }
+        return buffer.toString();
+    }
+    
     // Empty checks
     //-----------------------------------------------------------------------
     /**

From d130006283281a1ec8918ff4a6fea9effb037508 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 25 Feb 2014 13:18:19 +0000
Subject: [PATCH 041/133] * Realign the content of the binary distribution with
 Axis 1.4. In particular, include axis-model in the uber-JAR. * Update the
 relevant documentation.

---
 axis-model/pom.xml                     | 15 ++++++-----
 axis/pom.xml                           |  2 ++
 distribution/pom.xml                   | 12 ++++++---
 distribution/src/main/assembly/bin.xml | 35 +++++++++++++++++++++++---
 src/site/xdoc/artifacts.xml            |  6 ++++-
 src/site/xdoc/user-guide.xml           | 17 ++++++-------
 6 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index 5c6fcd99b..639cc38de 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -27,6 +27,13 @@
     </parent>
     <artifactId>axis-model</artifactId>
     <name>EMF Model for WSDD Files</name>
+    <url>${baseUrl}/model</url>
+    <distributionManagement>
+        <site>
+            <id>axis</id>
+            <url>${baseSiteUrl}/model</url>
+        </site>
+    </distributionManagement>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -99,14 +106,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <!-- TODO: skipping for now -->
-                <artifactId>maven-site-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                    <skipDeploy>true</skipDeploy>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/axis/pom.xml b/axis/pom.xml
index d790d7cb3..01a094ce5 100644
--- a/axis/pom.xml
+++ b/axis/pom.xml
@@ -79,6 +79,7 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
+                                    <!-- Please keep src/site/xdoc/artifacts.xml in sync with this list -->
                                     <include>${project.groupId}:axis-rt-compat</include>
                                     <include>${project.groupId}:axis-rt-core</include>
                                     <include>${project.groupId}:axis-rt-databinding-castor</include>
@@ -90,6 +91,7 @@
                                     <include>${project.groupId}:axis-rt-transport-jms</include>
                                     <include>${project.groupId}:axis-rt-transport-http-hc3</include>
                                     <include>${project.groupId}:axis-rt-transport-mail</include>
+                                    <include>${project.groupId}:axis-model</include>
                                     <include>${project.groupId}:axis-codegen</include>
                                     <include>${project.groupId}:axis-tools</include>
                                     <include>${project.groupId}:soapmonitor-client</include>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index ec92e918a..d62f31923 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>axis-rt-core</artifactId>
+            <artifactId>axis</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
@@ -44,14 +44,18 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>axis-tools</artifactId>
+            <artifactId>axis-jaxrpc</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>axis-standalone-server</artifactId>
+            <artifactId>axis-saaj</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -144,7 +148,7 @@
                         </goals>
                         <configuration>
                             <outputDirectory>${project.build.directory}/axis-${project.version}/lib</outputDirectory>
-                            <includeArtifactIds>junit</includeArtifactIds>
+                            <includeArtifactIds>junit,mail</includeArtifactIds>
                             <skip>${skipTests}</skip>
                         </configuration>
                     </execution>
diff --git a/distribution/src/main/assembly/bin.xml b/distribution/src/main/assembly/bin.xml
index 49a7f3a18..1acddae3a 100644
--- a/distribution/src/main/assembly/bin.xml
+++ b/distribution/src/main/assembly/bin.xml
@@ -177,10 +177,37 @@
         <dependencySet>
             <useProjectArtifact>false</useProjectArtifact>
             <outputDirectory>lib</outputDirectory>
-            <excludes>
-                <exclude>ant:ant:jar</exclude>
-                <exclude>junit:junit:jar</exclude>
-            </excludes>
+            <outputFileNameMapping>${artifact.artifactId}.jar</outputFileNameMapping>
+            <includes>
+                <include>*:axis:jar</include>
+                <include>*:axis-ant:jar</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>jaxrpc.jar</outputFileNameMapping>
+            <includes>
+                <include>*:axis-jaxrpc:jar</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <outputFileNameMapping>saaj.jar</outputFileNameMapping>
+            <includes>
+                <include>*:axis-saaj:jar</include>
+            </includes>
+        </dependencySet>
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>lib</outputDirectory>
+            <includes>
+                <include>*:commons-discovery:jar</include>
+                <include>*:commons-logging:jar</include>
+                <include>*:log4j:jar</include>
+                <include>*:wsdl4j:jar</include>
+            </includes>
         </dependencySet>
     </dependencySets>
 </assembly>
diff --git a/src/site/xdoc/artifacts.xml b/src/site/xdoc/artifacts.xml
index 4536663ee..de3978dca 100644
--- a/src/site/xdoc/artifacts.xml
+++ b/src/site/xdoc/artifacts.xml
@@ -73,7 +73,7 @@
                     </tr>
                     <tr>
                         <td>Runtime Core</td>
-                        <td style="text-align: center; vertical-align:middle" colspan="2" rowspan="15">axis</td>
+                        <td style="text-align: center; vertical-align:middle" colspan="2" rowspan="16">axis</td>
                         <td style="text-align: center"><a href="core/dependencies.html">axis-rt-core</a></td>
                     </tr>
                     <tr>
@@ -108,6 +108,10 @@
                         <td>Mail Transport</td>
                         <td style="text-align: center"><a href="transports/mail/dependencies.html">axis-rt-transport-mail</a></td>
                     </tr>
+                    <tr>
+                        <td>EMF Models</td>
+                        <td style="text-align: center"><a href="model/dependencies.html">axis-model</a></td>
+                    </tr>
                     <tr>
                         <td>Code Generator</td>
                         <td style="text-align: center"><a href="codegen/dependencies.html">axis-codegen</a></td>
diff --git a/src/site/xdoc/user-guide.xml b/src/site/xdoc/user-guide.xml
index 4ae1de914..d99561f64 100644
--- a/src/site/xdoc/user-guide.xml
+++ b/src/site/xdoc/user-guide.xml
@@ -120,17 +120,16 @@
 
 <p>See the <a href="install.html">Axis Installation Guide</a> for instructions on installing Axis as a web application on your J2EE server.</p>
 
-<p>Before running the examples in this guide, you'll need to make sure that your CLASSPATH includes (Note: If you build Axis from a CVS checkout, these will be in xml-axis/java/build/lib instead of axis-1_2/lib):</p>
+<p>Before running the examples in this guide, you'll need to make sure that your CLASSPATH includes the following elements from the Axis binary distribution:</p>
 
 <ul>
-  <li>axis-1_2/lib/axis.jar</li>
-  <li>axis-1_2/lib/jaxrpc.jar</li>
-  <li>axis-1_2/lib/saaj.jar</li>
-  <li>axis-1_2/lib/commons-logging.jar</li>
-  <li>axis-1_2/lib/commons-discovery.jar</li>
-  <li>axis-1_2/lib/wsdl4j.jar</li>
-  <li>axis-1_2/ <i>(for the sample code)</i></li>
-  <li>A JAXP-1.1 compliant XML parser such as Xerces or Crimson. We recommend <a href="http://xml.apache.org/xerces2-j/">Xerces</a>, as it is the one that the product has been tested against.</li>
+  <li>axis-<i>&lt;version></i>/lib/axis.jar</li>
+  <li>axis-<i>&lt;version></i>/lib/jaxrpc.jar</li>
+  <li>axis-<i>&lt;version></i>/lib/saaj.jar</li>
+  <li>axis-<i>&lt;version></i>/lib/commons-logging-<i>&lt;version></i>.jar</li>
+  <li>axis-<i>&lt;version></i>/lib/commons-discovery-<i>&lt;version></i>.jar</li>
+  <li>axis-<i>&lt;version></i>/lib/wsdl4j-<i>&lt;version></i>.jar</li>
+  <li>axis-<i>&lt;version></i>/ <i>(for the sample code)</i></li>
 </ul>
 
 </section>

From 5a4d39b7df7eee1cd1fa9ec1595a8ece58880bf4 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 11:41:45 +0000
Subject: [PATCH 042/133] Use StringBuffer where appropriate.

---
 .../org/apache/axis/wsdl/symbolTable/SymTabEntry.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
index 142410b33..152e13490 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
@@ -147,9 +147,10 @@ public String toString() {
      */
     protected String toString(String indent) {
 
-        String string = indent + "QName:         " + qname + '\n' + indent
-                + "name:          " + name + '\n' + indent
-                + "isReferenced?  " + isReferenced + '\n';
+        StringBuffer buffer = new StringBuffer();
+        buffer.append(indent).append("QName:         ").append(qname).append('\n');
+        buffer.append(indent).append("name:          ").append(name).append('\n');
+        buffer.append(indent).append("isReferenced?  ").append(isReferenced).append('\n');
         String prefix = indent + "dynamicVars:   ";
         Iterator entries = dynamicVars.entrySet().iterator();
 
@@ -157,10 +158,10 @@ protected String toString(String indent) {
             Map.Entry entry = (Map.Entry) entries.next();
             Object key = entry.getKey();
 
-            string += prefix + key + " = " + entry.getValue() + '\n';
+            buffer.append(prefix).append(key).append(" = ").append(entry.getValue()).append('\n');
             prefix = indent + "               ";
         }
 
-        return string;
+        return buffer.toString();
     }    // toString
 }    // abstract class SymTabEntry

From 8bbd01784ed1fbf29e15d6adeb52968605183cf4 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 11:42:17 +0000
Subject: [PATCH 043/133] Remove unnecessary method override.

---
 .../java/org/apache/axis/wsdl/symbolTable/TypeEntry.java | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
index 7b3233f2e..d997c4e2c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
@@ -432,15 +432,6 @@ public void setItemQName(QName itemQName) {
         this.itemQName = itemQName;
     }
 
-    /**
-     * Get string representation.
-     * 
-     * @return 
-     */
-    public String toString() {
-        return toString("");
-    }
-
     /**
      * Get string representation with indentation
      * 

From 2a4495781227b7575e8bde85bb68988464b2c6eb Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 11:42:40 +0000
Subject: [PATCH 044/133] Output the class name in the toString method of all
 symbol table entries, not just type entries.

---
 .../main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java  | 1 +
 .../main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
index 152e13490..5763352bb 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymTabEntry.java
@@ -149,6 +149,7 @@ protected String toString(String indent) {
 
         StringBuffer buffer = new StringBuffer();
         buffer.append(indent).append("QName:         ").append(qname).append('\n');
+        buffer.append(indent).append("Class:         ").append(this.getClass().getName()).append('\n'); 
         buffer.append(indent).append("name:          ").append(name).append('\n');
         buffer.append(indent).append("isReferenced?  ").append(isReferenced).append('\n');
         String prefix = indent + "dynamicVars:   ";
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
index d997c4e2c..e9620a181 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
@@ -448,7 +448,6 @@ protected String toString(String indent) {
         }
 
         return super.toString(indent) 
-                + indent + "Class:         " + this.getClass().getName() + "\n" 
                 + indent + "Base?:         " + isBaseType + "\n" 
                 + indent + "Undefined?:    " + undefined + "\n" 
                 + indent + "isSimpleType?  " + isSimpleType + "\n"

From 8f9990bad28e6732195826602567970a33083c13 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 11:43:15 +0000
Subject: [PATCH 045/133] Some code simplifications.

---
 .../axis/wsdl/toJava/JavaDefinitionWriter.java | 13 +------------
 .../axis/wsdl/toJava/JavaGeneratorFactory.java | 18 ++++++------------
 .../axis/wsdl/toJava/JavaTypeWriter.java       |  5 +----
 .../org/apache/axis/wsdl/toJava/Utils.java     | 15 ++++++---------
 4 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
index 8e1861477..2cbf09eca 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDefinitionWriter.java
@@ -109,19 +109,8 @@ protected void writeFaults() throws IOException {
             // by JavaTypeWriter.
             MessageEntry me =
                     symbolTable.getMessageEntry(message.getQName());
-            boolean emitSimpleFault = true;
 
-            if (me != null) {
-                Boolean complexTypeFault = (Boolean) me.getDynamicVar(
-                        JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
-                if ((complexTypeFault != null)
-                        && complexTypeFault.booleanValue()) {
-                    emitSimpleFault = false;
-                }
-            }
-
-            if (emitSimpleFault) {
+            if (me == null || !Utils.isFaultComplex(me)) {
                 try {
                     JavaFaultWriter writer = new JavaFaultWriter(emitter,
                             symbolTable, faultInfo);
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
index 4e44e9580..af9542344 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
@@ -805,10 +805,7 @@ private void setFaultContext(FaultInfo fault, SymbolTable symbolTable) {
             } else {
 
                 // Complex Type Exception
-                Boolean isComplexFault = (Boolean) te.getDynamicVar(
-                        JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
-                if ((isComplexFault == null) || !isComplexFault.booleanValue()) {
+                if (!Utils.isFaultComplex(te)) {
 
                     // Mark the type as a complex type fault
                     te.setDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT,
@@ -1153,8 +1150,8 @@ && sameJavaClass(entry.getName(),
                                 }                                                                
                                 
                                 // Appended Suffix for avoiding name collisions (JAX-RPC 1.1)
-                                Boolean isComplexTypeFault = (Boolean)entry.getDynamicVar(COMPLEX_TYPE_FAULT);
-                                if ((isComplexTypeFault != null) && isComplexTypeFault.booleanValue()) {
+                                boolean isComplexTypeFault = Utils.isFaultComplex(entry);
+                                if (isComplexTypeFault) {
                                     entry.setName(mangleName(entry.getName(), EXCEPTION_SUFFIX));
                                 } 
                                 else {
@@ -1173,13 +1170,12 @@ && sameJavaClass(entry.getName(),
                                 }           
                                 
                                 // Need to resolve a complex-type exception message.
-                                if ((isComplexTypeFault != null) && isComplexTypeFault.booleanValue()) {
+                                if (isComplexTypeFault) {
                                     // SHOULD update the exception class name of a referencing message entry.
                                     List messageEntries = symbolTable.getMessageEntries();
                                     for (int j = 0; j < messageEntries.size(); j++) {
                                         MessageEntry messageEntry = (MessageEntry)messageEntries.get(j);
-                                        Boolean isComplexTypeFaultMsg = (Boolean)messageEntry.getDynamicVar(COMPLEX_TYPE_FAULT);
-                                        if ((isComplexTypeFaultMsg != null) && (isComplexTypeFaultMsg.booleanValue())) {
+                                        if (Utils.isFaultComplex(messageEntry)) {
                                             QName exceptionDataType = (QName)messageEntry.getDynamicVar(EXCEPTION_DATA_TYPE);
                                             if (((TypeEntry)entry).getQName().equals(exceptionDataType)) {
                                                 String className = (String)messageEntry.getDynamicVar(EXCEPTION_CLASS_NAME);
@@ -1194,9 +1190,7 @@ && sameJavaClass(entry.getName(),
                         } else if (entry instanceof ServiceEntry) {
                             entry.setName(mangleName(entry.getName(), SERVICE_SUFFIX));
                         } else if (entry instanceof MessageEntry) {
-                            Boolean complexTypeFault = 
-                                (Boolean) entry.getDynamicVar(COMPLEX_TYPE_FAULT);
-                            if ((complexTypeFault == null) || !complexTypeFault.booleanValue()) {
+                            if (!Utils.isFaultComplex(entry)) {
                                 String exceptionClassName = (String) entry.getDynamicVar(EXCEPTION_CLASS_NAME);
                                 entry.setDynamicVar(EXCEPTION_CLASS_NAME, exceptionClassName + EXCEPTION_SUFFIX);
                             }                            
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
index 99c12804a..c02a28e54 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
@@ -160,10 +160,7 @@ protected JavaWriter getBeanWriter(Emitter emitter, TypeEntry type, TypeEntry ba
         // If this complexType is referenced in a
         // fault context, emit a bean-like exception
         // class
-        Boolean isComplexFault = (Boolean) type.getDynamicVar(
-                JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
-        if ((isComplexFault != null) && isComplexFault.booleanValue()) {
+        if (Utils.isFaultComplex(type)) {
 
             return new JavaBeanFaultWriter(emitter, type, elements, base,
                 attributes,
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
index 2f46662fa..ee66b107d 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
@@ -282,16 +282,13 @@ public static QName getFaultDataType(Message faultMessage,
     public static boolean isFaultComplex(Message faultMessage,
                                          SymbolTable symbolTable) {
 
-        MessageEntry me = symbolTable.getMessageEntry(faultMessage.getQName());
-        Boolean ret =
-                (Boolean) me.getDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
-
-        if (ret != null) {
-            return ret.booleanValue();
-        } else {
-            return false;
-        }
+        return isFaultComplex(symbolTable.getMessageEntry(faultMessage.getQName()));
     }    // isFaultComplex
+    
+    static boolean isFaultComplex(SymTabEntry entry) {
+        Boolean value = (Boolean) entry.getDynamicVar(JavaGeneratorFactory.COMPLEX_TYPE_FAULT);
+        return value != null && value.booleanValue();
+    }
 
     /**
      * If the specified node represents a supported JAX-RPC enumeration,

From 008d381506e6d4414d327ad0b47f614605253095 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 11:43:39 +0000
Subject: [PATCH 046/133] AXIS-2900: A fault message referring to an element
 and that has the same name as an element (typically the element it refers to)
 doesn't cause any collision (because no class is generated for the fault
 message) and the class name corresponding to the element shouldn't be
 mangled.

---
 axis-ant/pom.xml                              |  1 +
 axis-ant/src/test/ant/axis2900/build.xml      | 10 +++
 .../wsdl/axis2900/VerifyFilesTestCase.java    | 63 +++++++++++++++
 axis-ant/src/test/wsdl/axis2900/sample.wsdl   | 76 +++++++++++++++++++
 .../wsdl/toJava/JavaGeneratorFactory.java     |  4 +-
 5 files changed, 153 insertions(+), 1 deletion(-)
 create mode 100644 axis-ant/src/test/ant/axis2900/build.xml
 create mode 100644 axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java
 create mode 100644 axis-ant/src/test/wsdl/axis2900/sample.wsdl

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 13a2c6d55..6ffee71a5 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -78,6 +78,7 @@
                             <target>
                                 <taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask" classpathref="maven.compile.classpath" />
                                 <taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask" classpathref="maven.compile.classpath" />
+                                <ant antfile="src/test/ant/axis2900/build.xml" target="test" inheritrefs="true" />
                                 <ant antfile="src/test/ant/clash/build.xml" target="test" inheritrefs="true" />
                                 <ant antfile="src/test/ant/extra/build.xml" target="test" inheritrefs="true" />
                                 <ant antfile="src/test/ant/filegen/build.xml" target="test" inheritrefs="true" />
diff --git a/axis-ant/src/test/ant/axis2900/build.xml b/axis-ant/src/test/ant/axis2900/build.xml
new file mode 100644
index 000000000..ad0b37c4d
--- /dev/null
+++ b/axis-ant/src/test/ant/axis2900/build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<project>
+  <target name="test">
+    <mkdir dir="${project.build.directory}/work"/>
+    <wsdl2java url="src/test/wsdl/axis2900/sample.wsdl"
+               output="${project.build.directory}/work">
+      <mapping namespace="http://example.com" package="test.wsdl.axis2900"/>
+    </wsdl2java>
+  </target>
+</project>
diff --git a/axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java
new file mode 100644
index 000000000..8249840c7
--- /dev/null
+++ b/axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java
@@ -0,0 +1,63 @@
+/*
+ * 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 test.wsdl.axis2900;
+
+import test.AxisFileGenTestBase;
+
+import java.io.File;
+import java.util.HashSet;
+import java.util.Set;
+
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
+    public VerifyFilesTestCase(String name) {
+        super(name);
+    }
+
+    /**
+     * List of files which should be generated.
+     */
+    protected Set shouldExist() {
+        HashSet set = new HashSet();
+        set.add("Exception.java");
+        set.add("MyWS.java");
+        set.add("MyWSException.java");
+        set.add("MyWSLocator.java");
+        set.add("MyWSPortType.java");
+        set.add("MyWSSoap11BindingStub.java");
+        return set;
+    } // shouldExist
+
+    /**
+     * List of files which may be generated.
+     */
+    protected Set mayExist() {
+        HashSet set = new HashSet();
+        return set;
+    } // shouldExist
+
+    /**
+     * The directory containing the files that should exist.
+     */
+    protected String rootDir() {
+        return "target" + File.separator + "work" + File.separator + 
+                "test" + File.separator + "wsdl" + File.separator +
+                "axis2900";
+    } // rootDir
+
+} // class VerifyFilesTestCase
diff --git a/axis-ant/src/test/wsdl/axis2900/sample.wsdl b/axis-ant/src/test/wsdl/axis2900/sample.wsdl
new file mode 100644
index 000000000..942808715
--- /dev/null
+++ b/axis-ant/src/test/wsdl/axis2900/sample.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://org.apache.axis2/xsd" xmlns:ns="http://example.com" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" targetNamespace="http://example.com">
+    <wsdl:documentation>
+		Please Type your service description here
+	</wsdl:documentation>
+    <wsdl:types>
+        <xs:schema attributeFormDefault="qualified" elementFormDefault="qualified" targetNamespace="http://example.com">
+            <xs:element name="MyWSException">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="MyWSException" nillable="true" type="ns:Exception"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:complexType name="Exception">
+                <xs:sequence>
+                    <xs:element minOccurs="0" name="Message" nillable="true" type="xs:string"/>
+                </xs:sequence>
+            </xs:complexType>
+            <xs:element name="myOperation">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="myId" nillable="true" type="xs:string"/>
+                        <xs:element minOccurs="0" name="myOt" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="myOperationResponse">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element minOccurs="0" name="return" nillable="true" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+           
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="myOperationRequest">
+        <wsdl:part name="parameters" element="ns:myOperation"/>
+    </wsdl:message>
+    <wsdl:message name="myOperationResponse">
+        <wsdl:part name="parameters" element="ns:myOperationResponse"/>
+    </wsdl:message>
+    <wsdl:message name="MyWSException">
+        <wsdl:part name="parameters" element="ns:MyWSException"/>
+    </wsdl:message>
+    <wsdl:portType name="MyWSPortType">
+        
+        <wsdl:operation name="myOperation">
+            <wsdl:input message="ns:myOperationRequest" wsaw:Action="urn:myOperation"/>
+            <wsdl:output message="ns:myOperationResponse" wsaw:Action="urn:myOperationResponse"/>
+            <wsdl:fault message="ns:MyWSException" name="MyWSException" wsaw:Action="urn:myOperationMyWSException"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="MyWSSoap11Binding" type="ns:MyWSPortType">
+        <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
+        
+        <wsdl:operation name="myOperation">
+            <soap:operation soapAction="urn:myOperation" style="document"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+            <wsdl:fault name="MyWSException">
+                <soap:fault use="literal" name="MyWSException"/>
+            </wsdl:fault>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="MyWS">
+        <wsdl:port name="MyWSHttpSoap11Endpoint" binding="ns:MyWSSoap11Binding">
+            <soap:address location="http://endpoint.com"/>
+        </wsdl:port>
+    </wsdl:service>
+</wsdl:definitions>
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
index af9542344..bdfc2d60f 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
@@ -1008,7 +1008,9 @@ protected void resolveNameClashes(SymbolTable symbolTable) {
                 if (v.elementAt(index) instanceof MessageEntry) {
                     // Need to resolve a Exception message.
                     MessageEntry msgEntry = (MessageEntry) v.elementAt(index);                    
-                    if (msgEntry.getDynamicVar(EXCEPTION_CLASS_NAME) == null) {
+                    // AXIS-2900: Only simple type faults generate additional classes; message entries for
+                    // complex type faults don't cause any collisions.
+                    if (Utils.isFaultComplex(msgEntry) || msgEntry.getDynamicVar(EXCEPTION_CLASS_NAME) == null) {
                         v.removeElementAt(index);
                     } else {                        
                         index++;

From 52b7424539816234a17a25e5ba3474ab5cd6dfca Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 11:44:06 +0000
Subject: [PATCH 047/133] Some code cleanup.

---
 .../java/test/wsdl/clash/VerifyFilesTestCase.java    |  4 ++--
 .../java/test/wsdl/filegen/AllOptionTestCase.java    |  4 +++-
 .../test/java/test/wsdl/filegen/FileGenTestCase.java | 12 ------------
 .../java/test/wsdl/header/VerifyFilesTestCase.java   |  4 ++--
 .../test/wsdl/multibinding/VerifyFilesTestCase.java  |  4 ++--
 .../src/main/java/test/AxisFileGenTestBase.java      | 12 +++++++++---
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
index 5b5e8f790..7e513ef12 100644
--- a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
@@ -20,13 +20,13 @@
  */ 
 package test.wsdl.clash;
 
-import test.wsdl.filegen.FileGenTestCase;
+import test.AxisFileGenTestBase;
 
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 
-public class VerifyFilesTestCase extends FileGenTestCase {
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
     public VerifyFilesTestCase(String name) {
         super(name);
     }
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
index c58244c42..705b84b9e 100644
--- a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
@@ -24,7 +24,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-public class AllOptionTestCase extends FileGenTestCase {
+import test.AxisFileGenTestBase;
+
+public class AllOptionTestCase extends AxisFileGenTestBase {
     public AllOptionTestCase(String name) {
         super(name);
     }
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
index ec18f6fa4..aa4884516 100644
--- a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
@@ -24,12 +24,8 @@
 import test.AxisFileGenTestBase;
 
 import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Vector;
-
 
 public class FileGenTestCase extends AxisFileGenTestBase {
     public FileGenTestCase(String name) {
@@ -50,14 +46,6 @@ protected Set shouldExist() {
         return set;
     }
     
-    /**
-     * List of files which may or may not be generated.
-     */
-    protected Set mayExist() {
-        HashSet set = new HashSet();
-        return set;
-    }
-
     /**
      * The directory containing the files that should exist.
      */
diff --git a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
index e4a1db31d..ad362023c 100644
--- a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
@@ -20,13 +20,13 @@
  */ 
 package test.wsdl.header;
 
-import test.wsdl.filegen.FileGenTestCase;
+import test.AxisFileGenTestBase;
 
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 
-public class VerifyFilesTestCase extends FileGenTestCase {
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
     public VerifyFilesTestCase(String name) {
         super(name);
     }
diff --git a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
index ad40882b3..e62c91685 100644
--- a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
@@ -20,13 +20,13 @@
  */ 
 package test.wsdl.multibinding;
 
-import test.wsdl.filegen.FileGenTestCase;
+import test.AxisFileGenTestBase;
 
 import java.io.File;
 import java.util.HashSet;
 import java.util.Set;
 
-public class VerifyFilesTestCase extends FileGenTestCase {
+public class VerifyFilesTestCase extends AxisFileGenTestBase {
     public VerifyFilesTestCase(String name) {
         super(name);
     }
diff --git a/axis-testutils/src/main/java/test/AxisFileGenTestBase.java b/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
index 72e5424f9..d014c9323 100644
--- a/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
+++ b/axis-testutils/src/main/java/test/AxisFileGenTestBase.java
@@ -17,8 +17,6 @@
 
 package test;
 
-import org.custommonkey.xmlunit.XMLTestCase;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Set;
@@ -44,7 +42,15 @@ protected String getPrefix(String parent) {
         }
     }
 
-    abstract protected Set mayExist();
+    /**
+     * List of files which may or may not be generated. May be overridden by
+     * subclasses.
+     */
+    protected Set mayExist() {
+        HashSet set = new HashSet();
+        return set;
+    }
+
     abstract protected String rootDir();
     abstract protected Set shouldExist();
 

From aacd0ccc7e27f5579099d2d32d3ea0c614f11e74 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 26 Feb 2014 21:50:50 +0000
Subject: [PATCH 048/133] Added test cases for AXIS-2378 and AXIS-2901.

---
 axis-ant/pom.xml                            |  2 +
 axis-ant/src/test/ant/axis2378/build.xml    | 10 +++
 axis-ant/src/test/ant/axis2901/build.xml    | 13 ++++
 axis-ant/src/test/wsdl/axis2378/sample.wsdl | 56 +++++++++++++++
 axis-ant/src/test/wsdl/axis2901/sample.wsdl | 76 +++++++++++++++++++++
 5 files changed, 157 insertions(+)
 create mode 100644 axis-ant/src/test/ant/axis2378/build.xml
 create mode 100644 axis-ant/src/test/ant/axis2901/build.xml
 create mode 100644 axis-ant/src/test/wsdl/axis2378/sample.wsdl
 create mode 100644 axis-ant/src/test/wsdl/axis2901/sample.wsdl

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 6ffee71a5..69b65c7ef 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -78,7 +78,9 @@
                             <target>
                                 <taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask" classpathref="maven.compile.classpath" />
                                 <taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask" classpathref="maven.compile.classpath" />
+                                <!-- ant antfile="src/test/ant/axis2378/build.xml" target="test" inheritrefs="true" /-->
                                 <ant antfile="src/test/ant/axis2900/build.xml" target="test" inheritrefs="true" />
+                                <!-- ant antfile="src/test/ant/axis2901/build.xml" target="test" inheritrefs="true" /-->
                                 <ant antfile="src/test/ant/clash/build.xml" target="test" inheritrefs="true" />
                                 <ant antfile="src/test/ant/extra/build.xml" target="test" inheritrefs="true" />
                                 <ant antfile="src/test/ant/filegen/build.xml" target="test" inheritrefs="true" />
diff --git a/axis-ant/src/test/ant/axis2378/build.xml b/axis-ant/src/test/ant/axis2378/build.xml
new file mode 100644
index 000000000..ed1e8cf82
--- /dev/null
+++ b/axis-ant/src/test/ant/axis2378/build.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?>
+<project>
+  <target name="test">
+    <mkdir dir="${project.build.directory}/work"/>
+    <wsdl2java url="src/test/wsdl/axis2378/sample.wsdl"
+               output="${project.build.directory}/work">
+      <mapping namespace="urn:mycompany:/crCarl/TransformServiceWithURL" package="test.wsdl.axis2378"/>
+    </wsdl2java>
+  </target>
+</project>
diff --git a/axis-ant/src/test/ant/axis2901/build.xml b/axis-ant/src/test/ant/axis2901/build.xml
new file mode 100644
index 000000000..59542881e
--- /dev/null
+++ b/axis-ant/src/test/ant/axis2901/build.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<project>
+  <target name="test">
+    <mkdir dir="${project.build.directory}/work"/>
+    <wsdl2java url="src/test/wsdl/axis2901/sample.wsdl"
+               output="${project.build.directory}/work">
+      <mapping namespace="http://sample.com/URI" package="test.wsdl.axis2901.service"/>
+      <!-- This is essential: the issue occurs only if the two namespaces are mapped to the same package -->
+      <mapping namespace="http://com.sample.MyDetails.xsd" package="test.wsdl.axis2901"/>
+      <mapping namespace="http://com.sample.MyDetailsRequest.xsd" package="test.wsdl.axis2901"/>
+    </wsdl2java>
+  </target>
+</project>
diff --git a/axis-ant/src/test/wsdl/axis2378/sample.wsdl b/axis-ant/src/test/wsdl/axis2378/sample.wsdl
new file mode 100644
index 000000000..efdad99fa
--- /dev/null
+++ b/axis-ant/src/test/wsdl/axis2378/sample.wsdl
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions targetNamespace="urn:mycompany:/crCarl/TransformServiceWithURL" xmlns:tns="urn:mycompany:/crCarl/TransformServiceWithURL" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:tns1="http://www.example.org/NewXMLSchema" xmlns="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <schema targetNamespace="http://www.example.org/NewXMLSchema" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://www.example.org/NewXMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+<xsd:simpleType name="URL">
+<xsd:restriction base="string">
+<xsd:maxLength value="1024"/>
+</xsd:restriction>
+</xsd:simpleType>   
+
+<xsd:simpleType name="URL_Type">
+<xsd:restriction base="tns:URL"/>
+</xsd:simpleType>
+
+<xsd:element name="URL" type="tns:URL_Type"/>
+
+<xsd:complexType name="ContactInfo_Type">
+<xsd:sequence>
+<xsd:element minOccurs="0" ref="tns:URL"/>
+</xsd:sequence>
+</xsd:complexType>
+
+
+</schema>
+  </wsdl:types>
+  <wsdl:message name="transformTransformServiceWithURLRequest">
+    <wsdl:part name="NewXMLSchema" element="tns1:URL"/>
+  </wsdl:message>
+  <wsdl:message name="transformTransformServiceWithURLResponse">
+    <wsdl:part name="NewXMLSchema2" element="tns1:URL"/>
+  </wsdl:message>
+  <wsdl:portType name="TransformServiceWithURL">
+    <wsdl:operation name="transformTransformServiceWithURL">
+      <wsdl:input name="transformTransformServiceWithURLRequest" message="tns:transformTransformServiceWithURLRequest"/>
+      <wsdl:output name="transformTransformServiceWithURLResponse" message="tns:transformTransformServiceWithURLResponse"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="TransformServiceWithURLHTTP_Binding" type="tns:TransformServiceWithURL">
+    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="transformTransformServiceWithURL">
+      <soap:operation soapAction="urn:mycompany:/crCarl/TransformServiceWithURL/TransformServiceWithURL/transformTransformServiceWithURLRequest#"/>
+      <wsdl:input name="transformTransformServiceWithURLRequest">
+        <soap:body use="literal"/>
+      </wsdl:input>
+      <wsdl:output name="transformTransformServiceWithURLResponse">
+        <soap:body use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="TransformServiceWithURL">
+    <wsdl:port name="TransformServiceWithURL_SOAP_HTTP_Port" binding="tns:TransformServiceWithURLHTTP_Binding">
+      <soap:address location="http://DANIELVA.sybase.com:8080/TransformServiceWithURL/services/SOAPHandler/HTTPTransport/urn~3Amycompany~3A/crCarl/TransformServiceWithURL/TransformServiceWithURL"/>
+    </wsdl:port>
+  </wsdl:service>
+</wsdl:definitions>
\ No newline at end of file
diff --git a/axis-ant/src/test/wsdl/axis2901/sample.wsdl b/axis-ant/src/test/wsdl/axis2901/sample.wsdl
new file mode 100644
index 000000000..ebe3fd3a6
--- /dev/null
+++ b/axis-ant/src/test/wsdl/axis2901/sample.wsdl
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions xmlns:ns1="http://com.sample.MyDetails.xsd" xmlns:tns="http://sample.com/URI" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns0="http://com.sample.MyDetailsRequest.xsd" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="Untitled" targetNamespace="http://sample.com/URI">
+    <wsdl:types>
+       
+        <xs:schema xmlns="http://com.sample.MyDetails.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://com.sample.MyDetails.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
+            <xs:element name="Name">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element ref="ns1:FirstElement" minOccurs="0"/>
+                        <xs:element ref="ns1:SecondElement" minOccurs="0"/>
+                        <xs:element ref="ns1:ThirdElement" minOccurs="0"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="MyDetails">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element ref="ns1:Name" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="FirstElement" type="xs:string"/>
+            <xs:element name="SecondElement" type="xs:string"/>
+            <xs:element name="ThirdElement" type="xs:string"/>
+        </xs:schema>
+        <xs:schema xmlns="http://com.sample.MyDetailsRequest.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://com.sample.MyDetailsRequest.xsd" elementFormDefault="qualified" attributeFormDefault="unqualified">
+            <xs:element name="MyRequestDetails">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element ref="ns0:Names" minOccurs="0" maxOccurs="unbounded"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="Names">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element ref="ns0:FirstElement"/>
+                        <xs:element ref="ns0:SecondElement"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="FirstElement" type="xs:string"/>
+            <xs:element name="SecondElement" type="xs:string"/>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:service name="GetXXsProcess">
+        <wsdl:port name="GetXXsProcess" binding="tns:GetXXsProcessBinding">
+            <soap:address location="http://com.sample/service"/>
+        </wsdl:port>
+    </wsdl:service>
+    <wsdl:portType name="MyDetailsService">
+        <wsdl:operation name="MyOperation">
+            <wsdl:input message="tns:MyRequest"/>
+            <wsdl:output message="tns:MyResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="GetXXsProcessBinding" type="tns:MyDetailsService">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="MyOperation">
+            <soap:operation style="document" soapAction="/Action/GetXXsProcess"/>
+            <wsdl:input>
+                <soap:body use="literal" parts="MyRequestParameter"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal" parts="MyResponseParameter"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:message name="MyRequest">
+        <wsdl:part name="MyRequestParameter" element="ns0:MyRequestDetails"/>
+    </wsdl:message>
+    <wsdl:message name="MyResponse">
+        <wsdl:part name="MyResponseParameter" element="ns1:MyDetails"/>
+    </wsdl:message>
+   
+</wsdl:definitions>
\ No newline at end of file

From c64cc10457d2326028399bc4bfb084263bfd26c4 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 2 Mar 2014 16:09:17 +0000
Subject: [PATCH 049/133] Added the necessary infrastructure to get debug
 logging in Ant task tests.

---
 axis-ant/pom.xml                             | 10 ++++++--
 axis-ant/src/test/resources/log4j.properties | 26 ++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 axis-ant/src/test/resources/log4j.properties

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 69b65c7ef..f2547e354 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -61,6 +61,11 @@
             <artifactId>commons-io</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -76,8 +81,9 @@
                         </goals>
                         <configuration>
                             <target>
-                                <taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask" classpathref="maven.compile.classpath" />
-                                <taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask" classpathref="maven.compile.classpath" />
+                                <!-- TODO: be a bit more selective here: add maven.compile.classpath + log4j.jar + log4j.properties -->
+                                <taskdef name="java2wsdl" classname="org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask" classpathref="maven.test.classpath" />
+                                <taskdef name="wsdl2java" classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask" classpathref="maven.test.classpath" />
                                 <!-- ant antfile="src/test/ant/axis2378/build.xml" target="test" inheritrefs="true" /-->
                                 <ant antfile="src/test/ant/axis2900/build.xml" target="test" inheritrefs="true" />
                                 <!-- ant antfile="src/test/ant/axis2901/build.xml" target="test" inheritrefs="true" /-->
diff --git a/axis-ant/src/test/resources/log4j.properties b/axis-ant/src/test/resources/log4j.properties
new file mode 100644
index 000000000..bdb4c087f
--- /dev/null
+++ b/axis-ant/src/test/resources/log4j.properties
@@ -0,0 +1,26 @@
+#
+# 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.
+#
+
+log4j.rootLogger=INFO, CONSOLE
+
+#log4j.logger.org.apache.axis=DEBUG
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss,SSS} [%t] %-5p %c - %m%n

From 436cb0cadd9d1efee47fa0e93b1251613b8faf2e Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 2 Mar 2014 16:09:35 +0000
Subject: [PATCH 050/133] Some code simplifications.

---
 .../wsdl/toJava/JavaGeneratorFactory.java     | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
index bdfc2d60f..3f7cd0433 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
@@ -1088,7 +1088,7 @@ protected void resolveNameClashes(SymbolTable symbolTable) {
                         SymTabEntry entry = (SymTabEntry) v.elementAt(i);
 
                         if (entry instanceof Element) {
-                            entry.setName(mangleName(entry.getName(), ELEMENT_SUFFIX));
+                            mangleName(entry, ELEMENT_SUFFIX);
 
                             // If this global element was defined using
                             // an anonymous type, then need to change the
@@ -1153,12 +1153,7 @@ && sameJavaClass(entry.getName(),
                                 
                                 // Appended Suffix for avoiding name collisions (JAX-RPC 1.1)
                                 boolean isComplexTypeFault = Utils.isFaultComplex(entry);
-                                if (isComplexTypeFault) {
-                                    entry.setName(mangleName(entry.getName(), EXCEPTION_SUFFIX));
-                                } 
-                                else {
-                                    entry.setName(mangleName(entry.getName(), TYPE_SUFFIX));
-                                }
+                                mangleName(entry, isComplexTypeFault ? EXCEPTION_SUFFIX : TYPE_SUFFIX);
                                 
                                 // should update the class name of ElementEntry which references this type entry
                                 Map elementIndex = symbolTable.getElementIndex();
@@ -1188,9 +1183,9 @@ && sameJavaClass(entry.getName(),
                                 }
                             }
                         } else if (entry instanceof PortTypeEntry) {
-                            entry.setName(mangleName(entry.getName(), PORT_TYPE_SUFFIX));   // "_Port" --> "_PortType" for JAX-RPC 1.1
+                            mangleName(entry, PORT_TYPE_SUFFIX);   // "_Port" --> "_PortType" for JAX-RPC 1.1
                         } else if (entry instanceof ServiceEntry) {
-                            entry.setName(mangleName(entry.getName(), SERVICE_SUFFIX));
+                            mangleName(entry, SERVICE_SUFFIX);
                         } else if (entry instanceof MessageEntry) {
                             if (!Utils.isFaultComplex(entry)) {
                                 String exceptionClassName = (String) entry.getDynamicVar(EXCEPTION_CLASS_NAME);
@@ -1210,8 +1205,7 @@ else if (entry instanceof BindingEntry) {
                             // named after the binding name, so there is the
                             // possibility of a name clash.
                             if (bEntry.hasLiteral()) {
-                                entry.setName(mangleName(entry.getName(),
-                                        BINDING_SUFFIX));
+                                mangleName(entry, BINDING_SUFFIX);
                             }
                         }
                     }
@@ -1221,24 +1215,28 @@ else if (entry instanceof BindingEntry) {
     }                                          // resolveNameClashes
 
     /**
-     * Change the indicated type name into a mangled form using the mangle string.
+     * Change the type name of the given symbol table entry into a mangled
+     * form using the given suffix.
      *
-     * @param name
-     * @param mangle
-     * @return
+     * @param entry
+     * @param suffix
      */
-    private String mangleName(String name, String mangle) {
+    private void mangleName(SymTabEntry entry, String suffix) {
+        String name = entry.getName();
 
         int index = name.indexOf("[");
 
+        String newName;
         if (index >= 0) {
             String pre = name.substring(0, index);
             String post = name.substring(index);
 
-            return pre + mangle + post;
+            newName = pre + suffix + post;
         } else {
-            return name + mangle;
+            newName = name + suffix;
         }
+        
+        entry.setName(newName);
     }
 
     /**

From 071e8c4f89c436b208ce4c327e6ab359aaecc28d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 2 Mar 2014 16:09:53 +0000
Subject: [PATCH 051/133] Improved debug logging.

---
 .../wsdl/toJava/JavaGeneratorFactory.java     | 15 +++++++++++++--
 .../axis/wsdl/toJava/JavaTypeWriter.java      |  4 ++++
 .../apache/axis/wsdl/toJava/JavaWriter.java   |  7 +++++++
 .../java/org/apache/axis/wsdl/gen/Parser.java | 19 +++++++++++++++----
 4 files changed, 39 insertions(+), 6 deletions(-)

diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
index 3f7cd0433..7676c7817 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
@@ -64,7 +64,7 @@
  * This is Wsdl2java's implementation of the GeneratorFactory
  */
 public class JavaGeneratorFactory implements GeneratorFactory {
-    private static final Log log_ =
+    private static final Log log =
         LogFactory.getLog(JavaGeneratorFactory.class.getName());
 
     /** Field emitter */
@@ -450,6 +450,10 @@ public void generate() throws IOException {
                 gen.generate();
             }
         }    // generate
+
+        public String toString() {
+            return "Writers[baseWriter=" + baseWriter + ",writers=" + writers + ",entry.name=" + (entry == null ? "N/A" : entry.getName()) + "]";
+        }
     }    // class Writers
 
     /**
@@ -459,6 +463,9 @@ public void generate() throws IOException {
      * @param generator
      */
     public void addGenerator(Class wsdlClass, Class generator) {
+        if (log.isDebugEnabled()) {
+            log.debug("Adding generator for " + wsdlClass.getName() + ": " + generator.getName());
+        }
 
         // This is just a hack right now... it just works with Service
         if (Message.class.isAssignableFrom(wsdlClass)) {
@@ -1237,6 +1244,10 @@ private void mangleName(SymTabEntry entry, String suffix) {
         }
         
         entry.setName(newName);
+        
+        if (log.isDebugEnabled()) {
+            log.debug("Symbol table of type " + entry.getClass().getName() + " mangled: " + name + " -> " + newName);
+        }
     }
 
     /**
@@ -1644,7 +1655,7 @@ protected boolean include(QName qName) {
             doInclude = true;
         }
         else {
-            log_.info(
+            log.info(
                 "excluding code generation for non-included QName:" + qName);
 
         }
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
index c02a28e54..775cf080c 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
@@ -202,4 +202,8 @@ protected JavaWriter getBeanHelperWriter(
     protected Generator getHolderWriter(Emitter emitter, TypeEntry type) {
         return new JavaHolderWriter(emitter, type);
     }
+
+    public String toString() {
+        return "JavaTypeWriter[typeWriter=" + typeWriter + ",holderWriter=" + holderWriter + "]";
+    }
 }    // class JavaTypeWriter
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
index b34fcdcb2..8d9d7b3e8 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
@@ -15,8 +15,10 @@
  */
 package org.apache.axis.wsdl.toJava;
 
+import org.apache.axis.components.logger.LogFactory;
 import org.apache.axis.utils.Messages;
 import org.apache.axis.wsdl.gen.Generator;
+import org.apache.commons.logging.Log;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 
@@ -76,6 +78,7 @@
  * </dl>
  */
 public abstract class JavaWriter implements Generator {
+    private static final Log log = LogFactory.getLog(JavaWriter.class.getName());
 
     /** This controls how many characters per line for javadoc comments */
     protected final static int LINE_LENGTH = 65;
@@ -121,6 +124,10 @@ public void generate() throws IOException {
             }
         }
 
+        if (log.isDebugEnabled()) {
+            log.debug("Start generating file " + file);
+        }
+        
         PrintWriter pw = getPrintWriter(file);
 
         writeFileHeader(pw);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
index 866028596..babe1df06 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
@@ -15,6 +15,7 @@
  */
 package org.apache.axis.wsdl.gen;
 
+import org.apache.axis.components.logger.LogFactory;
 import org.apache.axis.utils.Messages;
 import org.apache.axis.wsdl.symbolTable.BindingEntry;
 import org.apache.axis.wsdl.symbolTable.CollectionElement;
@@ -26,6 +27,7 @@
 import org.apache.axis.wsdl.symbolTable.Type;
 import org.apache.axis.wsdl.symbolTable.TypeEntry;
 import org.apache.axis.wsdl.symbolTable.Utils;
+import org.apache.commons.logging.Log;
 import org.w3c.dom.Document;
 import org.xml.sax.EntityResolver;
 import org.xml.sax.SAXException;
@@ -34,6 +36,7 @@
 import javax.wsdl.Definition;
 import javax.wsdl.WSDLException;
 import javax.xml.parsers.ParserConfigurationException;
+
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Iterator;
@@ -44,6 +47,7 @@
  * This is a class with no documentation.
  */
 public class Parser {
+    private static final Log log = LogFactory.getLog(Parser.class.getName());
 
     /** Field debug */
     protected boolean debug = false;
@@ -442,6 +446,13 @@ protected void sanityCheck(SymbolTable symbolTable) {
         // do nothing.
     }
 
+    private static void generate(Generator gen) throws IOException {
+        if (log.isDebugEnabled()) {
+            log.debug("Invoking generator " + gen);
+        }
+        gen.generate();
+    }
+    
     /**
      * Method generate
      *
@@ -505,7 +516,7 @@ private void generate(SymbolTable symbolTable) throws IOException {
                 }
 
                 if (gen != null) {
-                    gen.generate();
+                    generate(gen);
                 }
             }
         }
@@ -514,7 +525,7 @@ private void generate(SymbolTable symbolTable) throws IOException {
         // outside of the recursive emit method.
         Generator gen = genFactory.getGenerator(def, symbolTable);
 
-        gen.generate();
+        generate(gen);
     }    // generate
 
     /**
@@ -549,7 +560,7 @@ private void generateTypes(SymbolTable symbolTable) throws IOException {
                     && (type.getBaseType() == null)) {
                 Generator gen = genFactory.getGenerator(type, symbolTable);
 
-                gen.generate();
+                generate(gen);
             }
         }
 
@@ -576,7 +587,7 @@ private void generateTypes(SymbolTable symbolTable) throws IOException {
                     && (type.getBaseType() == null)) {
                 Generator gen = genFactory.getGenerator(type, symbolTable);
 
-                gen.generate();
+                generate(gen);
             }
         }
     }    // generateTypes

From 70125415b703b523e27406180a1652bc73a4827a Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 16 Mar 2014 18:43:16 +0000
Subject: [PATCH 052/133] Reenabled an old test case (using a mock service).

---
 .../src/main/resources/uddi_v1/README.txt     |  1 +
 .../uddi_v1/find_business-request.xml         |  8 +++++
 .../uddi_v1/find_business-response.xml        | 21 ++++++++++++
 .../webapp/WEB-INF/dispatcher-servlet.xml     | 13 ++++++++
 .../src/main/java/samples/jaxm/UddiPing.java  |  4 +--
 .../java/test/functional/TestJAXMSamples.java | 33 +++----------------
 6 files changed, 49 insertions(+), 31 deletions(-)
 create mode 100644 interop-mock/src/main/resources/uddi_v1/README.txt
 create mode 100644 interop-mock/src/main/resources/uddi_v1/find_business-request.xml
 create mode 100644 interop-mock/src/main/resources/uddi_v1/find_business-response.xml

diff --git a/interop-mock/src/main/resources/uddi_v1/README.txt b/interop-mock/src/main/resources/uddi_v1/README.txt
new file mode 100644
index 000000000..5f20c8c78
--- /dev/null
+++ b/interop-mock/src/main/resources/uddi_v1/README.txt
@@ -0,0 +1 @@
+Request/response constructed from samples found on the Internet.
\ No newline at end of file
diff --git a/interop-mock/src/main/resources/uddi_v1/find_business-request.xml b/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
new file mode 100644
index 000000000..c39264d9c
--- /dev/null
+++ b/interop-mock/src/main/resources/uddi_v1/find_business-request.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'>
+    <Body>
+        <find_business generic="1.0" maxRows="100" xmlns="urn:uddi-org:api">
+            <name>Microsoft</name>
+        </find_business>
+    </Body>
+</Envelope>
diff --git a/interop-mock/src/main/resources/uddi_v1/find_business-response.xml b/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
new file mode 100644
index 000000000..79df894e7
--- /dev/null
+++ b/interop-mock/src/main/resources/uddi_v1/find_business-response.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Envelope xmlns='http://schemas.xmlsoap.org/soap/envelope/'>
+    <Body>
+        <businessList generic="1.0" operator="Microsoft Corporation" truncated="false" xmlns="urn:uddi-org:api">
+            <businessInfos>
+                <businessInfo businessKey="0076B468-EB27-42E5-AC09-9955CFF462A3">
+                    <name>Microsoft Corporation</name>
+                    <description xml:lang="en">Empowering people through great software - any time, any place and on any device.</description>
+                    <serviceInfos>
+                        <serviceInfo businessKey="0076B468-EB27-42E5-AC09-955CFF462A3" serviceKey="8BF2F51F-8ED4-43FE-B665-38D8205D1333">
+                            <name>Electronic Business Integration Services</name>
+                        </serviceInfo>
+                        <serviceInfo businessKey="0076B468-EB27-42E5-AC09-955CFF462A3" serviceKey="D2BC296A-723B-4C45-9ED4-494F9E53F1D1">
+                            <name>UDDI Web Services</name>
+                        </serviceInfo>
+                    </serviceInfos>
+                </businessInfo>
+            </businessInfos>
+        </businessList>
+    </Body>
+</Envelope>
diff --git a/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
index 02d54db64..56a38bc07 100644
--- a/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
+++ b/interop-mock/src/main/webapp/WEB-INF/dispatcher-servlet.xml
@@ -306,4 +306,17 @@
             </list>
         </property>
     </bean>
+    
+    <!-- UDDI v1 mock -->
+    
+    <bean name="/uddi_v1" class="org.apache.axis.test.interop.mock.MockPostHandler">
+        <property name="exchanges">
+            <list>
+                <bean class="org.apache.axis.test.interop.mock.Exchange">
+                    <property name="request" value="classpath:uddi_v1/find_business-request.xml"/>
+                    <property name="response" value="classpath:uddi_v1/find_business-response.xml"/>
+                </bean>
+            </list>
+        </property>
+    </bean>
 </beans>
diff --git a/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java b/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
index ef62d8463..102a68184 100644
--- a/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
+++ b/samples/jaxm-sample/src/main/java/samples/jaxm/UddiPing.java
@@ -60,8 +60,8 @@ public static void searchUDDI(String name, String url) throws Exception {
         msg.saveChanges();
 
         SOAPMessage reply = connection.call(msg, endpoint);
-        //System.out.println("Received reply from: " + endpoint);
-        //reply.writeTo(System.out);
+        System.out.println("Received reply from: " + endpoint);
+        reply.writeTo(System.out);
         connection.close();
     }
 }
diff --git a/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java b/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
index 282493cb7..bb38ec1a4 100644
--- a/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
+++ b/samples/jaxm-sample/src/test/java/test/functional/TestJAXMSamples.java
@@ -20,6 +20,7 @@
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.commons.logging.Log;
 import samples.jaxm.DelayedStockQuote;
+import samples.jaxm.UddiPing;
 
 /**
  * Test the JAX-RPC compliance samples.
@@ -31,35 +32,9 @@ public TestJAXMSamples(String name) {
         super(name);
     } // ctor
 
-//    // This is timing out for some reason - removed for the nonce.
-//    // -- gdaniels, 4/21/2003
-//    public void testUddiPing() throws Exception {
-//        try {
-//            log.info("Testing JAXM UddiPing sample.");
-//            UddiPing.searchUDDI("IBM", "http://www-3.ibm.com/services/uddi/testregistry/inquiryapi");
-//            log.info("Test complete.");
-//        } catch (javax.xml.soap.SOAPException e) {
-//            Throwable t = e.getCause();
-//            if (t != null) {
-//                t.printStackTrace();
-//                if (t instanceof AxisFault) {
-//                    AxisFault af = (AxisFault) t;
-//                    if ((af.detail instanceof SocketException) ||
-//                        (af.getFaultCode().getLocalPart().equals("HTTP")) ) {
-//                        System.out.println("Connect failure caused JAXM UddiPing to be skipped.");
-//                        return;
-//                    }
-//                }
-//                throw new Exception("Fault returned from test: " + t);
-//            } else {
-//                e.printStackTrace();
-//                throw new Exception("Exception returned from test: " + e);
-//            }
-//        } catch (Throwable t) {
-//            t.printStackTrace();
-//            throw new Exception("Fault returned from test: " + t);
-//        }
-//    } // testGetQuote
+    public void testUddiPing() throws Exception {
+        UddiPing.searchUDDI("Microsoft", "http://localhost:" + System.getProperty("jetty.httpPort") + "/uddi_v1");
+    } // testGetQuote
 
     public void testDelayedStockQuote() throws Exception {
         DelayedStockQuote stockQuote = new DelayedStockQuote("http://localhost:" + System.getProperty("jetty.httpPort") + "/xmethods/delayed-quotes");

From ebcfe02107f817e1f123d3447bea7939759b991d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 19 Mar 2014 08:06:49 +0000
Subject: [PATCH 053/133] Use a Maven plugin instead of Java code to test
 presence of generated files.

---
 axis-ant/pom.xml                              | 138 ++++++++++++++++++
 .../wsdl/axis2900/VerifyFilesTestCase.java    |  63 --------
 .../test/wsdl/clash/VerifyFilesTestCase.java  |  74 ----------
 .../test/wsdl/extra/ExtraClassesTestCase.java |  99 -------------
 .../test/wsdl/filegen/AllOptionTestCase.java  |  58 --------
 .../test/wsdl/filegen/FileGenTestCase.java    |  59 --------
 .../src/test/java/test/wsdl/filegen/README    |  21 ---
 .../java/test/wsdl/groups/GroupsTestCase.java |  97 ------------
 .../test/wsdl/header/VerifyFilesTestCase.java |  66 ---------
 .../SalesRankNPrice_ServiceTestCase.java      |  74 ----------
 .../multibinding/VerifyFilesTestCase.java     |  66 ---------
 pom.xml                                       |  17 +++
 12 files changed, 155 insertions(+), 677 deletions(-)
 delete mode 100644 axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/filegen/README
 delete mode 100644 axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
 delete mode 100644 axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index f2547e354..02f439281 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -149,6 +149,144 @@
                     </excludes>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.github.veithen.filecheck</groupId>
+                <artifactId>filecheck-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>test</phase>
+                        <goals>
+                            <goal>check-multiple</goal>
+                        </goals>
+                        <configuration>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/axis2900</directory>
+                                    <expectedFiles>
+                                        <expectedFile>Exception.java</expectedFile>
+                                        <expectedFile>MyWS.java</expectedFile>
+                                        <expectedFile>MyWSException.java</expectedFile>
+                                        <expectedFile>MyWSLocator.java</expectedFile>
+                                        <expectedFile>MyWSPortType.java</expectedFile>
+                                        <expectedFile>MyWSSoap11BindingStub.java</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/clash</directory>
+                                    <expectedFiles>
+                                        <expectedFile>AnotherNonSharedNameImpl.java</expectedFile>
+                                        <expectedFile>AnotherNonSharedNameStub.java</expectedFile>
+                                        <expectedFile>DescribeLayoutType0.java</expectedFile>
+                                        <expectedFile>DescribeLayout.java</expectedFile>
+                                        <expectedFile>NonSharedNameImpl.java</expectedFile>
+                                        <expectedFile>NonSharedNameStub.java</expectedFile>
+                                        <expectedFile>SayHello.java</expectedFile>
+                                        <expectedFile>SharedName_PortType.java</expectedFile>
+                                        <expectedFile>SharedName_Service.java</expectedFile>
+                                        <expectedFile>SharedName_ServiceLocator.java</expectedFile>
+                                        <expectedFile>SharedName_ServiceTestCase.java</expectedFile>
+                                        <expectedFile>SharedName_Type.java</expectedFile>
+                                        <expectedFile>deploy.wsdd</expectedFile>
+                                        <expectedFile>undeploy.wsdd</expectedFile>
+                                    </expectedFiles>
+                                    <allowedFiles>
+                                        <allowedFile>SharedName_Type_Helper.java</allowedFile>
+                                    </allowedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/extra</directory>
+                                    <expectedFiles>
+                                        <expectedFile>Extra.java</expectedFile> <!-- this is the important one -->
+                                        <expectedFile>MyService.java</expectedFile>
+                                        <expectedFile>MyServiceService.java</expectedFile>
+                                        <expectedFile>MyServiceServiceLocator.java</expectedFile>
+                                        <expectedFile>MyServiceSoapBindingStub.java</expectedFile>
+                                        <expectedFile>MyService.wsdl</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/filegenAll</directory>
+                                    <expectedFiles>
+                                        <expectedFile>Address.java</expectedFile>
+                                        <expectedFile>OpFault.java</expectedFile>
+                                        <expectedFile>PortTypeSoap.java</expectedFile>
+                                        <expectedFile>ReferenceService.java</expectedFile>
+                                        <expectedFile>ReferenceServiceLocator.java</expectedFile>
+                                        <expectedFile>ReferenceSoapBindingStub.java</expectedFile>
+                                        <expectedFile>StateType.java</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/filegen</directory>
+                                    <expectedFiles>
+                                        <expectedFile>OpFault.java</expectedFile>
+                                        <expectedFile>PortTypeSoap.java</expectedFile>
+                                        <expectedFile>ReferenceService.java</expectedFile>
+                                        <expectedFile>ReferenceServiceLocator.java</expectedFile>
+                                        <expectedFile>ReferenceSoapBindingStub.java</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/groups</directory>
+                                    <expectedFiles>
+                                        <expectedFile>SomeType.java</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/header</directory>
+                                    <expectedFiles>
+                                        <expectedFile>BindingImpl.java</expectedFile>
+                                        <expectedFile>BindingSkeleton.java</expectedFile>
+                                        <expectedFile>BindingStub.java</expectedFile>
+                                        <expectedFile>HeaderService.java</expectedFile>
+                                        <expectedFile>HeaderServiceLocator.java</expectedFile>
+                                        <expectedFile>HeaderServiceTestCase.java</expectedFile>
+                                        <expectedFile>HeaderType.java</expectedFile>
+                                        <expectedFile>ImplicitFault.java</expectedFile>
+                                        <expectedFile>Op1Fault.java</expectedFile>
+                                        <expectedFile>PortType.java</expectedFile>
+                                        <expectedFile>deploy.wsdd</expectedFile>
+                                        <expectedFile>undeploy.wsdd</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/literal</directory>
+                                    <expectedFiles>
+                                        <expectedFile>SalesRankNPrice1.java</expectedFile>
+                                        <expectedFile>SalesRanks.java</expectedFile>
+                                        <expectedFile>Prices.java</expectedFile>
+                                        <expectedFile>All.java</expectedFile>
+                                        <expectedFile>SalesRankNPriceSoap.java</expectedFile>
+                                        <expectedFile>SalesRankNPriceSoapStub.java</expectedFile>
+                                        <expectedFile>SalesRankNPrice.java</expectedFile>
+                                        <expectedFile>SalesRankNPriceLocator.java</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                                <fileSet>
+                                    <directory>${project.build.directory}/work/test/wsdl/multibinding</directory>
+                                    <expectedFiles>
+                                        <expectedFile>BindingAllLitImpl.java</expectedFile>
+                                        <expectedFile>BindingAllLitSkeleton.java</expectedFile>
+                                        <expectedFile>BindingAllLitStub.java</expectedFile>
+                                        <expectedFile>BindingNoLitImpl.java</expectedFile>
+                                        <expectedFile>BindingNoLitSkeleton.java</expectedFile>
+                                        <expectedFile>BindingNoLitStub.java</expectedFile>
+                                        <expectedFile>BindingSomeLitImpl.java</expectedFile>
+                                        <expectedFile>BindingSomeLitSkeleton.java</expectedFile>
+                                        <expectedFile>BindingSomeLitStub.java</expectedFile>
+                                        <expectedFile>MbPT.java</expectedFile>
+                                        <expectedFile>MbService.java</expectedFile>
+                                        <expectedFile>MbServiceLocator.java</expectedFile>
+                                        <expectedFile>MbServiceTestCase.java</expectedFile>
+                                        <expectedFile>deploy.wsdd</expectedFile>
+                                        <expectedFile>undeploy.wsdd</expectedFile>
+                                    </expectedFiles>
+                                </fileSet>
+                            </fileSets>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java
deleted file mode 100644
index 8249840c7..000000000
--- a/axis-ant/src/test/java/test/wsdl/axis2900/VerifyFilesTestCase.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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 test.wsdl.axis2900;
-
-import test.AxisFileGenTestBase;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-public class VerifyFilesTestCase extends AxisFileGenTestBase {
-    public VerifyFilesTestCase(String name) {
-        super(name);
-    }
-
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("Exception.java");
-        set.add("MyWS.java");
-        set.add("MyWSException.java");
-        set.add("MyWSLocator.java");
-        set.add("MyWSPortType.java");
-        set.add("MyWSSoap11BindingStub.java");
-        return set;
-    } // shouldExist
-
-    /**
-     * List of files which may be generated.
-     */
-    protected Set mayExist() {
-        HashSet set = new HashSet();
-        return set;
-    } // shouldExist
-
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "axis2900";
-    } // rootDir
-
-} // class VerifyFilesTestCase
diff --git a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
deleted file mode 100644
index 7e513ef12..000000000
--- a/axis-ant/src/test/java/test/wsdl/clash/VerifyFilesTestCase.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.
- */
-
-/**
- * This tests the file generation of only the items that are referenced in WSDL
- * 
- */ 
-package test.wsdl.clash;
-
-import test.AxisFileGenTestBase;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-public class VerifyFilesTestCase extends AxisFileGenTestBase {
-    public VerifyFilesTestCase(String name) {
-        super(name);
-    }
-
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("AnotherNonSharedNameImpl.java");
-        set.add("AnotherNonSharedNameStub.java");
-        set.add("DescribeLayoutType0.java");
-        set.add("DescribeLayout.java");
-        set.add("NonSharedNameImpl.java");
-        set.add("NonSharedNameStub.java");
-        set.add("SayHello.java");
-        set.add("SharedName_PortType.java");
-        set.add("SharedName_Service.java");
-        set.add("SharedName_ServiceLocator.java");
-        set.add("SharedName_ServiceTestCase.java");
-        set.add("SharedName_Type.java");
-        set.add("deploy.wsdd");
-        set.add("undeploy.wsdd");
-        return set;
-    } // shouldExist
-
-    /**
-     * List of files which may be generated.
-     */
-    protected Set mayExist() {
-        HashSet set = new HashSet();
-        set.add("SharedName_Type_Helper.java");
-        return set;
-    } // shouldExist
-
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "clash";
-    } // rootDir
-
-} // class VerifyFilesTestCase
diff --git a/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java b/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
deleted file mode 100644
index d4afa27a3..000000000
--- a/axis-ant/src/test/java/test/wsdl/extra/ExtraClassesTestCase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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 test.wsdl.extra;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.Vector;
-
-/**
- * This tests the file generation of only the items that are referenced in WSDL
- * This should extend FileGenTestCase, but we have a dependancy problem as
- * "extra" comes before "filegen".  Oh well.
- * 
- */
-public class ExtraClassesTestCase  extends junit.framework.TestCase {
-    public ExtraClassesTestCase(String name) {
-        super(name);
-    }
-
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("Extra.java");  // this is the important one
-        set.add("MyService.java");
-        set.add("MyServiceService.java");
-        set.add("MyServiceServiceLocator.java");
-        set.add("MyServiceSoapBindingStub.java");
-        set.add("MyService.wsdl");
-        return set;
-    } // shouldExist
-
-    /**
-     * List of files which may or may not be generated.
-     */
-    protected Set mayExist() {
-        HashSet set = new HashSet();
-        return set;
-    }
-
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator +
-                "test" + File.separator + "wsdl" + File.separator +
-                "extra";
-    } // rootDir
-
-        public void testFileGen() throws IOException {
-        String rootDir = rootDir();
-        Set shouldExist = shouldExist();
-        Set mayExist = mayExist();
-
-        // open up the output directory and check what files exist.
-        File outputDir = new File(rootDir);
-        
-        String[] files = outputDir.list();
-
-        Vector shouldNotExist = new Vector();
-
-        for (int i = 0; i < files.length; ++i) {
-            if (shouldExist.contains(files[i])) {
-                shouldExist.remove(files[i]);
-            } 
-            else if (mayExist.contains(files[i])) {
-                mayExist.remove(files[i]);
-            }
-            else {
-                shouldNotExist.add(files[i]);
-            }
-        }
-
-        if (shouldExist.size() > 0) {
-            fail("The following files should exist but do not:  " + shouldExist);
-        }
-
-        if (shouldNotExist.size() > 0) {
-            fail("The following files should NOT exist, but do:  " + shouldNotExist);
-        }
-    }
-} // class AllOptionTestCase
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
deleted file mode 100644
index 705b84b9e..000000000
--- a/axis-ant/src/test/java/test/wsdl/filegen/AllOptionTestCase.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.
- */
-
-/**
- * This tests the file generation of only the items that are referenced in WSDL
- * 
- */ 
-package test.wsdl.filegen;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-import test.AxisFileGenTestBase;
-
-public class AllOptionTestCase extends AxisFileGenTestBase {
-    public AllOptionTestCase(String name) {
-        super(name);
-    }
-
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("Address.java");
-        set.add("OpFault.java");
-        set.add("PortTypeSoap.java");
-        set.add("ReferenceService.java");
-        set.add("ReferenceServiceLocator.java");
-        set.add("ReferenceSoapBindingStub.java");
-        set.add("StateType.java");
-        return set;
-    } // shouldExist
-
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "filegenAll";
-    } // rootDir
-
-} // class AllOptionTestCase
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java b/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
deleted file mode 100644
index aa4884516..000000000
--- a/axis-ant/src/test/java/test/wsdl/filegen/FileGenTestCase.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.
- */
-
-/**
- * This tests the file generation of only the items that are referenced in WSDL
- * 
- * @author Tom Jordahl (tomj@macromedia.com)
- */ 
-package test.wsdl.filegen;
-
-import test.AxisFileGenTestBase;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-public class FileGenTestCase extends AxisFileGenTestBase {
-    public FileGenTestCase(String name) {
-        super(name);
-    }
-
-
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("OpFault.java");
-        set.add("PortTypeSoap.java");
-        set.add("ReferenceService.java");
-        set.add("ReferenceServiceLocator.java");
-        set.add("ReferenceSoapBindingStub.java");
-        return set;
-    }
-    
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "filegen";
-    }
-    
-}
-
diff --git a/axis-ant/src/test/java/test/wsdl/filegen/README b/axis-ant/src/test/java/test/wsdl/filegen/README
deleted file mode 100644
index cc06f0dbf..000000000
--- a/axis-ant/src/test/java/test/wsdl/filegen/README
+++ /dev/null
@@ -1,21 +0,0 @@
-FileGenTestCase verifies that the proper set of files is generated for FileGen.wsdl.  This is a test that would be useful for many WSDL files, so FileGenTestCase is also extensible.
-
-Here is the interface for FileGenTestCase:
-
-FileGenTestCase {
-    public FileGenTestCase(java.lang.String);
-    protected java.util.Set shouldExist();
-    protected java.lang.String rootDir();
-    public void testFileGen() throws java.io.IOException;
-}
-
-All extensions should have a constructor that takes a String and calls super(string).  This is a requirement of the junit framework.
-
-All extensions should override shouldExist.  This method returns a set containing the String local names of the files that should exist in a given directory.
-
-All extensions should override rootDir.  This method returns the name of the directory which will be checked for file existence.
-
-testFileGen is the test that does all the work and extensions do not need to override it.
-
-For a concrete example of an extension to FileGenTestCase, see xml-axis/java/test/wsdl/clash/VerifyFilesTestCase.java.
-
diff --git a/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java b/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
index adfcb75a0..a556338bd 100644
--- a/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
+++ b/axis-ant/src/test/java/test/wsdl/groups/GroupsTestCase.java
@@ -21,111 +21,14 @@
  */ 
 package test.wsdl.groups;
 
-import java.io.File;
 import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
 
 public class GroupsTestCase extends junit.framework.TestCase {
     public GroupsTestCase(String name) {
         super(name);
     }
 
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("SomeType.java");
-        return set;
-    }
-    
-    /**
-     * List of files which may or may not be generated.
-     */
-    protected Set shouldNotExist() {
-        HashSet set = new HashSet();
-        set.add("SomeGroup.java");
-        return set;
-    }
-
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "groups";
-    }
-    
-    protected String getPrefix(String parent) {
-        if (parent == null || parent.length() == 0) {
-            return "";
-        }
-        else {
-            return parent + File.separator;
-        }
-    }
-
-    /** This method returns a array of String file paths, located within the
-     * supplied root directory. The string values are created relative to the 
-     * specified parent so that the names get returned in the form of 
-     * "file.java", "dir/file.java", "dir/dir/file.java", etc. This feature 
-     * asslows the various file specs to include files in sub-directories as
-     * well as the root directory.
-     */    
-    protected String[] getPaths(File root, String parent) {
-        File files[] = root.listFiles();
-        if (files == null)
-            fail("Unable to get a list of files from " + root.getPath());
-
-        Set filePaths = new HashSet();
-        for(int i=0; i<files.length; i++) {
-            if (files[i].isDirectory()) {
-                String children[] = getPaths(files[i],
-                            getPrefix(parent) + files[i].getName());
-                filePaths.addAll(Arrays.asList(children));
-            }
-            else {
-                filePaths.add(getPrefix(parent) + files[i].getName());
-            }
-        }
-        String paths[] = new String[filePaths.size()];
-        return (String[]) filePaths.toArray(paths);
-    }
-
-    
     public void testGroups() throws IOException, ClassNotFoundException, SecurityException, NoSuchMethodException {
-
-        // Test for the proper files
-
-        String rootDir = rootDir();
-        Set shouldExist = shouldExist();
-        Set shouldNotExist = shouldNotExist();
-
-        // open up the output directory and check what files exist.
-        File outputDir = new File(rootDir);
-        
-        String[] files = getPaths(outputDir, null);
-
-        for (int i = 0; i < files.length; ++i) {
-            if (shouldExist.contains(files[i])) {
-                shouldExist.remove(files[i]);
-            } 
-            else if (shouldNotExist.contains(files[i])) {
-                fail("The following file should not exist in " + rootDir +
-			", but does:  " + files[i]);
-            }
-        }
-
-        if (shouldExist.size() > 0) {
-            fail("The following files should exist in " + rootDir + 
-                ", but do not:  " + shouldExist);
-        }
-
     	// Test for the proper members
     
         Class ourClass = Class.forName("test.wsdl.groups.SomeType");
diff --git a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
deleted file mode 100644
index ad362023c..000000000
--- a/axis-ant/src/test/java/test/wsdl/header/VerifyFilesTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.
- */
-
-/**
- * This tests the file generation of only the items that are referenced in WSDL
- * 
- */ 
-package test.wsdl.header;
-
-import test.AxisFileGenTestBase;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-public class VerifyFilesTestCase extends AxisFileGenTestBase {
-    public VerifyFilesTestCase(String name) {
-        super(name);
-    }
-
-    /**
-     * List of files which should be generated.  We're primarily concerned with
-     * the implicit fault class.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-
-        set.add("BindingImpl.java");
-        set.add("BindingSkeleton.java");
-        set.add("BindingStub.java");
-        set.add("HeaderService.java");
-        set.add("HeaderServiceLocator.java");
-        set.add("HeaderServiceTestCase.java");
-        set.add("HeaderType.java");
-        set.add("ImplicitFault.java");
-        set.add("Op1Fault.java");
-        set.add("PortType.java");
-        set.add("deploy.wsdd");
-        set.add("undeploy.wsdd");
-        return set;
-    } // shouldExist
-
-    /**
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "header";
-    } // rootDir
-
-} // class VerifyFilesTestCase
diff --git a/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java b/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
deleted file mode 100644
index 64bbdb9e5..000000000
--- a/axis-ant/src/test/java/test/wsdl/literal/SalesRankNPrice_ServiceTestCase.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * SalesRankNPrice_ServiceTestCase.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis Wsdl2java emitter.
- * Edited by hand to test a .NET web service on the internet.
- *
- *@author Tom Jordahl (tomj@macromedia.com)
- */
-
-package test.wsdl.literal;
-
-import java.io.File;
-import java.io.IOException;
-
-public class SalesRankNPrice_ServiceTestCase extends junit.framework.TestCase {
-    // List of files which should be generated
-    private static String[] shouldExist= new String[] {
-        "SalesRankNPrice1.java",
-        "SalesRanks.java",
-        "Prices.java",
-        "All.java",
-        "SalesRankNPriceSoap.java",
-        "SalesRankNPriceSoapStub.java",
-        "SalesRankNPrice.java",
-        "SalesRankNPriceLocator.java"
-        
-    };
-    
-    // List of files which should NOT be generated
-    private static String[] shouldNotExist= new String[] {
-        "GetAmazonSalesRank.java",
-        "GetAmazonSalesRankResponse.java",
-        "GetAmazonUKSalesRank.java",
-        "GetAmazonUKSalesRankResponse.java",
-        "GetBNSalesRank.java",
-        "GetBNSalesRankResponse.java",
-        "GetAmazonPrice.java",
-        "GetAmazonPriceReponse.java",
-        "GetAmazonUKPrice.java",
-        "GetAmazonUKPriceResponse.java",
-        "GetBNPrice.java",
-        "GetBNPriceResponse.java",
-        "GetAmazonSalesRankNPrice.java",
-        "GetAmazonSalesRankNPriceResponse.java",
-        "GetBNSalesRankNPrice.java",
-        "GetBNSalesRankNPriceResponse.java",
-        "GetAmazonAndBNSalesRank.java",
-        "GetAmazonAndBNSalesRankResponse.java",
-        "GetAmazonAndBNPrice.java",
-        "GetAmazonAndBNPriceResponse.java",
-        "GetAll.java",
-        "GetAllResponse.java"
-    };
-
-    public void testFileGen() throws IOException {
-        String rootDir = "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator + "literal";
-        // open up the output directory and check what files exist.
-        File outputDir = new File(rootDir);
-        
-        String[] files = outputDir.list();
-        
-        for (int i=0; i < shouldExist.length; i++) {
-            File f = new File(rootDir, shouldExist[i]);
-            assertTrue("File does not exist (and it should): " + shouldExist[i], f.exists()); 
-        }
-        
-        for (int i=0; i < shouldNotExist.length; i++) {
-            File f = new File(rootDir, shouldNotExist[i]);
-            assertTrue("File exist (and it should NOT): " + shouldNotExist[i], !f.exists()); 
-        }
-    }
-}
diff --git a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java b/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
deleted file mode 100644
index e62c91685..000000000
--- a/axis-ant/src/test/java/test/wsdl/multibinding/VerifyFilesTestCase.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.
- */
-
-/**
- * This tests the file generation of only the items that are referenced in WSDL
- * 
- */ 
-package test.wsdl.multibinding;
-
-import test.AxisFileGenTestBase;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-public class VerifyFilesTestCase extends AxisFileGenTestBase {
-    public VerifyFilesTestCase(String name) {
-        super(name);
-    }
-
-    /**
-     * List of files which should be generated.
-     */
-    protected Set shouldExist() {
-        HashSet set = new HashSet();
-        set.add("BindingAllLitImpl.java");
-        set.add("BindingAllLitSkeleton.java");
-        set.add("BindingAllLitStub.java");
-        set.add("BindingNoLitImpl.java");
-        set.add("BindingNoLitSkeleton.java");
-        set.add("BindingNoLitStub.java");
-        set.add("BindingSomeLitImpl.java");
-        set.add("BindingSomeLitSkeleton.java");
-        set.add("BindingSomeLitStub.java");
-        set.add("MbPT.java");
-        set.add("MbService.java");
-        set.add("MbServiceLocator.java");
-        set.add("MbServiceTestCase.java");
-        set.add("deploy.wsdd");
-        set.add("undeploy.wsdd");
-        return set;
-    } // shouldExist
-
-    /**
-     * The directory containing the files that should exist.
-     */
-    protected String rootDir() {
-        return "target" + File.separator + "work" + File.separator + 
-                "test" + File.separator + "wsdl" + File.separator +
-                "multibinding";
-    } // rootDir
-
-} // class VerifyFilesTestCase
diff --git a/pom.xml b/pom.xml
index 5b0898e03..3a1e6f524 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,18 @@
     <prerequisites>
         <maven>3.0.3</maven>
     </prerequisites>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>cloudbees-snapshot</id>
+            <url>http://repository-veithen.forge.cloudbees.com/snapshot/</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
     <build>
         <pluginManagement>
             <plugins>
@@ -250,6 +262,11 @@
                     <artifactId>maven-eclipse-plugin</artifactId>
                     <version>2.9</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.veithen.filecheck</groupId>
+                    <artifactId>filecheck-maven-plugin</artifactId>
+                    <version>0.1-SNAPSHOT</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

From 59b279f6fb86440b542726dca09ff39b55edc99f Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 6 May 2014 21:57:28 +0000
Subject: [PATCH 054/133] Fixed a build failure that occurs with Maven 3.2.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3a1e6f524..0afd74687 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-shade-plugin</artifactId>
-                    <version>2.0</version>
+                    <version>2.3</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-eclipse-plugin</artifactId>

From fad86d6408e68cd804bc41da6e17ce7cbd0f596d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 6 May 2014 21:57:45 +0000
Subject: [PATCH 055/133] Use the version of the file that was at
 http://www.apache.org/LICENSE.txt when the original test case was written.

---
 .../src/test/resources/test/saaj/LICENSE.txt  | 422 +++---------------
 1 file changed, 57 insertions(+), 365 deletions(-)

diff --git a/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt b/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt
index 27561b72e..de6706f26 100644
--- a/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt
+++ b/axis-rt-core/src/test/resources/test/saaj/LICENSE.txt
@@ -1,366 +1,58 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html lang="en">
-  <head>
-    <title>Licenses</title>
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2000 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ *    if any, must include the following acknowledgment:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowledgment may appear in the software itself,
+ *    if and wherever such third-party acknowledgments normally appear.
+ *
+ * 4. The names "Apache" and "Apache Software Foundation" must
+ *    not be used to endorse or promote products derived from this
+ *    software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache",
+ *    nor may "Apache" appear in their name, without prior written
+ *    permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ *
+ * Portions of this software are based upon public domain software
+ * originally written at the National Center for Supercomputing Applications,
+ * University of Illinois, Urbana-Champaign.
+ */
 
-    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    <meta property="og:image" content="http://www.apache.org/images/asf_logo.gif" />
-
-    <link rel="stylesheet" type="text/css" media="screen" href="/css/style.css">
-    <link rel="stylesheet" type="text/css" media="screen" href="/css/code.css">
-
-    <script type="text/javascript" src="/js/jquery.js"></script>
-    <script type="text/javascript" src="/js/apache_boot.js"></script>
-
-    
-
-    
-    <!-- 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 &quot;License&quot;); 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 &quot;AS IS&quot; 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. -->
-  </head>
-
-  <body>
-    <div id="page" class="container_16">
-      <div id="header" class="grid_8">
-        <img src="/images/feather-small.gif" alt="The Apache Software Foundation">
-        <h1>The Apache Software Foundation</h1>
-        <h2>Licenses</h2>
-      </div>
-      <div id="nav" class="grid_8">
-        <ul>
-          <!-- <li><a href="/" title="Welcome!">Home</a></li> -->
-          <li><a href="/foundation/" title="The Foundation">Foundation</a></li>
-          <li><a href="http://projects.apache.org" title="The Projects">Projects</a></li>
-          <li><a href="http://people.apache.org" title="The People">People</a></li>
-          <li><a href="/foundation/getinvolved.html" title="Get Involved">Get Involved</a></li>
-          <li><a href="/dyn/closer.cgi" title="Download">Download</a></li>
-          <li><a href="/foundation/sponsorship.html" title="Support Apache">Support Apache</a></li>
-        </ul>
-        <p><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/licenses/">Licenses</a></p>
-        <form name="search" id="search" action="http://www.google.com/search" method="get">
-          <input value="apache.org" name="sitesearch" type="hidden"/>
-          <input type="text" name="q" id="query">
-          <input type="submit" id="submit" value="Search">
-        </form>
-      </div>
-      <div class="clear"></div>
-      <div id="content" class="grid_16"><div class="section-content"><p>The Apache Software Foundation uses various licenses to <a href="#distributions">distribute
-software and documentation</a>, to accept regular
-<a href="#clas">contributions from individuals and corporations</a>, and to accept
-larger <a href="#grants">grants of existing software products</a>.</p>
-<p>These licenses help us achieve our goal of providing reliable and
-long-lived software products through collaborative open source software
-development. In all cases, contributors retain full rights to use their
-original contributions for any other purpose outside of Apache while
-providing the ASF and its projects the right to distribute and build upon
-their work within Apache.</p>
-<h1 id="distributions">Licensing of Distributions</h1>
-<p>All software produced by The Apache Software Foundation or any of its
-projects or subjects is licensed according to the terms of the documents
-listed below.</p>
-<h2 id="2.0">Apache License, Version 2.0 (current)</h2>
-<p><a href="LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a> (
-<a href="LICENSE-2.0.txt">TXT</a> or <a href="LICENSE-2.0.html">HTML</a> )</p>
-<p>The 2.0 version of the Apache License was approved by the ASF in 2004. The
-goals of this license revision have been to reduce the number of frequently
-asked questions, to allow the license to be reusable without modification
-by any project (including non-ASF projects), to allow the license to be
-included by reference instead of listed in every file, to clarify the
-license on submission of contributions, to require a patent license on
-contributions that necessarily infringe the contributor's own patents, and
-to move comments regarding Apache and other inherited attribution notices
-to a location outside the license terms (the <a href="example-NOTICE.txt">NOTICE
-file</a> ).</p>
-<p>The result is a license that is supposed to be compatible with other open
-source licenses, while remaining true to the original goals of the Apache
-Group and supportive of collaborative development across both nonprofit and
-commercial organizations. The Apache Software Foundation is still trying to
-determine if this version of the Apache License is <a href="GPL-compatibility.html">compatible with the
-GPL</a>.</p>
-<p>All packages produced by the ASF are implicitly licensed under the Apache
-License, Version 2.0, unless otherwise explicitly stated. More developer
-documentation on how to apply the Apache License to your work can be found
-in * <a href="../dev/apply-license.html">Applying the Apache License, Version 2.0</a>
-*.</p>
-<h2 id="1.1">Apache License, Version 1.1 (historic)</h2>
-<p><a href="LICENSE-1.1">http://www.apache.org/licenses/LICENSE-1.1</a> </p>
-<p>The 1.1 version of the Apache License was approved by the ASF in 2000. The
-primary change from the 1.0 license is in the 'advertising clause' (section
-3 of the 1.0 license); derived products are no longer required to include
-attribution in their advertising materials, only in their documentation.</p>
-<p>Individual packages licensed under the 1.1 version may have used different
-wording due to varying requirements for attribution or mark identification,
-but the binding terms were all the same.</p>
-<h2 id="1.0">Apache License, Version 1.0 (historic)</h2>
-<p><a href="LICENSE-1.0">http://www.apache.org/licenses/LICENSE-1.0</a> </p>
-<p>This is the original Apache License which applies only to older versions of
-Apache packages (such as version 1.2 of the Web server).</p>
-<h1 id="clas">Contributor License Agreements</h1>
-<p>The ASF desires that all contributors of ideas, code, or documentation to
-the Apache projects complete, sign, and submit (via postal mail, fax or
-email) an <a href="icla.txt">Individual Contributor License Agreement</a> (1) (CLA) [ <a href="icla.pdf">PDF
-form</a> ]. The purpose of this agreement is to clearly define the
-terms under which intellectual property has been contributed to the ASF and
-thereby allow us to defend the project should there be a legal dispute
-regarding the software at some future time. A signed CLA is required to be
-on file before an individual is given commit rights to an ASF project.</p>
-<p>For a corporation that has assigned employees to work on an Apache project,
-a <a href="cla-corporate.txt">Corporate CLA</a> (CCLA) is available for contributing
-intellectual property via the corporation, that may have been assigned as
-part of an employment agreement. Note that a Corporate CLA does not remove
-the need for every developer to sign their own CLA as an individual, to
-cover any of their contributions which are not owned by the corporation
-signing the CCLA.</p>
-<p>CLAs may be submitted by traditional postal mail, fax, or by emailing a
-scan of the signed copy to secretary@apache.org. You can also fill out the <a href="icla.pdf">pdf
-document</a> or edit the <a href="icla.txt">text document</a>, create a detached gpg signature, and
-send both the document and the detached signature via email to secretary.</p>
-<p>Note: If you choose to send this document via fax then be absolutely sure
-that you have sent it correctly. Faxes are often received back-to-front,
-blank, or totally illegible.</p>
-<p>The ICLA is not tied to any employer you may have, so it is recommended to
-use one's personal email address in the contact details, rather than an @work
-address.</p>
-<p>Your Full name will be published unless you provide an alternative Public name.
-For example if your full name is Andrew Bernard Charles Dickens, but you wish
-to be known as Andrew Dickens, please enter the latter as your Public name.</p>
-<p>The email address and other contact details are not published.</p>
-<p>(1) Please use overwrite mode when typing in the underlined fields.
-Otherwise the fields will wrap, making the result harder to read.</p>
-<h1 id="grants">Software Grants</h1>
-<p>When an individual or corporation decides to donate a body of existing
-software or documentation to one of the Apache projects, they need to
-execute a formal <a href="software-grant.txt">Software Grant Agreement</a> (SGA) with
-the ASF. Typically, this is done after negotiating approval with the ASF
-<a href="http://incubator.apache.org/">Incubator</a> or one of the PMCs, since the ASF
-will not accept software unless there is a viable community available to
-support a collaborative project.</p>
-<p>Grants may be submitted by traditional postal mail, fax, or by emailing a
-scan of the signed copy to secretary@.
-You can also edit the text document, create a detached gpg signature, and
-send both the document and the detached signature via email to secretary.</p>
-<p>Note: If you choose to send this document via fax then be absolutely sure
-that you have sent it correctly. Faxes are often received back-to-front,
-blank, or totally illegible.</p>
-<h1 id="crypto">Export restrictions</h1>
-<p>For export restriction information, please consult our <a href="/licenses/exports/">ASF Export
-Classifications</a> page.</p>
-<h1 id="trademarks">Trademark and Logo Usage</h1>
-<p>For ASF trademark and logo usage information, please consult our <a href="/foundation/marks/">ASF
-Trademark Use Policy</a> page.</p>
-<h1 id="questions">Questions?</h1>
-<p>For answers to frequently asked licensing questions, please consult our 
-<a href="/foundation/license-faq.html">Licensing Frequently Asked Questions</a> page.</p></div></div>
-      <div class="clear"></div>
-    </div>
-    <div id="footer" class="container_16">
-      <div class="links grid_16">
-      <div class="grid_3">
-        <h4>Projects</h4>
-        <ul>
-<li><a href="http://httpd.apache.org/" title="Apache Web Server (httpd)">HTTP Server</a></li>
-<li><a href="http://abdera.apache.org/" title="Atom Publishing Protocol Implementation">Abdera</a></li>
-<li><a href="http://accumulo.apache.org/" title="Sorted, distributed key/value store">Accumulo</a></li>
-<li><a href="http://ace.apache.org/" title="Centralized life cycle management and deployment of OSGi based and related modular software artifacts for distribution.">ACE</a></li>
-<li><a href="http://activemq.apache.org/" title="Distributed Messaging System">ActiveMQ</a></li>
-<li><a href="http://airavata.apache.org/" title="Workflow and Computational Job Management Middleware">Airavata</a></li>
-<li><a href="http://ambari.apache.org/" title="Hadoop cluster management">Ambari</a></li>
-<li><a href="http://ant.apache.org/" title="Java-based build tool">Ant</a></li>
-<li><a href="http://any23.apache.org/" title="Anything to Triples">Any23</a></li>
-<li><a href="http://apr.apache.org/" title="Apache Portable Runtime libraries">APR</a></li>
-<li><a href="http://archiva.apache.org/" title="Build Artifact Repository Manager">Archiva</a></li>
-<li><a href="http://aries.apache.org/" title="Enterprise OSGi application programming model">Aries</a></li>
-<li><a href="http://avro.apache.org/" title="A Serialization System">Avro</a></li>
-<li><a href="http://axis.apache.org/" title="Java SOAP Engine">Axis</a></li>
-<li><a href="http://bigtop.apache.org/" title="Apache Hadoop ecosystem integration and distribution project">Bigtop</a></li>
-<li><a href="http://bloodhound.apache.org/" title="Issue tracking, wiki and repository browser">Bloodhound</a></li>
-<li><a href="http://buildr.apache.org/" title="Simple and intuitive build system for Java applications">Buildr</a></li>
-<li><a href="http://bval.apache.org/" title="Apache BVal: JSR-303 Bean Validation Implementation and Extensions">BVal</a></li>
-<li><a href="http://camel.apache.org/" title="Spring based Integration Framework which implements the Enterprise Integration Patterns">Camel</a></li>
-<li><a href="http://cassandra.apache.org/" title="Highly scalable second-generation distributed database">Cassandra</a></li>
-<li><a href="http://cayenne.apache.org/" title="User-friendly Java ORM with Tools">Cayenne</a></li>
-<li><a href="http://chemistry.apache.org/" title="CMIS (Content Managment Interoperability Services) Clients and Servers">Chemistry</a></li>
-<li><a href="http://chukwa.apache.org/" title="Open source data collection system for monitoring large distributed systems.">Chukwa</a></li>
-<li><a href="http://clerezza.apache.org/" title="Semantically linked data for OSGi">Clerezza</a></li>
-<li><a href="http://click.apache.org/" title="User-friendly page and component oriented web framework">Click</a></li>
-<li><a href="http://cloudstack.apache.org/" title="Infrastructure as a Service solution">CloudStack</a></li>
-<li><a href="http://cocoon.apache.org/" title="Web development framework: separation of concerns, component-based">Cocoon</a></li>
-<li><a href="http://commons.apache.org/" title="Reusable Java components">Commons</a></li>
-<li><a href="http://continuum.apache.org/" title="Continuous Integration and Build Server">Continuum</a></li>
-<li><a href="http://cordova.apache.org/" title="Platform for building native mobile applications using HTML, CSS and JavaScript">Cordova</a></li>
-<li><a href="http://couchdb.apache.org/" title="RESTful document database">CouchDB</a></li>
-<li><a href="http://creadur.apache.org/" title="Comprehension and auditing of software distributions">Creadur</a></li>
-<li><a href="http://crunch.apache.org/" title="Simple and Efficient MapReduce Pipelines">Crunch</a></li>
-<li><a href="http://ctakes.apache.org/" title="Natural language processing (NLP) tool for information extraction from electronic medical record clinical free-text">cTAKES</a></li>
-<li><a href="http://curator.apache.org/" title="Java libraries that make using Apache ZooKeeper easier">Curator</a></li>
-<li><a href="http://cxf.apache.org/" title="Service Framework">CXF</a></li>
-<li><a href="http://db.apache.org/" title="Database access">DB</a></li>
-<li><a href="http://deltacloud.apache.org/" title="RESTful cloud management interface">Deltacloud</a></li>
-<li><a href="http://directmemory.apache.org/" title="An off-heap cache for the Java Virtual Machine">DirectMemory</a></li>
-<li><a href="http://directory.apache.org/" title="Apache Directory Server">Directory</a></li>
-<li><a href="http://empire-db.apache.org/" title="Relational Data Persistence">Empire-db</a></li>
-<li><a href="http://etch.apache.org/" title="Cross-platform, language- and transport-independent RPC-like messaging framework">Etch</a></li>
-<li><a href="http://felix.apache.org/" title="OSGi Framework and components.">Felix</a></li>
-<li><a href="http://flex.apache.org/" title="Application framework for expressive web applications that deploy to all major browsers, desktops and devices.">Flex</a></li>
-<li><a href="http://flume.apache.org/" title="A reliable service for efficiently collecting, aggregating, and moving large amounts of log data">Flume</a></li>
-<li><a href="http://forrest.apache.org/" title="Aggregated multi-channel documentation, separation of concerns">Forrest</a></li>
-<li><a href="http://geronimo.apache.org/" title="Java2, Enterprise Edition (J2EE) container">Geronimo</a></li>
-<li><a href="http://giraph.apache.org/" title="Iterative graph processing system built for high scalability">Giraph</a></li>
-<li><a href="http://gora.apache.org/" title="ORM framework for column stores such as Apache HBase and Apache Cassandra with a specific focus on Hadoop">Gora</a></li>
-<li><a href="http://gump.apache.org/" title="Continuous integration of open source projects">Gump</a></li>
-<li><a href="http://hadoop.apache.org/" title="Distributed computing platform">Hadoop</a></li>
-<li><a href="http://hama.apache.org/" title="a Bulk Synchronous Parallel computing framework on top of Hadoop">Hama</a></li>
-<li><a href="http://hbase.apache.org/" title="Hadoop Database">HBase</a></li>
-<li><a href="http://hive.apache.org/" title="Data warehouse infrastructure using the Hadoop Database">Hive</a></li>
-<li><a href="http://hc.apache.org/" title="Java toolset of low level HTTP components">HttpComponents</a></li>
-<li><a href="http://isis.apache.org/" title="Framework for rapidly developing domain-driven apps in Java">Isis</a></li>
-<li><a href="http://jackrabbit.apache.org/" title="Content Repository for Java">Jackrabbit</a></li>
-<li><a href="http://james.apache.org/" title="Java Apache Mail Enterprise Server">James</a></li>
-<li><a href="http://jclouds.apache.org/" title="Java cloud APIs and abstractions">jclouds</a></li>
-<li><a href="http://jena.apache.org/" title="Java framework for building Semantic Web applications">Jena</a></li>
-<li><a href="http://jmeter.apache.org/" title="Java performance and functional testing">JMeter</a></li>
-<li><a href="http://jspwiki.apache.org/" title="Leading open source WikiWiki engine, feature-rich and built around standard J2EE components (Java, servlets, JSP). ">JSPWiki</a></li>
-<li><a href="http://juddi.apache.org/" title="Java implementation of the Universal Description, Discovery, and Integration specification">jUDDI</a></li>
-<li><a href="http://kafka.apache.org/" title="Distributed publish-subscribe messaging system">Kafka</a></li>
-<li><a href="http://karaf.apache.org/" title="Server-side OSGi distribution">Karaf</a></li>
-<li><a href="http://lenya.apache.org/" title="Content Management System">Lenya</a></li>
-<li><a href="http://libcloud.apache.org/" title="Unified interface to the cloud">Libcloud</a></li>
-<li><a href="http://logging.apache.org/" title="Cross-language logging services">Logging</a></li>
-<li><a href="http://lucene.apache.org/" title="Search engine library">Lucene</a></li>
-<li><a href="http://lucenenet.apache.org/" title="Search engine library targeted at .NET runtime users.">Lucene.Net</a></li>
-<li><a href="http://lucy.apache.org/" title="Search engine library for dynamic languages">Lucy</a></li>
-<li><a href="http://mahout.apache.org/" title="Scalable machine learning library">Mahout</a></li>
-<li><a href="http://manifoldcf.apache.org/" title="Framework for connecting source content repositories to target repositories or indexes.">ManifoldCF</a></li>
-<li><a href="http://marmotta.apache.org/" title="An Open Platform for Linked Data">Marmotta</a></li>
-<li><a href="http://maven.apache.org/" title="Java project management and comprehension tools">Maven</a></li>
-<li><a href="http://mesos.apache.org/" title="a cluster manager that provides efficient resource isolation and sharing across distributed applications">Mesos</a></li>
-<li><a href="http://mina.apache.org/" title="Multipurpose Infrastructure for Network Application">MINA</a></li>
-<li><a href="http://mrunit.apache.org/" title="Java library that helps developers unit test Apache Hadoop map reduce jobs">MRUnit</a></li>
-<li><a href="http://myfaces.apache.org/" title="JavaServer(tm) Faces implementation and components">MyFaces</a></li>
-<li><a href="http://nutch.apache.org/" title="Open Source Web Search Software">Nutch</a></li>
-<li><a href="http://ode.apache.org/" title="Orchestration Director Engine: Business Process Management (BPM), Process Orchestration and Workflow through service composition.">ODE</a></li>
-<li><a href="http://ofbiz.apache.org/" title="Open for Business: enterprise automation software">OFBiz</a></li>
-<li><a href="http://oltu.apache.org/" title="OAuth protocol implementation in Java">Oltu</a></li>
-<li><a href="http://onami.apache.org/" title="Development and maintenance of a set of Google Guice extensions">Onami</a></li>
-<li><a href="http://oodt.apache.org/" title="Object Oriented Data Technology (middleware metadata)">OODT</a></li>
-<li><a href="http://oozie.apache.org/" title="A workflow scheduler system to manage Apache Hadoop jobs.">Oozie</a></li>
-<li><a href="http://openjpa.apache.org/" title="OpenJPA: Object Relational Mapping for Java">OpenJPA</a></li>
-<li><a href="http://openmeetings.apache.org/" title="OpenMeetings: Web-Conferencing and real-time collaboration">OpenMeetings</a></li>
-<li><a href="http://opennlp.apache.org/" title="Machine learning based toolkit for the processing of natural language text">OpenNLP</a></li>
-<li><a href="http://openoffice.apache.org/" title="An open-source, office-document productivity suite">OpenOffice</a></li>
-<li><a href="http://openwebbeans.apache.org/" title="OpenWebBeans: JSR-299 Context and Dependency Injection for Java EE Platform Implementation">OpenWebBeans</a></li>
-<li><a href="http://pdfbox.apache.org/" title="Java library for working with PDF documents">PDFBox</a></li>
-<li><a href="http://perl.apache.org/" title="Dynamic websites using Perl">Perl</a></li>
-<li><a href="http://pig.apache.org/" title="Platform for analyzing large data sets">Pig</a></li>
-<li><a href="http://pivot.apache.org/" title="Rich Internet applications in Java">Pivot</a></li>
-<li><a href="http://poi.apache.org/" title="Java API for OLE 2 Compound and OOXML Documents">POI</a></li>
-<li><a href="http://portals.apache.org/" title="Portal technology">Portals</a></li>
-<li><a href="http://qpid.apache.org/" title="Multiple language implementation of the latest Advanced Message Queuing Protocol (AMQP)">Qpid</a></li>
-<li><a href="http://rave.apache.org/" title="Web and social mashup engine">Rave</a></li>
-<li><a href="http://river.apache.org/" title="Jini service oriented architecture">River</a></li>
-<li><a href="http://roller.apache.org/" title="Java blog server">Roller</a></li>
-<li><a href="http://santuario.apache.org/" title="XML Security in Java and C++">Santuario</a></li>
-<li><a href="http://servicemix.apache.org/" title="Enterprise Service Bus">ServiceMix</a></li>
-<li><a href="http://shindig.apache.org/" title="Opensocial Reference Implementation">Shindig</a></li>
-<li><a href="http://shiro.apache.org/" title="Powerful and easy-to-use application security framework">Shiro</a></li>
-<li><a href="http://sis.apache.org/" title="Spatial Information System">SIS</a></li>
-<li><a href="http://sling.apache.org/" title="Web Framework for JCR Content Repositories">Sling</a></li>
-<li><a href="http://spamassassin.apache.org/" title="Mail filter to identify spam">SpamAssassin</a></li>
-<li><a href="http://sqoop.apache.org/" title="Bulk Data Transfer for Hadoop and Structured Datastores">Sqoop</a></li>
-<li><a href="http://stanbol.apache.org/" title="Reusable components for semantic content management">Stanbol</a></li>
-<li><a href="http://steve.apache.org/" title="Apache's Python based single transferable vote software system">STeVe</a></li>
-<li><a href="http://struts.apache.org/" title="Model 2 framework for building Java web applications">Struts</a></li>
-<li><a href="http://subversion.apache.org/" title="Version Control">Subversion</a></li>
-<li><a href="http://synapse.apache.org/" title="Enterprise Service Bus and Mediation Framework">Synapse</a></li>
-<li><a href="http://syncope.apache.org/" title="Managing digital identities in enterprise environments">Syncope</a></li>
-<li><a href="http://tapestry.apache.org/" title="Component-based Java Web Application Framework">Tapestry</a></li>
-<li><a href="http://tcl.apache.org/" title="Dynamic websites using TCL">Tcl</a></li>
-<li><a href="http://thrift.apache.org/" title="Framework for scalable cross-language services development">Thrift</a></li>
-<li><a href="http://tika.apache.org" title="Content Analysis and Detection Toolkit">Tika</a></li>
-<li><a href="http://tiles.apache.org/" title="A templating framework for web application user interfaces">Tiles</a></li>
-<li><a href="http://tomcat.apache.org/" title="A Java Servlet and JSP Container">Tomcat</a></li>
-<li><a href="http://tomee.apache.org/" title="Java EE Web Profile built on Tomcat">TomEE</a></li>
-<li><a href="http://trafficserver.apache.org/" title="A fast, scalable and extensible HTTP/1.1 compliant caching proxy server">Traffic Server</a></li>
-<li><a href="http://turbine.apache.org/" title="A Java Servlet Web Application Framework and associated component library">Turbine</a></li>
-<li><a href="http://tuscany.apache.org/" title="An SCA based Service Composition Framework">Tuscany</a></li>
-<li><a href="http://uima.apache.org/" title="Framework and annotators for unstructured information analysis">UIMA</a></li>
-<li><a href="http://vcl.apache.org/" title="Virtual Computing Lab">VCL</a></li>
-<li><a href="http://velocity.apache.org/" title="A Java Templating Engine">Velocity</a></li>
-<li><a href="http://ws.apache.org/" title="Projects related to Web Services">Web Services</a></li>
-<li><a href="http://whirr.apache.org/" title="Libraries for running Cloud Services">Whirr</a></li>
-<li><a href="http://wicket.apache.org/" title="Component-based Java Web Application Framework.">Wicket</a></li>
-<li><a href="http://wink.apache.org/" title="RESTful Web services Framework">Wink</a></li>
-<li><a href="http://wookie.apache.org/" title="Widgets for Applications">Wookie</a></li>
-<li><a href="http://xalan.apache.org/" title="XSLT processors in Java and C++">Xalan</a></li>
-<li><a href="http://xerces.apache.org/" title="XML parsers in Java, C++ and Perl">Xerces</a></li>
-<li><a href="http://xmlbeans.apache.org/" title="XML-Java binding tool">XMLBeans</a></li>
-<li><a href="http://xmlgraphics.apache.org/" title="Conversion from XML to graphical output">XML Graphics</a></li>
-<li><a href="http://zookeeper.apache.org/" title="Centralized service for maintaining configuration information">ZooKeeper</a></li>
-</ul>
-      </div>
-      <div class="grid_3">
-        <h4>Foundation</h4>
-        <ul>
-          <li><a href="/foundation/faq.html">FAQ</a></li> 
-          <li><a href="/foundation/glossary.html">Glossary</a></li> 
-          <li><a href="/licenses/" title="Overview of the Apache Licenese">Licenses</a></li> 
-          <li><a href="/foundation/marks/" title="Apache marks policies and listing">Trademarks</a></li>  
-          <li><a href="/foundation/news.html" title="Official news feed of Foundation announcements">News</a></li> 
-          <li><a href="/press/" title="Press, Media, and Analyst contact">Press Inquiries</a></li> 
-          <li><a href="/foundation/records/" title="Formal corporate records and board meeting minutes">Public Records</a></li> 
-          <li><a href="/foundation/mailinglists.html" title="Mailing lists and Apache">Mailing Lists</a></li> 
-          <li><a href="/foundation/sponsorship.html" title="Sponsor the Foundation">Sponsorship</a></li> 
-          <li><a href="/foundation/contributing.html" title="Donate to the Foundation">Donations</a></li> 
-          <li><a href="/foundation/buy_stuff.html" title="Buy Apache branded merchandise">Buy Stuff</a></li> 
-          <li><a href="/foundation/thanks.html" title="Thank you to our Sponsors">Thanks</a></li> 
-          <li><a href="/foundation/contact.html" title="Contact Us">Contact</a></li> 
-        </ul>
-      </div>
-      <div class="grid_3 suffix_1">
-        <h4>Foundation Projects</h4>
-        <ul>
-          <li><a href="http://attic.apache.org/" title="Inactive projects repository">Attic</a></li> 
-          <li><a href="/foundation/conferences.html" title="Meetings of developers and users">Conferences</a></li> 
-          <li><a href="http://community.apache.org/" title="Helping newcomers to the ASF">Community Development</a></li> 
-          <li><a href="http://incubator.apache.org/" title="Shepherd for new projects">Incubator</a></li> 
-          <li><a href="/dev/" title="ASF Infrastructure: Operations and howto documents for PMCs and contributors">Infrastructure</a></li> 
-          <li><a href="http://labs.apache.org/" title="The Innovation Laboratories of the Apache Software Foundation">Labs</a></li> 
-          <li><a href="/legal/" title="Legal Affairs">Legal Affairs</a></li> 
-          <li><a href="/press/" title="Public Relations">Public Relations</a></li> 
-          <li><a href="/security/" title="Security">Security</a></li> 
-          <li><a href="/travel/" title="Travel Assistance">Travel Assistance</a></li> 
-        </ul>
-      </div>
-      
-      <div class="grid_3">
-        <h4>Community</h4>
-        <ul>
-          <li><a href="http://people.apache.org/" title="Apache committer homepages">People</a></li> 
-          <li><a href="/memorials/" title="In memoriam of past committers">Memorials</a></li> 
-          <li><a href="http://feathercast.org/" title="Apache Podcasts">Feathercast</a></li> 
-          <li><a href="http://blogs.apache.org/" title="Apache Project Blogs">Project Blogs</a></li> 
-          <li><a href="http://planet.apache.org/committers/" title="Apache Committers' Blogs">PlanetApache</a></li> 
-        </ul>
-      </div>
-      <div class="grid_3">
-        <h4>How It Works</h4>
-        <ul>
-          <li><a href="/foundation/how-it-works.html">Introduction</a></li> 
-          <li><a href="/foundation/how-it-works.html#meritocracy">Meritocracy</a></li> 
-          <li><a href="/foundation/how-it-works.html#structure">Structure</a></li> 
-          <li><a href="/foundation/how-it-works.html#roles">Roles</a></li> 
-          <li><a href="/foundation/how-it-works.html#management">Collaboration</a></li> 
-          <li><a href="/foundation/how-it-works.html#incubator">Incubator</a></li> 
-          <li><a href="/foundation/how-it-works.html#other">Other entities</a></li> 
-          <li><a href="/foundation/glossary.html">Glossary</a></li> 
-          <li><a href="/foundation/voting.html">Voting</a></li> 
-        </ul>
-      </div>
-    </div>
-    <div class="clear"></div>
-    
-    </div>
-    <div id="copyright" class="container_16">
-      <p>Copyright &#169; 2012 The Apache Software Foundation, Licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>.<br/>Apache and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
-    </div>
-  </body>
-</html>

From f589989ec53f065f5320d5c4352372a2e579c6d9 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 9 Mar 2015 18:53:25 +0000
Subject: [PATCH 056/133] Update plugin repository location.

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0afd74687..701531195 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,8 +157,8 @@
     </prerequisites>
     <pluginRepositories>
         <pluginRepository>
-            <id>cloudbees-snapshot</id>
-            <url>http://repository-veithen.forge.cloudbees.com/snapshot/</url>
+            <id>veithen-github-mvn-repo</id>
+            <url>https://raw.github.com/veithen/mvn-repo/master/snapshots/</url>
             <releases>
                 <enabled>false</enabled>
             </releases>

From bb166757946ce28df397582b455b8688f99c1e03 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 9 May 2015 14:44:07 +0000
Subject: [PATCH 057/133] Set svn:ignore for Eclipse.


From 8fe2bbb1a18275b3d329a04c6bff133fe92fec54 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 7 Jun 2015 17:32:33 +0000
Subject: [PATCH 058/133] Fix whitespace.

---
 .../apache/axis/attachments/DimeBodyPart.java | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
index 5d9c65d7f..b4c4fc020 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
@@ -319,51 +319,51 @@ void send(java.io.OutputStream os, byte position, DataHandler dh,
     void send(java.io.OutputStream os, byte position, DynamicContentDataHandler dh,
             final long maxchunk)
             throws java.io.IOException {
-    	
-    		BufferedInputStream in = new BufferedInputStream(dh.getInputStream());
-    		
-    		final int myChunkSize = dh.getChunkSize();
-    		
-    		byte[] buffer1 = new byte[myChunkSize]; 
-    		byte[] buffer2 = new byte[myChunkSize]; 
-    		
-    		int bytesRead1 = 0 , bytesRead2 = 0;
-
-    		bytesRead1 = in.read(buffer1);
-    		
-    		if(bytesRead1 < 0) {
-                sendHeader(os, position, 0, ONLY_CHUNK);
-                os.write(pad, 0, dimePadding(0));
-                return;
-    		}
-    		byte chunkbyte = CHUNK;
-    		do {
-    			bytesRead2 = in.read(buffer2);
-    			
-    			if(bytesRead2 < 0) {
-    				//last record...do not set the chunk bit.
-    				//buffer1 contains the last chunked record!!
-    			   
-    			    //Need to distinguish if this is the first 
-    			    //chunk to ensure the TYPE and ID are sent
-    			    if ( chunkbyte == CHUNK ){
-    			        chunkbyte = ONLY_CHUNK;
-    			    } else {
-    			        chunkbyte = LAST_CHUNK;
-    			    }
-    				sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
-    				break;
-    			}
-    			
-    			sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
-    			//set chunk byte to next chunk flag to avoid
-    			//sending TYPE and ID on subsequent chunks
-    			chunkbyte = CHUNK_NEXT;
-    			//now that we have written out buffer1, copy buffer2 into to buffer1
-    			System.arraycopy(buffer2,0,buffer1,0,myChunkSize);
-    			bytesRead1 = bytesRead2;
-    			
-    		}while(bytesRead2 > 0);
+    
+        BufferedInputStream in = new BufferedInputStream(dh.getInputStream());
+        
+        final int myChunkSize = dh.getChunkSize();
+        
+        byte[] buffer1 = new byte[myChunkSize]; 
+        byte[] buffer2 = new byte[myChunkSize]; 
+        
+        int bytesRead1 = 0 , bytesRead2 = 0;
+
+        bytesRead1 = in.read(buffer1);
+        
+        if(bytesRead1 < 0) {
+            sendHeader(os, position, 0, ONLY_CHUNK);
+            os.write(pad, 0, dimePadding(0));
+            return;
+        }
+        byte chunkbyte = CHUNK;
+        do {
+            bytesRead2 = in.read(buffer2);
+            
+            if(bytesRead2 < 0) {
+                //last record...do not set the chunk bit.
+                //buffer1 contains the last chunked record!!
+               
+                //Need to distinguish if this is the first 
+                //chunk to ensure the TYPE and ID are sent
+                if ( chunkbyte == CHUNK ){
+                    chunkbyte = ONLY_CHUNK;
+                } else {
+                    chunkbyte = LAST_CHUNK;
+                }
+                sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
+                break;
+            }
+            
+            sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
+            //set chunk byte to next chunk flag to avoid
+            //sending TYPE and ID on subsequent chunks
+            chunkbyte = CHUNK_NEXT;
+            //now that we have written out buffer1, copy buffer2 into to buffer1
+            System.arraycopy(buffer2,0,buffer1,0,myChunkSize);
+            bytesRead1 = bytesRead2;
+            
+        }while(bytesRead2 > 0);
     }
 
     protected void sendChunk(java.io.OutputStream os,
@@ -415,7 +415,7 @@ protected void sendHeader(java.io.OutputStream os,
         if ( MB || isFirstChunk ){ //If this is a follow on chunk dont send id again.
             fixedHeader[1] = (byte) ((dtnf.toByte() << 4) & 0xf0);
         } else {
-        	fixedHeader[1] = (byte) 0x00;
+            fixedHeader[1] = (byte) 0x00;
         }
         
         //OPT_T
@@ -430,7 +430,7 @@ protected void sendHeader(java.io.OutputStream os,
             fixedHeader[4] = (byte) ((id.length >>> 8) & 0xff);
             fixedHeader[5] = (byte) ((id.length) & 0xff);
         } else {
-        	fixedHeader[4] = (byte) 0;
+            fixedHeader[4] = (byte) 0;
             fixedHeader[5] = (byte) 0;
         }
 
@@ -439,7 +439,7 @@ protected void sendHeader(java.io.OutputStream os,
             fixedHeader[6] = (byte) ((type.length >>> 8) & 0xff);
             fixedHeader[7] = (byte) ((type.length) & 0xff);
         } else {
-        	fixedHeader[6] = (byte) 0;
+            fixedHeader[6] = (byte) 0;
             fixedHeader[7] = (byte) 0;
         }
 

From 82ca60ed4145218548ac743adef19c27fd314838 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 7 Jun 2015 18:02:52 +0000
Subject: [PATCH 059/133] AXIS-2910: Ensure that DimeBodyPart closes all input
 streams it requests from DataSource instances.

---
 axis-rt-core/pom.xml                          |  5 ++
 .../apache/axis/attachments/DimeBodyPart.java | 85 ++++++++++---------
 .../axis/attachments/TestDimeBodyPart.java    | 34 ++++++++
 pom.xml                                       |  4 +-
 samples/mtomstub-sample/pom.xml               |  2 +-
 5 files changed, 89 insertions(+), 41 deletions(-)
 create mode 100644 axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java

diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index 13878340a..4573eaf7f 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -92,6 +92,11 @@
             <version>2.0.6</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>testutils</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <resources>
diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
index b4c4fc020..33020e07b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/DimeBodyPart.java
@@ -322,48 +322,57 @@ void send(java.io.OutputStream os, byte position, DynamicContentDataHandler dh,
     
         BufferedInputStream in = new BufferedInputStream(dh.getInputStream());
         
-        final int myChunkSize = dh.getChunkSize();
-        
-        byte[] buffer1 = new byte[myChunkSize]; 
-        byte[] buffer2 = new byte[myChunkSize]; 
-        
-        int bytesRead1 = 0 , bytesRead2 = 0;
-
-        bytesRead1 = in.read(buffer1);
-        
-        if(bytesRead1 < 0) {
-            sendHeader(os, position, 0, ONLY_CHUNK);
-            os.write(pad, 0, dimePadding(0));
-            return;
-        }
-        byte chunkbyte = CHUNK;
-        do {
-            bytesRead2 = in.read(buffer2);
+        try {
+            final int myChunkSize = dh.getChunkSize();
             
-            if(bytesRead2 < 0) {
-                //last record...do not set the chunk bit.
-                //buffer1 contains the last chunked record!!
-               
-                //Need to distinguish if this is the first 
-                //chunk to ensure the TYPE and ID are sent
-                if ( chunkbyte == CHUNK ){
-                    chunkbyte = ONLY_CHUNK;
-                } else {
-                    chunkbyte = LAST_CHUNK;
+            byte[] buffer1 = new byte[myChunkSize]; 
+            byte[] buffer2 = new byte[myChunkSize]; 
+            
+            int bytesRead1 = 0 , bytesRead2 = 0;
+    
+            bytesRead1 = in.read(buffer1);
+            
+            if(bytesRead1 < 0) {
+                sendHeader(os, position, 0, ONLY_CHUNK);
+                os.write(pad, 0, dimePadding(0));
+                return;
+            }
+            byte chunkbyte = CHUNK;
+            do {
+                bytesRead2 = in.read(buffer2);
+                
+                if(bytesRead2 < 0) {
+                    //last record...do not set the chunk bit.
+                    //buffer1 contains the last chunked record!!
+                   
+                    //Need to distinguish if this is the first 
+                    //chunk to ensure the TYPE and ID are sent
+                    if ( chunkbyte == CHUNK ){
+                        chunkbyte = ONLY_CHUNK;
+                    } else {
+                        chunkbyte = LAST_CHUNK;
+                    }
+                    sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
+                    break;
                 }
+                
                 sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
-                break;
+                //set chunk byte to next chunk flag to avoid
+                //sending TYPE and ID on subsequent chunks
+                chunkbyte = CHUNK_NEXT;
+                //now that we have written out buffer1, copy buffer2 into to buffer1
+                System.arraycopy(buffer2,0,buffer1,0,myChunkSize);
+                bytesRead1 = bytesRead2;
+                
+            }while(bytesRead2 > 0);
+        } finally {
+            try {
+                in.close();
             }
-            
-            sendChunk(os, position, buffer1, 0, bytesRead1, chunkbyte);
-            //set chunk byte to next chunk flag to avoid
-            //sending TYPE and ID on subsequent chunks
-            chunkbyte = CHUNK_NEXT;
-            //now that we have written out buffer1, copy buffer2 into to buffer1
-            System.arraycopy(buffer2,0,buffer1,0,myChunkSize);
-            bytesRead1 = bytesRead2;
-            
-        }while(bytesRead2 > 0);
+            catch (IOException e) {
+                // ignore
+            }
+        }
     }
 
     protected void sendChunk(java.io.OutputStream os,
diff --git a/axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java b/axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java
new file mode 100644
index 000000000..b3b3e4b4d
--- /dev/null
+++ b/axis-rt-core/src/test/java/org/apache/axis/attachments/TestDimeBodyPart.java
@@ -0,0 +1,34 @@
+/*
+ * 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.axis.attachments;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.testutils.activation.InstrumentedDataSource;
+import org.apache.axiom.testutils.activation.RandomDataSource;
+import org.apache.commons.io.output.NullOutputStream;
+
+public class TestDimeBodyPart extends TestCase {
+    public void testWriteToWithDynamicContentDataHandlerClosesInputStreams() throws Exception {
+        InstrumentedDataSource ds = new InstrumentedDataSource(new RandomDataSource(1000));
+        DimeBodyPart bp = new DimeBodyPart(new DynamicContentDataHandler(ds), "1234");
+        bp.write(new NullOutputStream(), (byte)0);
+        assertEquals(0, ds.getOpenStreamCount());
+    }
+}
diff --git a/pom.xml b/pom.xml
index 701531195..8ed01c923 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,8 +126,8 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
-                <artifactId>axiom-testutils</artifactId>
-                <version>1.2.13</version>
+                <artifactId>testutils</artifactId>
+                <version>1.2.15-SNAPSHOT</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>
diff --git a/samples/mtomstub-sample/pom.xml b/samples/mtomstub-sample/pom.xml
index 7a46eae75..030324135 100644
--- a/samples/mtomstub-sample/pom.xml
+++ b/samples/mtomstub-sample/pom.xml
@@ -56,7 +56,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-testutils</artifactId>
+            <artifactId>testutils</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

From 8b0ebef096265620cff50557842331772e4a1d9d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 27 Jun 2015 12:02:57 +0000
Subject: [PATCH 060/133] AXIS-2442: Merge r512459 from the old trunk. Do not
 write constructors for JavaBeans that have more than 254 arguments as Java
 will not compile these classes.

---
 .../java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
index c7c67da71..fd931b4b9 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
@@ -637,9 +637,14 @@ protected void writeDefaultConstructor() {
         pw.println();
     }
 
+    /**
+     * Write a constructor containing the fields in this class.
+     * Will not write a construtor with more than 254 arguments as
+     * the Java compiler will choke.
+     */
     protected void writeMinimalConstructor() {
 
-        if (isUnion() || names.size() == 0) {
+        if (isUnion() || names.size() == 0 || names.size() > 254) {
             return;
         }
 
@@ -770,7 +775,7 @@ protected void writeFullConstructor() {
         int localParams = paramTypes.size() - names.size() / 2;
 
         // Now write the constructor signature
-        if (paramTypes.size() > 0) {
+        if (paramTypes.size() > 0 && paramTypes.size() < 255) {
 
             // Prevent name clash between local parameters and the
             // parameters for the super class

From 2d75b01f4ab0c7ea922b3c623ced0a447cfd39cb Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 27 Jun 2015 12:06:50 +0000
Subject: [PATCH 061/133] Switch to Axiom release version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8ed01c923..a9b5c1543 100644
--- a/pom.xml
+++ b/pom.xml
@@ -127,7 +127,7 @@
             <dependency>
                 <groupId>org.apache.ws.commons.axiom</groupId>
                 <artifactId>testutils</artifactId>
-                <version>1.2.15-SNAPSHOT</version>
+                <version>1.2.15</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>

From d75ee4619c042ded4d3ee1f7b08e379f83572575 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 3 Jul 2015 20:41:45 +0000
Subject: [PATCH 062/133] AXIS-2909: Fix a concurrency issue that can be easily
 reproduced with Java 8.

---
 .../org/apache/axis/description/JavaServiceDesc.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
index b5c0b40fb..efc668ef8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
@@ -36,12 +36,13 @@
 
 import javax.xml.namespace.QName;
 import javax.xml.rpc.holders.Holder;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -520,11 +521,15 @@ public OperationDesc getOperationByElementQName(QName qname)
         getSyncedOperationsForName(implClass,
                                    ((OperationDesc)overloads.get(0)).getName());
 
+        // Convert to array before sorting to avoid concurrency issues
+        OperationDesc[] array = (OperationDesc[])overloads.toArray(
+                new OperationDesc[overloads.size()]);
+
         // Sort the overloads by number of arguments - prevents us calling methods
         // with more parameters than supplied in the request (with missing parameters
         // defaulted to null) when a perfectly good method exists with exactly the
         // supplied parameters.
-        Collections.sort(overloads,
+        Arrays.sort(array,
             new Comparator() {
                 public int compare(Object o1, Object o2)
                 {
@@ -535,8 +540,7 @@ public int compare(Object o1, Object o2)
                 }
             });
 
-        OperationDesc [] array = new OperationDesc [overloads.size()];
-        return (OperationDesc[])overloads.toArray(array);
+        return array;
     }
 
     private synchronized void initQNameMap() {

From 449334626c24c388b315a7f5cd3b32047ff2200f Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 3 Jul 2015 21:00:46 +0000
Subject: [PATCH 063/133] Update some plugin versions so that the site can be
 built with Maven 3.3.x.

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a9b5c1543..798433327 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,7 +221,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.2</version>
+                    <version>3.4</version>
                 </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
@@ -372,7 +372,7 @@
                     <reportPlugins>
                         <plugin>
                             <artifactId>maven-project-info-reports-plugin</artifactId>
-                            <version>2.6</version>
+                            <version>2.8</version>
                             <reports>
                                 <report>index</report>
                                 <report>issue-tracking</report>
@@ -438,7 +438,7 @@
         <plugins>
             <plugin>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <version>2.6</version>
+                <version>2.8</version>
                 <reportSets>
                     <reportSet>
                         <reports>

From e9696748dd4dc9ae10d5d4a577011a8a2e42c5f0 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 3 Jul 2015 21:13:02 +0000
Subject: [PATCH 064/133] Remove unnecessary/misleading plugin execution id
 (copy & paste error).

---
 tests/spring-compat-tests/pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/spring-compat-tests/pom.xml b/tests/spring-compat-tests/pom.xml
index 01c34b292..fc286e38f 100644
--- a/tests/spring-compat-tests/pom.xml
+++ b/tests/spring-compat-tests/pom.xml
@@ -58,7 +58,6 @@
                 <version>${project.version}</version>
                 <executions>
                     <execution>
-                        <id>samples-addr</id>
                         <goals>
                             <goal>generate-sources</goal>
                         </goals>

From ac31dd9bd1d1ab1e55b1faf7cdcfbe665ab55c08 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 3 Jul 2015 21:57:51 +0000
Subject: [PATCH 065/133] Rename the Maven plugins so that they conform to the
 plugin naming conventions
 (https://maven.apache.org/guides/plugin/guide-java-plugin-development.html).

---
 axis-rt-transport-http-javanet/pom.xml                 |  4 ++--
 daemon-launcher/pom.xml                                |  2 +-
 integration/pom.xml                                    |  6 +++---
 jetty-daemon/pom.xml                                   |  2 +-
 .../pom.xml                                            |  4 ++--
 .../tools/maven/server/AbstractDaemonControlMojo.java  |  0
 .../tools/maven/server/AbstractStartDaemonMojo.java    |  0
 .../apache/axis/tools/maven/server/DaemonManager.java  |  0
 .../axis/tools/maven/server/DefaultDaemonManager.java  |  0
 .../org/apache/axis/tools/maven/server/FileSet.java    |  0
 .../apache/axis/tools/maven/server/RemoteDaemon.java   |  0
 .../axis/tools/maven/server/StartDaemonMojo.java       |  0
 .../axis/tools/maven/server/StartServerMojo.java       |  0
 .../axis/tools/maven/server/StartWebAppMojo.java       |  0
 .../apache/axis/tools/maven/server/StopAllMojo.java    |  0
 .../org/apache/axis/tools/maven/server/StreamPump.java |  0
 .../src/main/resources/META-INF/plexus/components.xml  |  0
 .../src/site/apt/index.apt                             |  6 +++---
 .../src/site/apt/usage.apt.vm                          | 10 +++++-----
 .../src/site/site.xml                                  |  0
 .../pom.xml                                            |  4 ++--
 .../maven/java2wsdl/AbstractGenerateWsdlMojo.java      |  0
 .../apache/axis/tools/maven/java2wsdl/DeployMojo.java  |  0
 .../axis/tools/maven/java2wsdl/GenerateWsdlMojo.java   |  0
 .../src/site/site.xml                                  |  0
 maven/nsmap/pom.xml                                    |  2 +-
 maven/pom.xml                                          |  8 ++++----
 maven/src/site/site.xml                                |  8 ++++----
 maven/src/site/xdoc/index.xml                          |  8 ++++----
 maven/{maven-wsdd-plugin => wsdd-maven-plugin}/pom.xml |  4 ++--
 .../apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java |  2 +-
 .../src/site/apt/index.apt                             |  6 +++---
 .../src/site/site.xml                                  |  0
 .../pom.xml                                            |  4 ++--
 .../src/it/settings.xml                                |  0
 .../src/it/writeStubToTestSources/pom.xml              |  2 +-
 .../writeStubToTestSources/src/main/wsdl/AddData.wsdl  |  0
 .../src/it/writeStubToTestSources/verify.bsh           |  0
 .../src/it/wsrf/pom.xml                                |  2 +-
 .../src/it/wsrf/src/main/wsdl/addressing.xsd           |  0
 .../src/it/wsrf/src/main/wsdl/catalog.xml              |  0
 .../src/main/wsdl/wsrf-WS-BaseFaults-1.2-draft-01.xsd  |  0
 .../wsrf-WS-ResourceProperties-1.2-draft-01-impl.wsdl  |  0
 .../wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl  |  0
 .../wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.xsd   |  0
 .../src/it/wsrf/verify.bsh                             |  0
 .../tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java   |  0
 .../maven/wsdl2java/CustomizableBaseTypeMapping.java   |  0
 .../apache/axis/tools/maven/wsdl2java/EmitterEx.java   |  0
 .../tools/maven/wsdl2java/GenerateSourcesMojo.java     |  0
 .../tools/maven/wsdl2java/GenerateTestSourcesMojo.java |  0
 .../tools/maven/wsdl2java/JavaBindingWriterEx.java     |  0
 .../axis/tools/maven/wsdl2java/JavaDeployWriterEx.java |  0
 .../tools/maven/wsdl2java/JavaGeneratorFactoryEx.java  |  0
 .../maven/wsdl2java/JavaServiceIfaceWriterEx.java      |  0
 .../tools/maven/wsdl2java/JavaServiceImplWriterEx.java |  0
 .../tools/maven/wsdl2java/JavaServiceWriterEx.java     |  0
 .../axis/tools/maven/wsdl2java/JavaStubWriterEx.java   |  0
 .../tools/maven/wsdl2java/JavaTestCaseWriterEx.java    |  0
 .../tools/maven/wsdl2java/JavaUndeployWriterEx.java    |  0
 .../axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java |  0
 .../src/site/apt/index.apt                             |  2 +-
 .../src/site/apt/java-xml-type-mappings.apt.vm         |  2 +-
 .../src/site/site.xml                                  |  0
 samples/addr-sample/pom.xml                            |  4 ++--
 samples/attachments-sample/pom.xml                     |  2 +-
 samples/bidbuy-sample/pom.xml                          |  2 +-
 samples/echo-sample/pom.xml                            |  4 ++--
 samples/encoding-sample/pom.xml                        |  2 +-
 samples/faults-sample/pom.xml                          |  2 +-
 samples/handler-sample/pom.xml                         |  2 +-
 samples/jaxrpc-sample/pom.xml                          |  4 ++--
 samples/jms-sample/pom.xml                             |  4 ++--
 samples/message-sample/pom.xml                         |  2 +-
 samples/misc-sample/pom.xml                            |  2 +-
 samples/mtomstub-sample/pom.xml                        |  2 +-
 samples/proxy-sample/pom.xml                           |  2 +-
 samples/stock-sample/pom.xml                           |  2 +-
 samples/transport-sample/pom.xml                       |  4 ++--
 src/site/apt/changelogs/1_4_1.apt                      |  4 ++--
 tests/interop-tests/pom.xml                            |  2 +-
 tests/spring-compat-tests/pom.xml                      |  6 +++---
 82 files changed, 70 insertions(+), 70 deletions(-)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/pom.xml (97%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/FileSet.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/java/org/apache/axis/tools/maven/server/StreamPump.java (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/main/resources/META-INF/plexus/components.xml (100%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/site/apt/index.apt (93%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/site/apt/usage.apt.vm (97%)
 rename maven/{maven-axis-server-plugin => axis-server-maven-plugin}/src/site/site.xml (100%)
 rename maven/{maven-java2wsdl-plugin => java2wsdl-maven-plugin}/pom.xml (97%)
 rename maven/{maven-java2wsdl-plugin => java2wsdl-maven-plugin}/src/main/java/org/apache/axis/tools/maven/java2wsdl/AbstractGenerateWsdlMojo.java (100%)
 rename maven/{maven-java2wsdl-plugin => java2wsdl-maven-plugin}/src/main/java/org/apache/axis/tools/maven/java2wsdl/DeployMojo.java (100%)
 rename maven/{maven-java2wsdl-plugin => java2wsdl-maven-plugin}/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java (100%)
 rename maven/{maven-java2wsdl-plugin => java2wsdl-maven-plugin}/src/site/site.xml (100%)
 rename maven/{maven-wsdd-plugin => wsdd-maven-plugin}/pom.xml (96%)
 rename maven/{maven-wsdd-plugin => wsdd-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java (97%)
 rename maven/{maven-wsdd-plugin => wsdd-maven-plugin}/src/site/apt/index.apt (94%)
 rename maven/{maven-wsdd-plugin => wsdd-maven-plugin}/src/site/site.xml (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/pom.xml (98%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/settings.xml (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/writeStubToTestSources/pom.xml (97%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/writeStubToTestSources/src/main/wsdl/AddData.wsdl (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/writeStubToTestSources/verify.bsh (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/pom.xml (98%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/src/main/wsdl/addressing.xsd (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/src/main/wsdl/catalog.xml (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/src/main/wsdl/wsrf-WS-BaseFaults-1.2-draft-01.xsd (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01-impl.wsdl (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.xsd (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/it/wsrf/verify.bsh (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java (100%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/site/apt/index.apt (98%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/site/apt/java-xml-type-mappings.apt.vm (97%)
 rename maven/{maven-wsdl2java-plugin => wsdl2java-maven-plugin}/src/site/site.xml (100%)

diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
index f31add548..fc784c12c 100644
--- a/axis-rt-transport-http-javanet/pom.xml
+++ b/axis-rt-transport-http-javanet/pom.xml
@@ -69,7 +69,7 @@
     	<plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -123,7 +123,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/daemon-launcher/pom.xml b/daemon-launcher/pom.xml
index 20b600295..ceb7f901f 100644
--- a/daemon-launcher/pom.xml
+++ b/daemon-launcher/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>daemon-launcher</artifactId>
     <name>Daemon Launcher</name>
     <description>
-        Used by maven-axis-server-plugin to launch a Commons Daemon implementation.
+        Used by axis-server-maven-plugin to launch a Commons Daemon implementation.
     </description>
     <dependencies>
         <dependency>
diff --git a/integration/pom.xml b/integration/pom.xml
index 4facb2599..07d55cadb 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -66,7 +66,7 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-java2wsdl-plugin</artifactId>
+                <artifactId>java2wsdl-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -214,7 +214,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <configuration>
                     <testHttpPortSystemProperty>test.functional.ServicePort</testHttpPortSystemProperty>
@@ -1411,7 +1411,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/jetty-daemon/pom.xml b/jetty-daemon/pom.xml
index ccf5e03da..fad038feb 100644
--- a/jetty-daemon/pom.xml
+++ b/jetty-daemon/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>jetty-daemon</artifactId>
     <name>Jetty Daemon</name>
     <description>
-        Daemon implementation used by maven-axis-server-plugin to launch a Jetty server in a separate JVM.
+        Daemon implementation used by axis-server-maven-plugin to launch a Jetty server in a separate JVM.
     </description>
     <dependencies>
         <dependency>
diff --git a/maven/maven-axis-server-plugin/pom.xml b/maven/axis-server-maven-plugin/pom.xml
similarity index 97%
rename from maven/maven-axis-server-plugin/pom.xml
rename to maven/axis-server-maven-plugin/pom.xml
index ea718bbbe..7662edc1a 100644
--- a/maven/maven-axis-server-plugin/pom.xml
+++ b/maven/axis-server-maven-plugin/pom.xml
@@ -25,9 +25,9 @@
         <version>1.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>maven-axis-server-plugin</artifactId>
+    <artifactId>axis-server-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>maven-axis-server-plugin</name>
+    <name>axis-server-maven-plugin</name>
     <description>
         Axis server Maven plugin.
     </description>
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractDaemonControlMojo.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartDaemonMojo.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DaemonManager.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/DefaultDaemonManager.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/FileSet.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/RemoteDaemon.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StopAllMojo.java
diff --git a/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StreamPump.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StreamPump.java
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StreamPump.java
rename to maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StreamPump.java
diff --git a/maven/maven-axis-server-plugin/src/main/resources/META-INF/plexus/components.xml b/maven/axis-server-maven-plugin/src/main/resources/META-INF/plexus/components.xml
similarity index 100%
rename from maven/maven-axis-server-plugin/src/main/resources/META-INF/plexus/components.xml
rename to maven/axis-server-maven-plugin/src/main/resources/META-INF/plexus/components.xml
diff --git a/maven/maven-axis-server-plugin/src/site/apt/index.apt b/maven/axis-server-maven-plugin/src/site/apt/index.apt
similarity index 93%
rename from maven/maven-axis-server-plugin/src/site/apt/index.apt
rename to maven/axis-server-maven-plugin/src/site/apt/index.apt
index 6581c4588..f6da54b44 100644
--- a/maven/maven-axis-server-plugin/src/site/apt/index.apt
+++ b/maven/axis-server-maven-plugin/src/site/apt/index.apt
@@ -19,9 +19,9 @@
            Introduction
            ------------
 
-maven-axis-server-plugin
+axis-server-maven-plugin
 
-  The purpose of the maven-axis-server-plugin is to automatically start and stop a stand-alone Axis server (and other processes)
+  The purpose of the axis-server-maven-plugin is to automatically start and stop a stand-alone Axis server (and other processes)
   during integration test phases of a Maven project. This enables end-to-end automation of integration tests.
 
 * Goals Overview
@@ -35,4 +35,4 @@ maven-axis-server-plugin
     phase. This can e.g. be used to start a mock Web service.
   
   * {{{./stop-all-mojo.html}axis-server:stop-all}} stops all processes started by <<<axis-server:start-server>>> and
-    <<<axis-server:start-process>>>. It is executed during the <<<post-integration-test>>> phase.
\ No newline at end of file
+    <<<axis-server:start-process>>>. It is executed during the <<<post-integration-test>>> phase.
diff --git a/maven/maven-axis-server-plugin/src/site/apt/usage.apt.vm b/maven/axis-server-maven-plugin/src/site/apt/usage.apt.vm
similarity index 97%
rename from maven/maven-axis-server-plugin/src/site/apt/usage.apt.vm
rename to maven/axis-server-maven-plugin/src/site/apt/usage.apt.vm
index ebbc0fac1..0059dad46 100644
--- a/maven/maven-axis-server-plugin/src/site/apt/usage.apt.vm
+++ b/maven/axis-server-maven-plugin/src/site/apt/usage.apt.vm
@@ -87,7 +87,7 @@ Usage
 --------------------------------------------------------------------------------
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -117,9 +117,9 @@ Usage
   Note the reference to the <<<axisServerPort>>> property set by the build-helper-maven-plugin.
   Also note the <<<wsdds>>> option that specifies the location of the WSDD files for the
   Web services to deploy. These files are typically generated using the
-  {{{../wsdl2java/index.html}maven-wsdl2java-plugin}}.
+  {{{../wsdl2java/index.html}wsdl2java-maven-plugin}}.
   
-  The maven-axis-server-plugin assumes that <<<org.apache.axis.server.standalone.StandaloneAxisServer>>> class
+  The axis-server-maven-plugin assumes that <<<org.apache.axis.server.standalone.StandaloneAxisServer>>> class
   (not to be confused with the old <<<org.apache.axis.transport.http.SimpleAxisServer>>> class)
   is in the class path. Therefore, you need to add the relevant dependency to your project:
   
@@ -197,7 +197,7 @@ mvn clean integration-test -Daxis.server.foreground=true -DaxisServerPort=8080
 --------------------------------------------------------------------------------
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -235,4 +235,4 @@ System.getProperty("axisServerPort", "8080")
 
   If you set up your project like that, then no additional configuration is required
   in your IDE and you only need to pass the <<<axis.server.foreground>>> property
-  to Maven.
\ No newline at end of file
+  to Maven.
diff --git a/maven/maven-axis-server-plugin/src/site/site.xml b/maven/axis-server-maven-plugin/src/site/site.xml
similarity index 100%
rename from maven/maven-axis-server-plugin/src/site/site.xml
rename to maven/axis-server-maven-plugin/src/site/site.xml
diff --git a/maven/maven-java2wsdl-plugin/pom.xml b/maven/java2wsdl-maven-plugin/pom.xml
similarity index 97%
rename from maven/maven-java2wsdl-plugin/pom.xml
rename to maven/java2wsdl-maven-plugin/pom.xml
index bad8ec5a5..cf5859dd2 100644
--- a/maven/maven-java2wsdl-plugin/pom.xml
+++ b/maven/java2wsdl-maven-plugin/pom.xml
@@ -25,9 +25,9 @@
         <version>1.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>maven-java2wsdl-plugin</artifactId>
+    <artifactId>java2wsdl-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>maven-java2wsdl-plugin</name>
+    <name>java2wsdl-maven-plugin</name>
     <description>
         Axis java2wsdl Maven plugin.
     </description>
diff --git a/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/AbstractGenerateWsdlMojo.java b/maven/java2wsdl-maven-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/AbstractGenerateWsdlMojo.java
similarity index 100%
rename from maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/AbstractGenerateWsdlMojo.java
rename to maven/java2wsdl-maven-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/AbstractGenerateWsdlMojo.java
diff --git a/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/DeployMojo.java b/maven/java2wsdl-maven-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/DeployMojo.java
similarity index 100%
rename from maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/DeployMojo.java
rename to maven/java2wsdl-maven-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/DeployMojo.java
diff --git a/maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java b/maven/java2wsdl-maven-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java
similarity index 100%
rename from maven/maven-java2wsdl-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java
rename to maven/java2wsdl-maven-plugin/src/main/java/org/apache/axis/tools/maven/java2wsdl/GenerateWsdlMojo.java
diff --git a/maven/maven-java2wsdl-plugin/src/site/site.xml b/maven/java2wsdl-maven-plugin/src/site/site.xml
similarity index 100%
rename from maven/maven-java2wsdl-plugin/src/site/site.xml
rename to maven/java2wsdl-maven-plugin/src/site/site.xml
diff --git a/maven/nsmap/pom.xml b/maven/nsmap/pom.xml
index e3696be48..e1376f6e7 100644
--- a/maven/nsmap/pom.xml
+++ b/maven/nsmap/pom.xml
@@ -28,7 +28,7 @@
     <artifactId>nsmap</artifactId>
     <name>Maven plugin common classes</name>
     <description>
-    	Contains classes shared by maven-wsdl2java-plugin and maven-java2wsdl-plugin.
+    	Contains classes shared by wsdl2java-maven-plugin and java2wsdl-maven-plugin.
     </description>
     <build>
         <plugins>
diff --git a/maven/pom.xml b/maven/pom.xml
index ae732cee9..578a812c4 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -68,10 +68,10 @@
     </dependencyManagement>
     <modules>
     	<module>nsmap</module>
-        <module>maven-wsdd-plugin</module>
-        <module>maven-wsdl2java-plugin</module>
-        <module>maven-java2wsdl-plugin</module>
-        <module>maven-axis-server-plugin</module>
+        <module>wsdd-maven-plugin</module>
+        <module>wsdl2java-maven-plugin</module>
+        <module>java2wsdl-maven-plugin</module>
+        <module>axis-server-maven-plugin</module>
     </modules>
     <build>
         <plugins>
diff --git a/maven/src/site/site.xml b/maven/src/site/site.xml
index 005634d1f..5f46c9078 100644
--- a/maven/src/site/site.xml
+++ b/maven/src/site/site.xml
@@ -23,10 +23,10 @@
             <item name="Introduction" href="index.html"/>
         </menu>
         <menu name="Plugins">
-            <item name="maven-wsdl2java-plugin" href="wsdl2java/index.html"/>
-            <item name="maven-java2wsdl-plugin" href="java2wsdl/index.html"/>
-            <item name="maven-wsdd-plugin" href="wsdd/index.html"/>
-            <item name="maven-axis-server-plugin" href="axis-server/index.html"/>
+            <item name="wsdl2java-maven-plugin" href="wsdl2java/index.html"/>
+            <item name="java2wsdl-maven-plugin" href="java2wsdl/index.html"/>
+            <item name="wsdd-maven-plugin" href="wsdd/index.html"/>
+            <item name="axis-server-maven-plugin" href="axis-server/index.html"/>
         </menu>
     </body>
 </project>
diff --git a/maven/src/site/xdoc/index.xml b/maven/src/site/xdoc/index.xml
index 4f5d6681d..45cb23284 100644
--- a/maven/src/site/xdoc/index.xml
+++ b/maven/src/site/xdoc/index.xml
@@ -45,22 +45,22 @@
                 </thead>
                 <tbody>
                     <tr>
-                        <td><a href="wsdl2java/index.html">maven-wsdl2java-plugin</a></td>
+                        <td><a href="wsdl2java/index.html">wsdl2java-maven-plugin</a></td>
                         <td>Generates Java artifacts from a WSDL file</td>
                         <td><a href="../ant/axis-wsdl2java.html">axis-wsdl2java</a></td>
                     </tr>
                     <tr>
-                        <td><a href="java2wsdl/index.html">maven-java2wsdl-plugin</a></td>
+                        <td><a href="java2wsdl/index.html">java2wsdl-maven-plugin</a></td>
                         <td>Generates a WSDL description from a Java class</td>
                         <td><a href="../ant/axis-java2wsdl.html">axis-java2wsdl</a></td>
                     </tr>
                     <tr>
-                        <td><a href="wsdd/index.html">maven-wsdd-plugin</a></td>
+                        <td><a href="wsdd/index.html">wsdd-maven-plugin</a></td>
                         <td></td>
                         <td rowspan="2" style="vertical-align: middle">N/A</td>
                     </tr>
                     <tr>
-                        <td><a href="axis-server/index.html">maven-axis-server-plugin</a></td>
+                        <td><a href="axis-server/index.html">axis-server-maven-plugin</a></td>
                         <td>Starts/stops a stand-alone Axis server</td>
                     </tr>
                 </tbody>
diff --git a/maven/maven-wsdd-plugin/pom.xml b/maven/wsdd-maven-plugin/pom.xml
similarity index 96%
rename from maven/maven-wsdd-plugin/pom.xml
rename to maven/wsdd-maven-plugin/pom.xml
index a9b14c6ff..b43ee0af3 100644
--- a/maven/maven-wsdd-plugin/pom.xml
+++ b/maven/wsdd-maven-plugin/pom.xml
@@ -25,9 +25,9 @@
         <version>1.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>maven-wsdd-plugin</artifactId>
+    <artifactId>wsdd-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>maven-wsdd-plugin</name>
+    <name>wsdd-maven-plugin</name>
     <description>
         Maven plugin to process WSDD files.
     </description>
diff --git a/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java b/maven/wsdd-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
similarity index 97%
rename from maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
rename to maven/wsdd-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
index 7f7e47e27..6bdd9ee48 100644
--- a/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
+++ b/maven/wsdd-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
@@ -71,7 +71,7 @@ public class GenerateWSDDMojo extends AbstractMojo {
     private String type;
     
     /**
-     * A set of WSDD files (typically generated by maven-wsdl2java-plugin) to be merged into the
+     * A set of WSDD files (typically generated by wsdl2java-maven-plugin) to be merged into the
      * output WSDD. If this parameter is not set, then the plug-in will just generate a default
      * configuration file.
      * 
diff --git a/maven/maven-wsdd-plugin/src/site/apt/index.apt b/maven/wsdd-maven-plugin/src/site/apt/index.apt
similarity index 94%
rename from maven/maven-wsdd-plugin/src/site/apt/index.apt
rename to maven/wsdd-maven-plugin/src/site/apt/index.apt
index f28b35724..90c252ab1 100644
--- a/maven/maven-wsdd-plugin/src/site/apt/index.apt
+++ b/maven/wsdd-maven-plugin/src/site/apt/index.apt
@@ -19,7 +19,7 @@
            Introduction
            ------------
 
-maven-wsdd-plugin
+wsdd-maven-plugin
 
   Historically, the recommended way to deploy Axis services was based on the following procedure:
   
@@ -47,7 +47,7 @@ maven-wsdd-plugin
   the <<<server-config.wsdd>>> file should be assembled automatically during the build process,
   based on the output of wsdl2java.
   
-  This is exactly what the maven-wsdd-plugin does: it takes a set of WSDD files and merges them
+  This is exactly what the wsdd-maven-plugin does: it takes a set of WSDD files and merges them
   into a single output WSDD. The input WSDD files are typically generated by
-  {{{../wsdl2java/index.html}maven-wsdl2java-plugin}}, but the set may also contain
+  {{{../wsdl2java/index.html}wsdl2java-maven-plugin}}, but the set may also contain
   manually created WSDD files, e.g. to configure custom handlers or to override configuration properties.
diff --git a/maven/maven-wsdd-plugin/src/site/site.xml b/maven/wsdd-maven-plugin/src/site/site.xml
similarity index 100%
rename from maven/maven-wsdd-plugin/src/site/site.xml
rename to maven/wsdd-maven-plugin/src/site/site.xml
diff --git a/maven/maven-wsdl2java-plugin/pom.xml b/maven/wsdl2java-maven-plugin/pom.xml
similarity index 98%
rename from maven/maven-wsdl2java-plugin/pom.xml
rename to maven/wsdl2java-maven-plugin/pom.xml
index 95e900e86..b5acf2495 100644
--- a/maven/maven-wsdl2java-plugin/pom.xml
+++ b/maven/wsdl2java-maven-plugin/pom.xml
@@ -25,9 +25,9 @@
         <version>1.4.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
-    <artifactId>maven-wsdl2java-plugin</artifactId>
+    <artifactId>wsdl2java-maven-plugin</artifactId>
     <packaging>maven-plugin</packaging>
-    <name>maven-wsdl2java-plugin</name>
+    <name>wsdl2java-maven-plugin</name>
     <description>
         Axis wsdl2java Maven plugin.
     </description>
diff --git a/maven/maven-wsdl2java-plugin/src/it/settings.xml b/maven/wsdl2java-maven-plugin/src/it/settings.xml
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/settings.xml
rename to maven/wsdl2java-maven-plugin/src/it/settings.xml
diff --git a/maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/pom.xml b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
similarity index 97%
rename from maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/pom.xml
rename to maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
index 5e64cbbb1..eee18bb6c 100644
--- a/maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/pom.xml
+++ b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
@@ -38,7 +38,7 @@
         <plugins>
             <plugin>
                 <groupId>@project.groupId@</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>@project.version@</version>
                 <executions>
                     <execution>
diff --git a/maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/src/main/wsdl/AddData.wsdl b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/src/main/wsdl/AddData.wsdl
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/src/main/wsdl/AddData.wsdl
rename to maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/src/main/wsdl/AddData.wsdl
diff --git a/maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/verify.bsh b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/verify.bsh
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/writeStubToTestSources/verify.bsh
rename to maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/verify.bsh
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/pom.xml b/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
similarity index 98%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/pom.xml
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
index 5a5e261b1..6630ce5c0 100644
--- a/maven/maven-wsdl2java-plugin/src/it/wsrf/pom.xml
+++ b/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
@@ -38,7 +38,7 @@
         <plugins>
             <plugin>
                 <groupId>@project.groupId@</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>@project.version@</version>
                 <executions>
                     <execution>
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/addressing.xsd b/maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/addressing.xsd
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/addressing.xsd
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/addressing.xsd
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml b/maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/catalog.xml
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-BaseFaults-1.2-draft-01.xsd b/maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-BaseFaults-1.2-draft-01.xsd
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-BaseFaults-1.2-draft-01.xsd
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-BaseFaults-1.2-draft-01.xsd
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01-impl.wsdl b/maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01-impl.wsdl
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01-impl.wsdl
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01-impl.wsdl
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl b/maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.wsdl
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.xsd b/maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.xsd
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.xsd
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/src/main/wsdl/wsrf-WS-ResourceProperties-1.2-draft-01.xsd
diff --git a/maven/maven-wsdl2java-plugin/src/it/wsrf/verify.bsh b/maven/wsdl2java-maven-plugin/src/it/wsrf/verify.bsh
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/it/wsrf/verify.bsh
rename to maven/wsdl2java-maven-plugin/src/it/wsrf/verify.bsh
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/AbstractWsdl2JavaMojo.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/CustomizableBaseTypeMapping.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/EmitterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateSourcesMojo.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/GenerateTestSourcesMojo.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaBindingWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaDeployWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaGeneratorFactoryEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceIfaceWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceImplWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaServiceWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaStubWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaTestCaseWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaUndeployWriterEx.java
diff --git a/maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java b/maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java
rename to maven/wsdl2java-maven-plugin/src/main/java/org/apache/axis/tools/maven/wsdl2java/JavaXmlTypeMapping.java
diff --git a/maven/maven-wsdl2java-plugin/src/site/apt/index.apt b/maven/wsdl2java-maven-plugin/src/site/apt/index.apt
similarity index 98%
rename from maven/maven-wsdl2java-plugin/src/site/apt/index.apt
rename to maven/wsdl2java-maven-plugin/src/site/apt/index.apt
index 40ebe1e28..fe0e81fe0 100644
--- a/maven/maven-wsdl2java-plugin/src/site/apt/index.apt
+++ b/maven/wsdl2java-maven-plugin/src/site/apt/index.apt
@@ -19,7 +19,7 @@
            Introduction
            ------------
 
-maven-wsdl2java-plugin
+wsdl2java-maven-plugin
 
   The wsdl2java plugin is used to generate client and/or server side Java artifacts from a WSDL file.
 
diff --git a/maven/maven-wsdl2java-plugin/src/site/apt/java-xml-type-mappings.apt.vm b/maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
similarity index 97%
rename from maven/maven-wsdl2java-plugin/src/site/apt/java-xml-type-mappings.apt.vm
rename to maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
index 7e9c7f2af..33db2ddea 100644
--- a/maven/maven-wsdl2java-plugin/src/site/apt/java-xml-type-mappings.apt.vm
+++ b/maven/wsdl2java-maven-plugin/src/site/apt/java-xml-type-mappings.apt.vm
@@ -22,7 +22,7 @@
 
 Changing the Java class associated with an XML type
 
-  maven-wsdl2java-plugin uses the default mappings between XML types and Java classes determined by the
+  wsdl2java-maven-plugin uses the default mappings between XML types and Java classes determined by the
   configured <<<typeMappingVersion>>>. However, there may be situations where you might want
   to represent a given XML type using a Java type other than the one determined by the default mapping.
   E.g. you might want <<<xs:base64Binary>>> to be represented by <<<java.activation.DataHandler>>>
diff --git a/maven/maven-wsdl2java-plugin/src/site/site.xml b/maven/wsdl2java-maven-plugin/src/site/site.xml
similarity index 100%
rename from maven/maven-wsdl2java-plugin/src/site/site.xml
rename to maven/wsdl2java-maven-plugin/src/site/site.xml
diff --git a/samples/addr-sample/pom.xml b/samples/addr-sample/pom.xml
index 6194ef949..7e4792866 100644
--- a/samples/addr-sample/pom.xml
+++ b/samples/addr-sample/pom.xml
@@ -43,7 +43,7 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -115,7 +115,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/attachments-sample/pom.xml b/samples/attachments-sample/pom.xml
index 6d6049441..64699e59e 100644
--- a/samples/attachments-sample/pom.xml
+++ b/samples/attachments-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/bidbuy-sample/pom.xml b/samples/bidbuy-sample/pom.xml
index 835d27fd4..5b050ed36 100644
--- a/samples/bidbuy-sample/pom.xml
+++ b/samples/bidbuy-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/echo-sample/pom.xml b/samples/echo-sample/pom.xml
index a59dd24bf..4eba15d5c 100644
--- a/samples/echo-sample/pom.xml
+++ b/samples/echo-sample/pom.xml
@@ -43,7 +43,7 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -71,7 +71,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdd-plugin</artifactId>
+                <artifactId>wsdd-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/encoding-sample/pom.xml b/samples/encoding-sample/pom.xml
index 261fe4a6f..bac3a4582 100644
--- a/samples/encoding-sample/pom.xml
+++ b/samples/encoding-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/faults-sample/pom.xml b/samples/faults-sample/pom.xml
index e11affc59..6a00eb483 100644
--- a/samples/faults-sample/pom.xml
+++ b/samples/faults-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/handler-sample/pom.xml b/samples/handler-sample/pom.xml
index ab4e7e5f7..9f5a5534e 100644
--- a/samples/handler-sample/pom.xml
+++ b/samples/handler-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/jaxrpc-sample/pom.xml b/samples/jaxrpc-sample/pom.xml
index cfe872729..754aa53c6 100644
--- a/samples/jaxrpc-sample/pom.xml
+++ b/samples/jaxrpc-sample/pom.xml
@@ -60,7 +60,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -106,7 +106,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/jms-sample/pom.xml b/samples/jms-sample/pom.xml
index 485a45caa..976ca6e1c 100644
--- a/samples/jms-sample/pom.xml
+++ b/samples/jms-sample/pom.xml
@@ -63,7 +63,7 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -129,7 +129,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/message-sample/pom.xml b/samples/message-sample/pom.xml
index 5f9c9062f..d86601e39 100644
--- a/samples/message-sample/pom.xml
+++ b/samples/message-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/misc-sample/pom.xml b/samples/misc-sample/pom.xml
index 4261f04d2..b7fb0b4b0 100644
--- a/samples/misc-sample/pom.xml
+++ b/samples/misc-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/mtomstub-sample/pom.xml b/samples/mtomstub-sample/pom.xml
index 030324135..b50d225b9 100644
--- a/samples/mtomstub-sample/pom.xml
+++ b/samples/mtomstub-sample/pom.xml
@@ -99,7 +99,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/proxy-sample/pom.xml b/samples/proxy-sample/pom.xml
index 964fd727f..ca3e39c76 100644
--- a/samples/proxy-sample/pom.xml
+++ b/samples/proxy-sample/pom.xml
@@ -83,7 +83,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/stock-sample/pom.xml b/samples/stock-sample/pom.xml
index af0238703..bbad7e215 100644
--- a/samples/stock-sample/pom.xml
+++ b/samples/stock-sample/pom.xml
@@ -72,7 +72,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/samples/transport-sample/pom.xml b/samples/transport-sample/pom.xml
index 591c975ad..2f9160719 100644
--- a/samples/transport-sample/pom.xml
+++ b/samples/transport-sample/pom.xml
@@ -83,7 +83,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -110,7 +110,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdd-plugin</artifactId>
+                <artifactId>wsdd-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/src/site/apt/changelogs/1_4_1.apt b/src/site/apt/changelogs/1_4_1.apt
index 55cbfc063..d9184ad21 100644
--- a/src/site/apt/changelogs/1_4_1.apt
+++ b/src/site/apt/changelogs/1_4_1.apt
@@ -40,9 +40,9 @@ Changes from 1.4 final
       earlier Java versions.
     
     * It is now possible to change the Java class associated with an XML type when generating a client stub.
-      Note that this is only supported by the maven-wsdl2java-plugin, but not by the corresponding Ant task
+      Note that this is only supported by the wsdl2java-maven-plugin, but not by the corresponding Ant task
       or command line tool. The feature can be used to consume MTOM enabled services. Check the
-      {{{../maven/maven-wsdl2java-plugin/java-xml-type-mappings.html}plugin documentation}} for more information.
+      {{{../maven/wsdl2java-maven-plugin/java-xml-type-mappings.html}plugin documentation}} for more information.
     
     * WSDL4J has been upgraded from 1.5.1 to 1.6.2.
     
diff --git a/tests/interop-tests/pom.xml b/tests/interop-tests/pom.xml
index 6fabd394c..27b870599 100644
--- a/tests/interop-tests/pom.xml
+++ b/tests/interop-tests/pom.xml
@@ -58,7 +58,7 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
diff --git a/tests/spring-compat-tests/pom.xml b/tests/spring-compat-tests/pom.xml
index fc286e38f..84866f5b5 100644
--- a/tests/spring-compat-tests/pom.xml
+++ b/tests/spring-compat-tests/pom.xml
@@ -54,7 +54,7 @@
         <plugins>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdl2java-plugin</artifactId>
+                <artifactId>wsdl2java-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -74,7 +74,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-wsdd-plugin</artifactId>
+                <artifactId>wsdd-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>
@@ -112,7 +112,7 @@
             </plugin>
             <plugin>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>maven-axis-server-plugin</artifactId>
+                <artifactId>axis-server-maven-plugin</artifactId>
                 <version>${project.version}</version>
                 <executions>
                     <execution>

From ea5ca7430e656fb2b188a9bdd923a42c3b8fa2ac Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Fri, 3 Jul 2015 22:53:59 +0000
Subject: [PATCH 066/133] Support the -Daxis.server.foreground=true flag also
 for Jetty instances started by the axis-server:start-webapp goal.

---
 .../server/AbstractStartWebServerMojo.java    | 77 +++++++++++++++++++
 .../tools/maven/server/StartServerMojo.java   | 60 ++-------------
 .../tools/maven/server/StartWebAppMojo.java   | 12 +--
 tests/spring-compat-tests/pom.xml             |  1 +
 4 files changed, 85 insertions(+), 65 deletions(-)
 create mode 100644 maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java

diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
new file mode 100644
index 000000000..8fa91528d
--- /dev/null
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartWebServerMojo.java
@@ -0,0 +1,77 @@
+/*
+ * 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.axis.tools.maven.server;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.logging.Log;
+
+public abstract class AbstractStartWebServerMojo extends AbstractStartDaemonMojo {
+    /**
+     * The HTTP port.
+     * 
+     * @parameter default-value="8080"
+     * @required
+     */
+    private int port;
+
+    /**
+     * If this flag is set to <code>true</code>, then the execution of the goal will block after the
+     * server has been started. This is useful if one wants to manually test some services deployed
+     * on the server or if one wants to run the integration tests from an IDE. The flag should only
+     * be set using the command line, but not in the POM.
+     * 
+     * @parameter expression="${axis.server.foreground}" default-value="false"
+     */
+    // Note: this feature is implemented using a flag (instead of a distinct goal) to make sure that
+    // the server is configured in exactly the same way as in a normal integration test execution.
+    private boolean foreground;
+    
+    /**
+     * Specifies an alternate port number that will override {@link #port} if {@link #foreground} is
+     * set to <code>true</code>. This parameter should be used if the port number configured with
+     * the {@link #port} parameter is allocated dynamically. This makes it easier to run integration
+     * tests from an IDE. For more information, see the <a href="usage.html">usage
+     * documentation</a>.
+     * 
+     * @parameter
+     */
+    private int foregroundPort = -1;
+    
+    protected final void doStartDaemon() throws MojoExecutionException, MojoFailureException {
+        Log log = getLog();
+        
+        doStartDaemon(foreground && foregroundPort != -1 ? foregroundPort : port);
+        
+        if (foreground) {
+            log.info("Server started in foreground mode. Press CRTL-C to stop.");
+            Object lock = new Object();
+            synchronized (lock) {
+                try {
+                    lock.wait();
+                } catch (InterruptedException ex) {
+                    // Set interrupt flag and continue
+                    Thread.currentThread().interrupt();
+                }
+            }
+        }
+    }
+
+    protected abstract void doStartDaemon(int port) throws MojoExecutionException, MojoFailureException;
+}
diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index cd5cbe587..9f7fdf59a 100644
--- a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -31,7 +31,6 @@
 import org.apache.axis.model.wsdd.WSDDUtil;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.logging.Log;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.StringUtils;
@@ -45,7 +44,7 @@
  * @phase pre-integration-test
  * @requiresDependencyResolution test
  */
-public class StartServerMojo extends AbstractStartDaemonMojo {
+public class StartServerMojo extends AbstractStartWebServerMojo {
     /**
      * @parameter default-value="${project.build.directory}/axis-server"
      * @required
@@ -53,14 +52,6 @@ public class StartServerMojo extends AbstractStartDaemonMojo {
      */
     private File workDirBase;
     
-    /**
-     * The port of the Axis server.
-     * 
-     * @parameter default-value="8080"
-     * @required
-     */
-    private int port;
-    
     /**
      * The maximum number of concurrently active sessions.
      * 
@@ -90,43 +81,15 @@ public class StartServerMojo extends AbstractStartDaemonMojo {
      */
     private FileSet[] configs;
     
-    /**
-     * If this flag is set to <code>true</code>, then the execution of the goal will block after the
-     * server has been started and the services are deployed. This is useful if one wants to
-     * manually test some services deployed on the server or if one wants to run the integration
-     * tests from an IDE. The flag should only be set using the command line, but not in the POM.
-     * 
-     * @parameter expression="${axis.server.foreground}" default-value="false"
-     */
-    // Note: this feature is implemented using a flag (instead of a distinct goal) to make sure that
-    // the server is configured in exactly the same way as in a normal integration test execution.
-    private boolean foreground;
-    
-    /**
-     * Specifies an alternate port number that will override {@link #port} if {@link #foreground} is
-     * set to <code>true</code>. This parameter should be used if the port number configured with
-     * the {@link #port} parameter is allocated dynamically. This makes it easier to run integration
-     * tests from an IDE. For more information, see the <a href="usage.html">usage
-     * documentation</a>.
-     * 
-     * @parameter
-     */
-    private int foregroundPort = -1;
-    
-    protected void doStartDaemon() throws MojoExecutionException, MojoFailureException {
-        Log log = getLog();
-        
+    protected void doStartDaemon(int port) throws MojoExecutionException, MojoFailureException {
         // Need to setup additional dependencies before building the default configuration!
         addAxisDependency("axis-standalone-server");
         if (jwsDirs != null && jwsDirs.length > 0) {
             addAxisDependency("axis-rt-jws");
         }
         
-        // Determine the port to be used
-        int actualPort = foreground && foregroundPort != -1 ? foregroundPort : port;
-        
         // Prepare a work directory where we can place the server-config.wsdd file
-        File workDir = new File(workDirBase, String.valueOf(actualPort));
+        File workDir = new File(workDirBase, String.valueOf(port));
         if (workDir.exists()) {
             try {
                 FileUtils.deleteDirectory(workDir);
@@ -198,7 +161,7 @@ protected void doStartDaemon() throws MojoExecutionException, MojoFailureExcepti
         // Start the server
         List args = new ArrayList();
         args.add("-p");
-        args.add(String.valueOf(actualPort));
+        args.add(String.valueOf(port));
         args.add("-w");
         args.add(workDir.getAbsolutePath());
         if (jwsDirs != null && jwsDirs.length > 0) {
@@ -209,26 +172,13 @@ protected void doStartDaemon() throws MojoExecutionException, MojoFailureExcepti
         args.add(String.valueOf(maxSessions));
         try {
             startDaemon(
-                    "Server on port " + actualPort,
+                    "Server on port " + port,
                     "org.apache.axis.server.standalone.daemon.AxisServerDaemon",
                     (String[])args.toArray(new String[args.size()]),
                     workDir);
         } catch (Exception ex) {
             throw new MojoFailureException("Failed to start server", ex);
         }
-        
-        if (foreground) {
-            log.info("Server started in foreground mode. Press CRTL-C to stop.");
-            Object lock = new Object();
-            synchronized (lock) {
-                try {
-                    lock.wait();
-                } catch (InterruptedException ex) {
-                    // Set interrupt flag and continue
-                    Thread.currentThread().interrupt();
-                }
-            }
-        }
     }
     
     private ClassLoader buildClassLoader() throws MojoExecutionException {
diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
index 62e3ded3f..573d0a85b 100644
--- a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartWebAppMojo.java
@@ -31,15 +31,7 @@
  * @phase pre-integration-test
  * @requiresDependencyResolution test
  */
-public class StartWebAppMojo extends AbstractStartDaemonMojo {
-    /**
-     * The HTTP port.
-     * 
-     * @parameter default-value="8080"
-     * @required
-     */
-    private int port;
-
+public class StartWebAppMojo extends AbstractStartWebServerMojo {
     /**
      * 
      * 
@@ -48,7 +40,7 @@ public class StartWebAppMojo extends AbstractStartDaemonMojo {
      */
     private File[] resourceBases;
     
-    protected void doStartDaemon() throws MojoExecutionException, MojoFailureException {
+    protected void doStartDaemon(int port) throws MojoExecutionException, MojoFailureException {
         addAxisDependency("jetty-daemon");
         startDaemon("HTTP server on port " + port, "org.apache.axis.tools.daemon.jetty.WebAppDaemon",
                 new String[] { "-p", String.valueOf(port), "-r", StringUtils.join(resourceBases, File.pathSeparator) }, new File("."));
diff --git a/tests/spring-compat-tests/pom.xml b/tests/spring-compat-tests/pom.xml
index 84866f5b5..67906b81b 100644
--- a/tests/spring-compat-tests/pom.xml
+++ b/tests/spring-compat-tests/pom.xml
@@ -122,6 +122,7 @@
                         </goals>
                         <configuration>
                             <port>${test.httpPort}</port>
+                            <foregroundPort>8080</foregroundPort>
                             <resourceBases>
                                 <resourceBase>src/main/webapp</resourceBase>
                                 <resourceBase>${project.build.directory}/webapp</resourceBase>

From ef1938bedb0e01928f939982e214d4ae2a32fc37 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 6 Jul 2015 18:44:45 +0000
Subject: [PATCH 067/133] Make the number of invocations per thread
 configurable.

---
 .../test/java/test/wsdl/multithread/Invoker.java  |  7 +++++--
 .../wsdl/multithread/MultithreadTestCase.java     | 15 ++++++++-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/integration/src/test/java/test/wsdl/multithread/Invoker.java b/integration/src/test/java/test/wsdl/multithread/Invoker.java
index 78467e98d..e23aba0cc 100644
--- a/integration/src/test/java/test/wsdl/multithread/Invoker.java
+++ b/integration/src/test/java/test/wsdl/multithread/Invoker.java
@@ -35,12 +35,15 @@ class Invoker implements Runnable {
     private final CountDownLatch readyLatch;
     private final CountDownLatch startLatch;
     private final Report report;
+    private final int numInvocations;
     
-    Invoker(AddressBook binding, CountDownLatch readyLatch, CountDownLatch startLatch, Report report) {
+    Invoker(AddressBook binding, CountDownLatch readyLatch, CountDownLatch startLatch, Report report,
+            int numInvocations) {
         this.binding = binding;
         this.readyLatch = readyLatch;
         this.startLatch = startLatch;
         this.report = report;
+        this.numInvocations = numInvocations;
     }
 
     public void run() {
@@ -50,7 +53,7 @@ public void run() {
             readyLatch.countDown();
             startLatch.await();
             
-            for (int i = 0; i < 4; ++i) {
+            for (int i = 0; i < numInvocations; ++i) {
                 Address address = new Address();
                 Phone phone = new Phone();
                 address.setStreetNum(i);
diff --git a/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java b/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
index 15f7769b3..6f05cc0c3 100644
--- a/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
+++ b/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
@@ -45,17 +45,18 @@ public AddressBook getStub() throws Exception {
     
     private void testMultithreading(StubSupplier stubSupplier) throws Throwable {
         Report report = new Report();
-        int NUM_THREADS = 50;
-        CountDownLatch readyLatch = new CountDownLatch(NUM_THREADS);
+        final int numThreads = 50;
+        final int numInvocations = 4;
+        CountDownLatch readyLatch = new CountDownLatch(numThreads);
         CountDownLatch startLatch = new CountDownLatch(1);
-        Thread[] threads = new Thread[NUM_THREADS];
-        for (int i = 0; i < NUM_THREADS; ++i) {
-            threads[i] = new Thread(new Invoker(stubSupplier.getStub(), readyLatch, startLatch, report));
+        Thread[] threads = new Thread[numThreads];
+        for (int i = 0; i < numThreads; ++i) {
+            threads[i] = new Thread(new Invoker(stubSupplier.getStub(), readyLatch, startLatch, report, numInvocations));
             threads[i].start();
         }
         readyLatch.await();
         startLatch.countDown();
-        for (int i = 0; i < NUM_THREADS; ++i) {
+        for (int i = 0; i < numThreads; ++i) {
             threads[i].join(30000);
             StackTraceElement[] stack = threads[i].getStackTrace();
             if (stack.length > 0) {
@@ -68,7 +69,7 @@ private void testMultithreading(StubSupplier stubSupplier) throws Throwable {
         if (error != null) {
             throw error;
         }
-        assertEquals("number of successes", NUM_THREADS * 4, report.getSuccessCount());
+        assertEquals("number of successes", numThreads * numInvocations, report.getSuccessCount());
     } // testMultithreading
 } // class MultithreadTestCase
 

From c4af21a3aac86fd124bc3b8cc90ab0b663382628 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 6 Jul 2015 19:01:34 +0000
Subject: [PATCH 068/133] Fix another concurrency issue similar to AXIS-2850
 and ensure that stubs are thread safe.

---
 .../src/main/java/org/apache/axis/client/Stub.java         | 7 +++++--
 .../java/test/wsdl/multithread/MultithreadTestCase.java    | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java b/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
index 6af643843..72df6dc7c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/Stub.java
@@ -432,11 +432,14 @@ public Service _getService() {
      * @return
      */
     public Call _createCall() throws ServiceException {
-        _call = (Call) service.createCall();
+        // A single stub instance may be used concurrently by multiple threads; therefore we need
+        // to return the value of the local call variable instead of reading the _call attribute.
+        Call call = (Call) service.createCall();
+        _call = call;
 
         // TODO: There is a lot of code in the generated stubs that
         // can be moved here.
-        return _call;
+        return call;
     }
 
     /**
diff --git a/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java b/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
index 6f05cc0c3..726fe6d0a 100644
--- a/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
+++ b/integration/src/test/java/test/wsdl/multithread/MultithreadTestCase.java
@@ -46,7 +46,7 @@ public AddressBook getStub() throws Exception {
     private void testMultithreading(StubSupplier stubSupplier) throws Throwable {
         Report report = new Report();
         final int numThreads = 50;
-        final int numInvocations = 4;
+        final int numInvocations = 10;
         CountDownLatch readyLatch = new CountDownLatch(numThreads);
         CountDownLatch startLatch = new CountDownLatch(1);
         Thread[] threads = new Thread[numThreads];

From 408e4962e1b5cb37d1faeb58bf96826e7bbaaa4f Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 28 Jul 2015 20:07:59 +0000
Subject: [PATCH 069/133] Fix a flaky test: the order of methods returned by
 the reflection API is not deterministic.

---
 .../java/test/servicedesc/TestServiceDesc.java    | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java b/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java
index 69d47d5ec..ffbf5f39d 100644
--- a/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java
+++ b/axis-rt-core/src/test/java/test/servicedesc/TestServiceDesc.java
@@ -15,6 +15,8 @@
  */
 package test.servicedesc;
 
+import java.util.Arrays;
+import java.util.Comparator;
 import java.util.List;
 
 import junit.framework.TestCase;
@@ -30,16 +32,21 @@ public void testFaultSynch() throws Exception {
 
         desc.loadServiceDescByIntrospection(ServiceClass.class);
 
-        List operations = desc.getOperations();
+        OperationDesc[] operations = (OperationDesc[])desc.getOperations().toArray(new OperationDesc[0]);
+        Arrays.sort(operations, new Comparator() {
+            public int compare(Object o1, Object o2) {
+                return ((OperationDesc)o1).getName().compareTo(((OperationDesc)o2).getName());
+            }
+        });
 
         assertTrue(operations != null);
         assertEquals("invalid number of registered operations",
-                     2, operations.size());
+                     2, operations.length);
         
         OperationDesc operation;
         List faults;
 
-        operation = (OperationDesc)operations.get(0);
+        operation = operations[0];
         assertEquals("doIt1", operation.getName());
 
         faults = operation.getFaults();
@@ -48,7 +55,7 @@ public void testFaultSynch() throws Exception {
         assertEquals("invalid number of registered faults", 
                      2, faults.size());
 
-        operation = (OperationDesc)operations.get(1);
+        operation = operations[1];
         assertEquals("doIt2", operation.getName());
 
         faults = operation.getFaults();

From b5c83551fca40d5804c13d620266b4f25a2d4a05 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 15 Feb 2018 21:39:48 +0000
Subject: [PATCH 070/133] Switch to ulog release.

---
 maven/pom.xml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/maven/pom.xml b/maven/pom.xml
index 578a812c4..f3776c466 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -62,7 +62,7 @@
             <dependency>
                 <groupId>com.github.veithen.ulog</groupId>
                 <artifactId>ulog</artifactId>
-                <version>0.1.0-SNAPSHOT</version>
+                <version>0.1.0</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
@@ -97,19 +97,4 @@
             </plugin>
         </plugins>
     </build>
-    
-    <!-- TODO: remove this once a ulog release is deployed to Maven Central -->
-    <repositories>
-        <repository>
-            <id>veithen-github-mvn-repo</id>
-            <url>https://raw.github.com/veithen/mvn-repo/master/snapshots/</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-    
 </project>

From 78899be8c7fa6f6d527f25c5953d71a215e8732b Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 15 Feb 2018 23:14:12 +0000
Subject: [PATCH 071/133] Fix Javadoc errors.

---
 axis-saaj/src/main/java/javax/xml/soap/MimeHeaders.java   | 2 +-
 axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java      | 2 +-
 .../main/java/javax/xml/soap/SOAPConnectionFactory.java   | 2 +-
 .../src/main/java/javax/xml/soap/SOAPElementFactory.java  | 2 +-
 axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java  | 8 ++++----
 axis-saaj/src/main/java/javax/xml/soap/SOAPException.java | 2 +-
 axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java     | 1 +
 axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java      | 2 +-
 8 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/axis-saaj/src/main/java/javax/xml/soap/MimeHeaders.java b/axis-saaj/src/main/java/javax/xml/soap/MimeHeaders.java
index 61b500af3..ffb1039fd 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/MimeHeaders.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/MimeHeaders.java
@@ -21,7 +21,7 @@
 /**
  * A container for <CODE>MimeHeader</CODE> objects, which
  *   represent the MIME headers present in a MIME part of a
- *   message.</P>
+ *   message.
  *
  *   <P>This class is used primarily when an application wants to
  *   retrieve specific attachments based on certain MIME headers and
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java
index 75d735967..6abdb82bf 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPBody.java
@@ -81,7 +81,7 @@ public abstract SOAPBodyElement addBodyElement(Name name)
      * @param faultString a <code>String</code> giving an explanation of the
      *              fault
      * @param locale a <code>Locale</code> object indicating the native language
-     *              of the <ocde>faultString</code>
+     *              of the <code>faultString</code>
      * @return the new <code>SOAPFault</code> object
      * @throws SOAPException  if there is a SOAP error
      */
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
index 2b595745f..02b83c26c 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPConnectionFactory.java
@@ -34,7 +34,7 @@ public SOAPConnectionFactory() {}
      * @return a new instance of a default <CODE>
      *     SOAPConnectionFactory</CODE> object
      * @throws  SOAPException  if there was an error creating
-     *     the <CODE>SOAPConnectionFactory
+     *     the <CODE>SOAPConnectionFactory</CODE>
      * @throws UnsupportedOperationException  if newInstance is not supported.
      */
     public static SOAPConnectionFactory newInstance()
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java
index 744c0be83..6e640216c 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPElementFactory.java
@@ -100,7 +100,7 @@ public SOAPElement create(String localName, String prefix, String uri)
      * @return a new instance of a <CODE>
      *     SOAPElementFactory</CODE>
      * @throws  SOAPException if there was an error creating
-     *     the default <CODE>SOAPElementFactory
+     *     the default <CODE>SOAPElementFactory</CODE>
      */
     public static SOAPElementFactory newInstance() throws SOAPException {
 
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java
index 8da3f2903..af9d06d1f 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPEnvelope.java
@@ -26,7 +26,7 @@
  *   required, and the <CODE>SOAPHeader</CODE> object, though
  *   optional, is used in the majority of cases. If the <CODE>
  *   SOAPHeader</CODE> object is not needed, it can be deleted,
- *   which is shown later.</P>
+ *   which is shown later.
  *
  *   <P>A client can access the <CODE>SOAPHeader</CODE> and <CODE>
  *   SOAPBody</CODE> objects by calling the methods <CODE>
@@ -35,7 +35,7 @@
  *   these two methods after starting with the <CODE>
  *   SOAPMessage</CODE> object <I>message</I> to get the <CODE>
  *   SOAPPart</CODE> object <I>sp</I>, which is then used to get the
- *   <CODE>SOAPEnvelope</CODE> object <I>se</I>.</P>
+ *   <CODE>SOAPEnvelope</CODE> object <I>se</I>.
  * <PRE>
  *    SOAPPart sp = message.getSOAPPart();
  *    SOAPEnvelope se = sp.getEnvelope();
@@ -50,7 +50,7 @@
  *   detaches the XML element (node) on which it is called. For
  *   example, the following line of code deletes the <CODE>
  *   SOAPBody</CODE> object that is retrieved by the method <CODE>
- *   getBody</CODE>.</P>
+ *   getBody</CODE>.
  * <PRE>
  *     se.getBody().detachNode();
  * </PRE>
@@ -82,7 +82,7 @@
  *   namespace prefix, and the third creates <CODE>Name</CODE>
  *   objects with just a local name. The following line of code, in
  *   which <I>se</I> is a <CODE>SOAPEnvelope</CODE> object, creates
- *   a new <CODE>Name</CODE> object with all three.</P>
+ *   a new <CODE>Name</CODE> object with all three.
  * <PRE>
  *    Name name = se.createName("GetLastTradePrice", "WOMBAT",
  *                               "http://www.wombat.org/trader");
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java
index b92868684..f789d7bfb 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPException.java
@@ -21,7 +21,7 @@
  *   <CODE>String</CODE> that gives the reason for the exception, an
  *   embedded <CODE>Throwable</CODE> object, or both. This class
  *   provides methods for retrieving reason messages and for
- *   retrieving the embedded <CODE>Throwable</CODE> object.</P>
+ *   retrieving the embedded <CODE>Throwable</CODE> object.
  *
  *   <P>Typical reasons for throwing a <CODE>SOAPException</CODE>
  *   object are problems such as difficulty setting a header, not
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java
index 2b680e863..49d409173 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPFault.java
@@ -154,6 +154,7 @@ public abstract void setFaultString(String faultString)
      SOAPConstants.URI_NS_SOAP_ENVELOPE);
      SOAPFault fault = ...;
      fault.setFaultCode(qname);
+     </pre>
      *
      * It is preferable to use this method over setFaultCode(String).
      *
diff --git a/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java b/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java
index 72dd878ec..49a8a8a34 100644
--- a/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java
+++ b/axis-saaj/src/main/java/javax/xml/soap/SOAPPart.java
@@ -240,7 +240,7 @@ public void setContentLocation(String contentLocation) {
     /**
      * Sets the content of the <CODE>SOAPEnvelope</CODE> object
      * with the data from the given <CODE>Source</CODE> object.
-     * @param   source javax.xml.transform.Source</CODE> object with the data to
+     * @param   source <CODE>javax.xml.transform.Source</CODE> object with the data to
      *     be set
      * @throws  SOAPException if there is a problem in
      *     setting the source

From a5efd728a66a0e9513270d1fdfabe546d2a8830b Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 18 Feb 2018 15:18:36 +0000
Subject: [PATCH 072/133] Fix Javadoc problems.

---
 .../src/main/java/javax/xml/rpc/Call.java     |  4 +--
 axis-rt-core/pom.xml                          | 10 +++++++
 .../java/org/apache/axis/AxisProperties.java  |  4 +--
 .../main/java/org/apache/axis/Constants.java  |  2 +-
 .../axis/EngineConfigurationFactory.java      |  2 +-
 .../main/java/org/apache/axis/Handler.java    |  2 +-
 .../src/main/java/org/apache/axis/Part.java   |  1 -
 .../main/java/org/apache/axis/SOAPPart.java   |  4 +--
 ...DefaultHTTPSTransportClientProperties.java |  6 ++---
 .../components/net/SecureSocketFactory.java   |  2 +-
 .../configuration/DefaultConfiguration.java   | 10 +++----
 .../axis/description/OperationDesc.java       |  4 +--
 .../org/apache/axis/description/TypeDesc.java |  2 +-
 .../axis/encoding/ser/ArrayDeserializer.java  |  2 +-
 .../ser/ArrayDeserializerFactory.java         |  2 +-
 .../encoding/ser/ArraySerializerFactory.java  |  4 +--
 .../axis/encoding/ser/Base64Deserializer.java |  4 +--
 .../ser/Base64DeserializerFactory.java        |  2 +-
 .../axis/encoding/ser/Base64Serializer.java   |  4 +--
 .../encoding/ser/Base64SerializerFactory.java |  2 +-
 .../encoding/ser/BaseDeserializerFactory.java |  8 +++---
 .../apache/axis/encoding/ser/BaseFactory.java |  2 +-
 .../encoding/ser/BaseSerializerFactory.java   |  8 +++---
 .../axis/encoding/ser/BeanDeserializer.java   |  6 ++---
 .../encoding/ser/BeanDeserializerFactory.java |  4 +--
 .../axis/encoding/ser/BeanSerializer.java     |  6 ++---
 .../encoding/ser/BeanSerializerFactory.java   |  2 +-
 .../axis/encoding/ser/CalendarSerializer.java |  4 +--
 .../ser/CalendarSerializerFactory.java        |  2 +-
 .../axis/encoding/ser/DateSerializer.java     |  4 +--
 .../encoding/ser/DateSerializerFactory.java   |  2 +-
 .../encoding/ser/DocumentDeserializer.java    |  2 +-
 .../ser/DocumentDeserializerFactory.java      |  2 +-
 .../axis/encoding/ser/DocumentSerializer.java |  2 +-
 .../ser/DocumentSerializerFactory.java        |  2 +-
 .../encoding/ser/ElementDeserializer.java     |  2 +-
 .../ser/ElementDeserializerFactory.java       |  2 +-
 .../axis/encoding/ser/ElementSerializer.java  |  2 +-
 .../ser/ElementSerializerFactory.java         |  2 +-
 .../axis/encoding/ser/EnumDeserializer.java   |  4 +--
 .../encoding/ser/EnumDeserializerFactory.java |  2 +-
 .../axis/encoding/ser/EnumSerializer.java     |  4 +--
 .../encoding/ser/EnumSerializerFactory.java   |  2 +-
 .../axis/encoding/ser/HexDeserializer.java    |  4 +--
 .../encoding/ser/HexDeserializerFactory.java  |  2 +-
 .../axis/encoding/ser/HexSerializer.java      |  4 +--
 .../encoding/ser/HexSerializerFactory.java    |  2 +-
 .../ser/ImageDataHandlerDeserializer.java     |  2 +-
 .../ser/JAFDataHandlerDeserializer.java       |  2 +-
 .../ser/JAFDataHandlerSerializer.java         |  2 +-
 .../axis/encoding/ser/MapSerializer.java      |  2 +-
 .../OctetStreamDataHandlerDeserializer.java   |  2 +-
 .../ser/PlainTextDataHandlerDeserializer.java |  2 +-
 .../encoding/ser/SimpleListDeserializer.java  |  6 ++---
 .../ser/SimpleListDeserializerFactory.java    |  6 ++---
 .../encoding/ser/SimpleListSerializer.java    |  6 ++---
 .../axis/encoding/ser/SimpleSerializer.java   |  2 +-
 .../ser/SourceDataHandlerDeserializer.java    |  2 +-
 .../axis/encoding/ser/VectorDeserializer.java |  2 +-
 .../axis/encoding/ser/VectorSerializer.java   |  2 +-
 .../org/apache/axis/holders/SchemaHolder.java |  2 +-
 .../org/apache/axis/i18n/MessageBundle.java   | 24 ++++++++---------
 .../axis/i18n/ProjectResourceBundle.java      | 12 ---------
 .../main/java/org/apache/axis/i18n/RB.java    | 26 +++++++++----------
 .../apache/axis/message/MessageElement.java   | 24 ++++++++---------
 .../apache/axis/message/NullAttributes.java   |  2 +-
 .../org/apache/axis/message/RPCHandler.java   | 10 ++++---
 .../apache/axis/message/SOAPDocumentImpl.java | 20 +++++++-------
 .../axis/transport/http/AdminServlet.java     |  3 ---
 .../transport/http/AutoRegisterServlet.java   |  2 --
 .../http/AxisHTTPSessionListener.java         |  1 -
 .../axis/transport/http/AxisServlet.java      |  5 ----
 .../axis/transport/http/AxisServletBase.java  |  4 +--
 .../axis/transport/local/LocalSender.java     |  2 +-
 .../main/java/org/apache/axis/types/Day.java  |  2 +-
 .../java/org/apache/axis/types/Duration.java  |  2 +-
 .../java/org/apache/axis/types/Entities.java  |  2 +-
 .../java/org/apache/axis/types/Entity.java    |  2 +-
 .../java/org/apache/axis/types/HexBinary.java |  2 +-
 .../java/org/apache/axis/types/IDRef.java     |  2 +-
 .../java/org/apache/axis/types/IDRefs.java    |  2 +-
 .../main/java/org/apache/axis/types/Id.java   |  2 +-
 .../java/org/apache/axis/types/Language.java  |  2 +-
 .../java/org/apache/axis/types/Month.java     |  2 +-
 .../java/org/apache/axis/types/MonthDay.java  |  2 +-
 .../java/org/apache/axis/types/NCName.java    |  2 +-
 .../java/org/apache/axis/types/NMToken.java   |  2 +-
 .../java/org/apache/axis/types/NMTokens.java  |  2 +-
 .../main/java/org/apache/axis/types/Name.java |  2 +-
 .../apache/axis/types/NegativeInteger.java    |  2 +-
 .../apache/axis/types/NonNegativeInteger.java |  2 +-
 .../apache/axis/types/NonPositiveInteger.java |  2 +-
 .../apache/axis/types/NormalizedString.java   |  2 +-
 .../java/org/apache/axis/types/Notation.java  |  2 +-
 .../apache/axis/types/PositiveInteger.java    |  2 +-
 .../java/org/apache/axis/types/Schema.java    |  2 +-
 .../java/org/apache/axis/types/Token.java     |  2 +-
 .../org/apache/axis/types/UnsignedByte.java   |  2 +-
 .../org/apache/axis/types/UnsignedInt.java    |  2 +-
 .../org/apache/axis/types/UnsignedLong.java   |  2 +-
 .../org/apache/axis/types/UnsignedShort.java  |  2 +-
 .../main/java/org/apache/axis/types/Year.java |  2 +-
 .../java/org/apache/axis/types/YearMonth.java |  2 +-
 .../axis/utils/BeanPropertyDescriptor.java    |  2 +-
 .../axis/utils/ByteArrayOutputStream.java     |  6 ++---
 .../java/org/apache/axis/utils/IOUtils.java   |  2 +-
 .../apache/axis/utils/IdentityHashMap.java    |  2 +-
 .../java/org/apache/axis/utils/JavaUtils.java |  4 +--
 .../java/org/apache/axis/utils/Messages.java  | 14 ----------
 .../java/org/apache/axis/utils/NSStack.java   | 10 ++++---
 .../org/apache/axis/utils/StringUtils.java    |  4 +--
 .../java/org/apache/axis/utils/WSDLUtils.java |  2 +-
 .../apache/axis/utils/cache/JavaClass.java    |  2 +-
 .../apache/axis/utils/cache/JavaMethod.java   |  3 +--
 .../apache/axis/utils/cache/MethodCache.java  |  4 +--
 .../org/apache/axis/wsdl/gen/Generator.java   |  2 +-
 .../java/org/apache/axis/wsdl/gen/Parser.java |  2 +-
 .../axis/wsdl/symbolTable/BackslashUtil.java  |  4 +--
 pom.xml                                       |  1 +
 119 files changed, 216 insertions(+), 242 deletions(-)

diff --git a/axis-jaxrpc/src/main/java/javax/xml/rpc/Call.java b/axis-jaxrpc/src/main/java/javax/xml/rpc/Call.java
index 693c801ba..8622ac2ce 100644
--- a/axis-jaxrpc/src/main/java/javax/xml/rpc/Call.java
+++ b/axis-jaxrpc/src/main/java/javax/xml/rpc/Call.java
@@ -36,7 +36,7 @@ public interface Call {
 
     /**
      * Standard property: User name for authentication
-     * <p>Type: <code>java.lang.String
+     * <p>Type: <code>java.lang.String</code>
      */
     public static final String USERNAME_PROPERTY =
         "javax.xml.rpc.security.auth.username";
@@ -126,7 +126,7 @@ public interface Call {
      * @param parameterMode Mode of the parameter-whether
      *                <code>ParameterMode.IN</code>,
      *                <code>ParameterMode.OUT</code>,
-     *                or <code>ParameterMode.INOUT
+     *                or <code>ParameterMode.INOUT</code>
      * @throws JAXRPCException This exception may
      *     be thrown if the method <code>isParameterAndReturnSpecRequired</code>
      *     returns <code>false</code> for this operation.
diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index 4573eaf7f..a43e9fa03 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -170,6 +170,16 @@
                     </compilerArgument>
                 </configuration>
             </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <sourceFileExcludes>
+                        <sourceFileExclude>org/apache/axis/components/image/JimiIO.java</sourceFileExclude>
+                        <sourceFileExclude>org/apache/axis/components/net/IBM*.java</sourceFileExclude>
+                        <sourceFileExclude>org/apache/axis/providers/ComProvider.java</sourceFileExclude>
+                    </sourceFileExcludes>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
diff --git a/axis-rt-core/src/main/java/org/apache/axis/AxisProperties.java b/axis-rt-core/src/main/java/org/apache/axis/AxisProperties.java
index 5427389c5..056a8d702 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/AxisProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/AxisProperties.java
@@ -45,8 +45,7 @@
 
 
 /**
- * <p>Configuration properties for AXIS.
- * </p>
+ * Configuration properties for AXIS.
  *
  * <p>Manage configuration properties according to a secure
  * scheme similar to that used by classloaders:
@@ -70,7 +69,6 @@
  *   </li>
  *   <li>System properties take precedence over all other properties</li>
  * </ul>
- * </p>
  *
  * @author Richard A. Sitze
  */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/Constants.java b/axis-rt-core/src/main/java/org/apache/axis/Constants.java
index f107539d3..4052ee8f9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/Constants.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/Constants.java
@@ -644,7 +644,7 @@ public static boolean isWSDLSOAP(String s) {
 
     /**
      * QName of exception Name element in an axis fault detail.
-     * Do not use - this is for pre-1.0 server->client exceptions.
+     * Do not use - this is for pre-1.0 server-&gt;client exceptions.
      */
     public static final QName QNAME_FAULTDETAIL_EXCEPTIONNAME = new QName(NS_URI_AXIS, "exceptionName");
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/EngineConfigurationFactory.java b/axis-rt-core/src/main/java/org/apache/axis/EngineConfigurationFactory.java
index a3bf69866..1b5ed098c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/EngineConfigurationFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/EngineConfigurationFactory.java
@@ -27,7 +27,7 @@
  *     //If a factory cannot be created, return 'null'.
  *     //
  *     //The factory may return non-NULL only if:
- *     //  - it knows what to do with the param (check type & process value)
+ *     //  - it knows what to do with the param (check type &amp; process value)
  *     //  - it can find it's configuration information
  *     //
  *     //@see org.apache.axis.configuration.EngineConfigurationFactoryFinder
diff --git a/axis-rt-core/src/main/java/org/apache/axis/Handler.java b/axis-rt-core/src/main/java/org/apache/axis/Handler.java
index 4af62343a..5604016d7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/Handler.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/Handler.java
@@ -69,7 +69,7 @@ public interface Handler extends Serializable {
      * Indicate if this handler can process <code>qname</code>.
      *
      * @param qname  the <code>QName</code> to check
-     * @return true if this <code>Handler</code> can handle <code>qname<code>,
+     * @return true if this <code>Handler</code> can handle <code>qname</code>,
      *              false otherwise
      */
     public boolean canHandleBlock(QName qname);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/Part.java b/axis-rt-core/src/main/java/org/apache/axis/Part.java
index 39f8ae57b..04eebf790 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/Part.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/Part.java
@@ -32,7 +32,6 @@ public interface Part extends java.io.Serializable
      *     "Content-Type"
      * @return a <CODE>String</CODE> array giving all the values for
      *     the specified header
-     * @see #setMimeHeader(java.lang.String, java.lang.String) setMimeHeader(java.lang.String, java.lang.String)
      */
     public String[] getMimeHeader(String name);
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java b/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java
index b14af1833..a983f36c9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/SOAPPart.java
@@ -827,7 +827,7 @@ public java.util.Iterator getNonMatchingMimeHeaders( final String[] match){
     /**
      * Sets the content of the <CODE>SOAPEnvelope</CODE> object
      * with the data from the given <CODE>Source</CODE> object.
-     * @param   source javax.xml.transform.Source</CODE> object with the data to
+     * @param   source <CODE>javax.xml.transform.Source</CODE> object with the data to
      *     be set
      * @throws  SOAPException if there is a problem in
      *     setting the source
@@ -950,7 +950,7 @@ public Iterator getAllMimeHeaders() {
      *     current value(s) of the first header that is a match if
      *     there is one. If there is no match, this value will be
      *     the value for a new <CODE>MimeHeader</CODE> object.
-     * @ throws java.lang.IllegalArgumentException if
+     * @throws java.lang.IllegalArgumentException if
      *     there was a problem with the specified mime header name
      *     or value
      * @see #getMimeHeader(java.lang.String) getMimeHeader(java.lang.String)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java
index bcd6d6a06..9c03eb835 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPSTransportClientProperties.java
@@ -47,7 +47,7 @@ public String getNonProxyHosts() {
     }
 
     /**
-     * @see org.apache.axis.components.net.TransportClientProperties#getPort()
+     * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
      */
     public String getProxyPort() {
         if (proxyPort == null) {
@@ -58,7 +58,7 @@ public String getProxyPort() {
     }
 
     /**
-     * @see org.apache.axis.components.net.TransportClientProperties#getUser()
+     * @see org.apache.axis.components.net.TransportClientProperties#getProxyUser()
      */
     public String getProxyUser() {
         if (proxyUser == null) {
@@ -69,7 +69,7 @@ public String getProxyUser() {
     }
 
     /**
-     * @see org.apache.axis.components.net.TransportClientProperties#getPassword()
+     * @see org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
      */
     public String getProxyPassword() {
         if (proxyPassword == null) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java
index d90e38ffa..d91fd886d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/SecureSocketFactory.java
@@ -19,7 +19,7 @@
 /**
  * Secure Socket factory.
  * This has a separate interface to allow discovery (by interface)
- * and runtime distinction to be made between Socket & SecureSockets.
+ * and runtime distinction to be made between Socket &amp; SecureSockets.
  * 
  * @author Richard A. Sitze
  * @author Davanum Srinivas (dims@yahoo.com)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java
index a77d23313..dffa3a023 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/configuration/DefaultConfiguration.java
@@ -33,9 +33,9 @@
 
 /**
  * Configuration provider that loads the default Axis configuration. It first loads the
- * <tt>org/apache/axis/&lt;type>/&lt;type>-config.wsdd</tt> resource and then searches for resources
- * with name <tt>META-INF/axis/default-&lt;type>-config.wsdd</tt>. All the discovered WSDD documents
- * are merged into a single configuration. <tt>&lt;type></tt> identifies the engine type for which
+ * <tt>org/apache/axis/&lt;type&gt;/&lt;type&gt;-config.wsdd</tt> resource and then searches for resources
+ * with name <tt>META-INF/axis/default-&lt;type&gt;-config.wsdd</tt>. All the discovered WSDD documents
+ * are merged into a single configuration. <tt>&lt;type&gt;</tt> identifies the engine type for which
  * the configuration is to be built; it is either <tt>client</tt> or <tt>server</tt>.
  * <p>
  * This class looks up the resources using the thread context class loader, except if it determines
@@ -47,8 +47,8 @@
  * The algorithm implemented by this class is designed to support the modularized artifacts
  * introduced in Axis 1.4.1. It allows individual JARs to contribute items (transports, handlers,
  * etc.) to the default configuration. The naming convention for the base configuration file
- * (<tt>org/apache/axis/&lt;type>/&lt;type>-config.wsdd</tt>) was chosen for consistency with Axis
- * 1.4, while <tt>META-INF/axis/default-&lt;type>-config.wsdd</tt> is new in Axis 1.4.1.
+ * (<tt>org/apache/axis/&lt;type&gt;/&lt;type&gt;-config.wsdd</tt>) was chosen for consistency with Axis
+ * 1.4, while <tt>META-INF/axis/default-&lt;type&gt;-config.wsdd</tt> is new in Axis 1.4.1.
  * <p>
  * {@link DefaultConfiguration} is also used by {@link FileProvider} to build the configuration if
  * no existing configuration file is found.
diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java
index ebc944194..0e280443a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/OperationDesc.java
@@ -398,7 +398,7 @@ else if ( qname.equals(returnDesc.getQName())) {
     /**
      * Return a list of ALL "in" params (including INOUTs)
      * 
-     * Note: if we were sure the order went IN->INOUT->OUT, we could optimize
+     * Note: if we were sure the order went IN-&gt;INOUT-&gt;OUT, we could optimize
      * this.
      * 
      * @return
@@ -417,7 +417,7 @@ public ArrayList getAllInParams() {
     /**
      * Return a list of ALL "out" params (including INOUTs)
      * 
-     * Note: if we were sure the order went IN->INOUT->OUT, we could optimize
+     * Note: if we were sure the order went IN-&gt;INOUT-&gt;OUT, we could optimize
      * this.
      * 
      * @return
diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java
index 66dbfde33..f44ae27d8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/TypeDesc.java
@@ -34,7 +34,7 @@
 import java.util.WeakHashMap;
 
 /**
- * A TypeDesc represents a Java<->XML data binding.  It is essentially
+ * A TypeDesc represents a Java&lt;-&gt;XML data binding.  It is essentially
  * a collection of FieldDescs describing how to map each field in a Java
  * class to XML.
  *
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java
index cdb690f64..6f2ad0666 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializer.java
@@ -66,7 +66,7 @@ public class ArrayDeserializer extends DeserializerImpl
 
     /**
      * This method is invoked after startElement when the element requires
-     * deserialization (i.e. the element is not an href & the value is not nil)
+     * deserialization (i.e. the element is not an href &amp; the value is not nil)
      * DeserializerImpl provides default behavior, which simply
      * involves obtaining a correct Deserializer and plugging its handler.
      * @param namespace is the namespace of the element
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java
index 4dc2ab17e..710a6109e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArrayDeserializerFactory.java
@@ -22,7 +22,7 @@
 /**
  * DeserializerFactory for arrays
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class ArrayDeserializerFactory extends BaseDeserializerFactory {
     private QName componentXmlType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java
index 163670e14..53a38e5f7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ArraySerializerFactory.java
@@ -25,7 +25,7 @@
 /**
  * SerializerFactory for arrays
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class ArraySerializerFactory extends BaseSerializerFactory {
     public ArraySerializerFactory() {
@@ -75,7 +75,7 @@ public QName getComponentType() {
         return componentType;
     }
     /**
-     * Obtains a serializer by invoking <constructor>(javaType, xmlType)
+     * Obtains a serializer by invoking &lt;constructor&gt;(javaType, xmlType)
      * on the serClass.
      */
     protected Serializer getGeneralPurpose(String mechanismType)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java
index 33d31b7cd..ae7f827e3 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Deserializer.java
@@ -23,8 +23,8 @@
 /**
  * Deserializer for Base64
  *
- * @author Sam Ruby <rubys@us.ibm.com>
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#base64Binary">XML Schema 3.2.16</a>
  */
 public class Base64Deserializer extends SimpleDeserializer  {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java
index deaf4f3bb..bc24c270d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64DeserializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * DeserializerFactory for hexBinary.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class Base64DeserializerFactory extends BaseDeserializerFactory {
     public Base64DeserializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java
index 7a585f146..7ade201c6 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64Serializer.java
@@ -30,8 +30,8 @@
 /**
  * Serializer for Base64
  *
- * @author Sam Ruby <rubys@us.ibm.com>
- * Modified by @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich Scheuerle (scheu@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#base64Binary">XML Schema 3.2.16</a>
  */
 public class Base64Serializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java
index 6d74b1ede..fdb51328b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/Base64SerializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * SerializerFactory for hexBinary.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class Base64SerializerFactory extends BaseSerializerFactory {
     public   Base64SerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
index 76bd70982..9409b8b9c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseDeserializerFactory.java
@@ -34,7 +34,7 @@
 /**
  * Base class for Axis Deserialization Factory classes for code reuse
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public abstract class BaseDeserializerFactory extends BaseFactory 
     implements DeserializerFactory {
@@ -101,7 +101,7 @@ public BaseDeserializerFactory(Class deserClass,
     }
 
    /**
-     * Obtains a deserializer by invoking <constructor>(javaType, xmlType) 
+     * Obtains a deserializer by invoking &lt;constructor&gt;(javaType, xmlType) 
      * on the deserClass.
      */
     protected Deserializer getGeneralPurpose(String mechanismType) {
@@ -188,8 +188,8 @@ public Iterator getSupportedMechanismTypes() {
      * Utility method that intospects on a factory class to decide how to 
      * create the factory.  Tries in the following order:
      * public static create(Class javaType, QName xmlType)
-     * public <constructor>(Class javaType, QName xmlType)
-     * public <constructor>()
+     * public &lt;constructor&gt;(Class javaType, QName xmlType)
+     * public &lt;constructor&gt;()
      * @param factory class
      * @param javaType
      * @param xmlType
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java
index 1ab5889d1..ee5ded0f7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseFactory.java
@@ -25,7 +25,7 @@
  * Base Factory for BaseDeserializerFactory and BaseSerializerFactory.
  * Code Reuse for the method cache
  * 
- * @author Davanum Srinivas <dims@yahoo.com> 
+ * @author Davanum Srinivas (dims@yahoo.com) 
  */
 public abstract class BaseFactory {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java
index a9efc6632..68ba4e8ac 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BaseSerializerFactory.java
@@ -34,7 +34,7 @@
 /**
  * Base class for Axis Serialization Factory classes for code reuse
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public abstract class BaseSerializerFactory extends BaseFactory
     implements SerializerFactory {
@@ -111,7 +111,7 @@ protected Serializer getSerializerAsInternal(String mechanismType)
     }
     
     /**
-     * Obtains a serializer by invoking <constructor>(javaType, xmlType) 
+     * Obtains a serializer by invoking &lt;constructor&gt;(javaType, xmlType) 
      * on the serClass.
      */
     protected Serializer getGeneralPurpose(String mechanismType) {
@@ -217,8 +217,8 @@ public Class getJavaType() {
      * Utility method that intospects on a factory class to decide how to 
      * create the factory.  Tries in the following order:
      * public static create(Class javaType, QName xmlType)
-     * public <constructor>(Class javaType, QName xmlType)
-     * public <constructor>()
+     * public &lt;constructor&gt;(Class javaType, QName xmlType)
+     * public &lt;constructor&gt;()
      * @param factory class
      * @param xmlType
      * @param javaType
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java
index 44e518b34..42f6293ed 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializer.java
@@ -45,9 +45,9 @@
 /**
  * General purpose deserializer for an arbitrary java bean.
  *
- * @author Sam Ruby <rubys@us.ibm.com>
- * @author Rich Scheuerle <scheu@us.ibm.com>
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Tom Jordahl (tomj@macromedia.com)
  */
 public class BeanDeserializer extends DeserializerImpl implements Serializable
 {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java
index d39f0cd84..dd5e99c02 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanDeserializerFactory.java
@@ -30,8 +30,8 @@
 /**
  * DeserializerFactory for Bean
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class BeanDeserializerFactory extends BaseDeserializerFactory {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java
index 62150eba0..8501edb7c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializer.java
@@ -48,9 +48,9 @@
 /**
  * General purpose serializer/deserializerFactory for an arbitrary java bean.
  *
- * @author Sam Ruby <rubys@us.ibm.com>
- * @author Rich Scheuerle <scheu@us.ibm.com>
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Tom Jordahl (tomj@macromedia.com)
  */
 public class BeanSerializer implements Serializer, Serializable {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java
index 9a28aaa0a..4e415d3d4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/BeanSerializerFactory.java
@@ -30,7 +30,7 @@
 /**
  * SerializerFactory for Bean
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class BeanSerializerFactory extends BaseSerializerFactory {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java
index a5e8ef87b..b8cc8e28a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializer.java
@@ -33,8 +33,8 @@
 /**
  * Serializer for dateTime (Calendar).
  *
- * @author Sam Ruby <rubys@us.ibm.com>
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">XML Schema 3.2.16</a>
  */
 public class CalendarSerializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java
index dfa095f58..4fc9d3932 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/CalendarSerializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * SerializerFactory for Calendar(dateTime) primitives
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class CalendarSerializerFactory extends BaseSerializerFactory {
     public CalendarSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java
index c5a313b5e..7205ed00f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializer.java
@@ -33,8 +33,8 @@
 /**
  * Serializer for Dates.
  *
- * @author Sam Ruby <rubys@us.ibm.com>
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#dateTime">XML Schema 3.2.16</a>
  */
 public class DateSerializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java
index 33e0517b4..35e4d56dd 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DateSerializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * SerializerFactory for Date primitives
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class DateSerializerFactory extends BaseSerializerFactory {
     public DateSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java
index 81fa0d15e..dd9f57c35 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializer.java
@@ -30,7 +30,7 @@
 /**
  * Deserializer for DOM Document
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class DocumentDeserializer extends DeserializerImpl
 {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
index 6acdc5731..77ee73b9f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentDeserializerFactory.java
@@ -21,7 +21,7 @@
 /**
  * DeserializerFactory for DOM Document.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class DocumentDeserializerFactory extends BaseDeserializerFactory {
     public DocumentDeserializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java
index e805a8b91..6627e32bf 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializer.java
@@ -31,7 +31,7 @@
 /**
  * Serializer for DOM Document
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 
 public class DocumentSerializer implements Serializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
index dda6a8196..8b11d167b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/DocumentSerializerFactory.java
@@ -21,7 +21,7 @@
 /**
  * SerializerFactory for DOM Document
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class DocumentSerializerFactory extends BaseSerializerFactory {
     public DocumentSerializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java
index 7d61e9a1d..e939ee2ee 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializer.java
@@ -31,7 +31,7 @@
  * Deserializer for DOM elements
  *
  * @author Glen Daniels (gdaniels@apache.org)
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  */
 public class ElementDeserializer extends DeserializerImpl
 {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java
index 40f79aa1a..8248a4e4a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementDeserializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * DeserializerFactory for Element.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class ElementDeserializerFactory extends BaseDeserializerFactory {
     public ElementDeserializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java
index 2e91676e2..28cd46731 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializer.java
@@ -32,7 +32,7 @@
  * Serializer for DOM elements
  *
  * @author Glen Daniels (gdaniels@apache.org)
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  */
 
 public class ElementSerializer implements Serializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java
index 7afa42d32..e080e4583 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ElementSerializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * SerializerFactory for Element
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class ElementSerializerFactory extends BaseSerializerFactory {
     public ElementSerializerFactory() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java
index 364d399c1..c28628049 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializer.java
@@ -25,8 +25,8 @@
 /**
  * Deserializer for a JAX-RPC enum.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class EnumDeserializer extends SimpleDeserializer {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java
index 722384c76..9367d5989 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumDeserializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * DeserializerFactory for Enumeration.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class EnumDeserializerFactory extends BaseDeserializerFactory {
     public EnumDeserializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java
index 217f98213..f5f3541c7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializer.java
@@ -30,8 +30,8 @@
 /**
  * Serializer for a JAX-RPC enum.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class EnumSerializer extends SimpleSerializer
 {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java
index dc9c339ce..20dbefaaa 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/EnumSerializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * SerializerFactory for Enum
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class EnumSerializerFactory extends BaseSerializerFactory {
     public EnumSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java
index a1e76d540..740de2f7c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializer.java
@@ -23,8 +23,8 @@
 /**
  * Deserializer for hexBinary.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#hexBinary">XML Schema 3.2.16</a>
  */
 public class HexDeserializer extends SimpleDeserializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java
index c7eb9d0ba..ea55961cc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexDeserializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * DeserializerFactory for hexBinary.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class HexDeserializerFactory extends BaseDeserializerFactory {
     public HexDeserializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java
index 32414e08b..08197d6ef 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializer.java
@@ -30,8 +30,8 @@
 /**
  * Serializer for hexBinary.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#hexBinary">XML Schema 3.2.16</a>
  */
 public class HexSerializer implements SimpleValueSerializer {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java
index 4ff02c8c1..f1b998733 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/HexSerializerFactory.java
@@ -20,7 +20,7 @@
 /**
  * SerializerFactory for hexBinary.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class HexSerializerFactory extends BaseSerializerFactory {
     public HexSerializerFactory(Class javaType, QName xmlType) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java
index 856430d0b..e27427d3a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/ImageDataHandlerDeserializer.java
@@ -30,7 +30,7 @@
 
 /**
  * ImageDataHandler Deserializer
- * Modified by Russell Butek <butek@us.ibm.com>
+ * Modified by Russell Butek (butek@us.ibm.com)
  */
 public class ImageDataHandlerDeserializer extends JAFDataHandlerDeserializer {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
index ad7e102a6..d223a19ea 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerDeserializer.java
@@ -34,7 +34,7 @@
 /**
  * JAFDataHandler Serializer
  * @author Rick Rineholt 
- * Modified by Rich Scheuerle <scheu@us.ibm.com>
+ * Modified by Rich Scheuerle (scheu@us.ibm.com)
  */
 public class JAFDataHandlerDeserializer extends DeserializerImpl {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
index eb9bd24dc..e59544f24 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/JAFDataHandlerSerializer.java
@@ -38,7 +38,7 @@
 /**
  * JAFDataHandler Serializer
  * @author Rick Rineholt
- * Modified by Rich Scheuerle <scheu@us.ibm.com>
+ * Modified by Rich Scheuerle (scheu@us.ibm.com)
  */
 public class JAFDataHandlerSerializer implements Serializer {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java
index e4dbb16db..22eb4c741 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapSerializer.java
@@ -55,7 +55,7 @@ public class MapSerializer implements Serializer
     /** Serialize a Map
      *
      * Walk the collection of keys, serializing each key/value pair
-     * inside an <item> element.
+     * inside an &lt;item&gt; element.
      *
      * @param name the desired QName for the element
      * @param attributes the desired attributes for the element
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
index 9a7080fa2..2093a0228 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/OctetStreamDataHandlerDeserializer.java
@@ -30,7 +30,7 @@
 
 /**
  * application/octet-stream DataHandler Deserializer
- * Modified by Davanum Srinivas <dims@yahoo.com>
+ * Modified by Davanum Srinivas (dims@yahoo.com)
  */
 public class OctetStreamDataHandlerDeserializer extends JAFDataHandlerDeserializer {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java
index f79d20282..8e7a36aa0 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/PlainTextDataHandlerDeserializer.java
@@ -27,7 +27,7 @@
 
 /**
  * text/plain DataHandler Deserializer
- * Modified by Russell Butek <butek@us.ibm.com>
+ * Modified by Russell Butek (butek@us.ibm.com)
  */
 public class PlainTextDataHandlerDeserializer extends JAFDataHandlerDeserializer {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java
index 8d00c947a..f230f50d8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializer.java
@@ -40,9 +40,9 @@
 
 /**
  * Deserializer for 
- * <xsd:simpleType ...>
- *   <xsd:list itemType="...">
- * </xsd:simpleType>
+ * &lt;xsd:simpleType ...&gt;
+ *   &lt;xsd:list itemType="..."&gt;
+ * &lt;/xsd:simpleType&gt;
  * based on SimpleDeserializer
  *
  * @author Ias (iasandcb@tmax.co.kr)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java
index 1c209e0a2..fdff4d955 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListDeserializerFactory.java
@@ -25,9 +25,9 @@
 
 /**
  * DeserializerFactory for 
- * <xsd:simpleType ...>
- *   <xsd:list itemType="...">
- * </xsd:simpleType>
+ * &lt;xsd:simpleType ...&gt;
+ *   &lt;xsd:list itemType="..."&gt;
+ * &lt;/xsd:simpleType&gt;
  * based on SimpleDeserializerFactory
  *
  * @author Ias (iasandcb@tmax.co.kr)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
index 706465691..123dfd67d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
@@ -36,9 +36,9 @@
 
 /**
  * Serializer for 
- * <xsd:simpleType ...>
- *   <xsd:list itemType="...">
- * </xsd:simpleType>
+ * &lt;xsd:simpleType ...&gt;
+ *   &lt;xsd:list itemType="..."&gt;
+ * &lt;/xsd:simpleType&gt;
  * based on SimpleSerializer
  *
  * @author Ias <iasandcb@tmax.co.kr>
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java
index c067ce414..9bc1606d1 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleSerializer.java
@@ -38,7 +38,7 @@
 /**
  * Serializer for primitives and anything simple whose value is obtained with toString()
  *
- * @author Rich Scheuerle <dims@yahoo.com>
+ * @author Rich Scheuerle (dims@yahoo.com)
  */
 public class SimpleSerializer implements SimpleValueSerializer {
     public QName xmlType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
index 537157da1..4b35219c6 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SourceDataHandlerDeserializer.java
@@ -28,7 +28,7 @@
 
 /**
  * SourceDataHandler Deserializer
- * Modified by Russell Butek <butek@us.ibm.com>
+ * Modified by Russell Butek (butek@us.ibm.com)
  */
 public class SourceDataHandlerDeserializer extends JAFDataHandlerDeserializer {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java
index 64c88d452..91a2e4890 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorDeserializer.java
@@ -34,7 +34,7 @@
  * Deserializer for SOAP Vectors for compatibility with SOAP 2.2.
  *
  * @author Carsten Ziegeler (cziegeler@apache.org)
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  */
 public class VectorDeserializer extends DeserializerImpl
 {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java
index 3b8a47de8..ade227f04 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/VectorSerializer.java
@@ -48,7 +48,7 @@ public class VectorSerializer implements Serializer
     /** Serialize a Vector
      *
      * Walk the collection of keys, serializing each key/value pair
-     * inside an <item> element.
+     * inside an &lt;item&gt; element.
      *
      * @param name the desired QName for the element
      * @param attributes the desired attributes for the element
diff --git a/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java b/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java
index acbdc89fb..5906fdc23 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/holders/SchemaHolder.java
@@ -19,7 +19,7 @@
 /**
  * Custom class for supporting XSD schema
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public final class SchemaHolder implements javax.xml.rpc.holders.Holder {
     public org.apache.axis.types.Schema value;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java b/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java
index 4d86e2e92..64b3c2658 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/i18n/MessageBundle.java
@@ -89,9 +89,9 @@ public String getMessage(String key) throws MissingResourceException
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @return The message
@@ -105,9 +105,9 @@ public String getMessage(String key, String arg0) throws MissingResourceExceptio
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -122,9 +122,9 @@ public String getMessage(String key, String arg0, String arg1) throws MissingRes
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -140,9 +140,9 @@ public String getMessage(String key, String arg0, String arg1, String arg2) thro
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -159,9 +159,9 @@ public String getMessage(String key, String arg0, String arg1, String arg2, Stri
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -179,9 +179,9 @@ public String getMessage(String key, String arg0, String arg1, String arg2, Stri
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param array An array of objects to place in corresponding variables
       * @return The message
diff --git a/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java b/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
index aa47c4866..dc4ee7d3a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/i18n/ProjectResourceBundle.java
@@ -115,10 +115,6 @@ public Enumeration getKeys() {
      * @param projectName The name of the project to which the class belongs.
      *        It must be a proper prefix of the caller's package.
      * 
-     * @param caller The calling class.
-     *        This is used to get the package name to further construct
-     *        the basename as well as to get the proper ClassLoader.
-     * 
      * @param resourceName The name of the resource without the
      *        ".properties" extension
      * 
@@ -170,10 +166,6 @@ public static ProjectResourceBundle getBundle(String projectName,
      * @param projectName The name of the project to which the class belongs.
      *        It must be a proper prefix of the caller's package.
      * 
-     * @param caller The calling class.
-     *        This is used to get the package name to further construct
-     *        the basename as well as to get the proper ClassLoader.
-     * 
      * @param resourceName The name of the resource without the
      *        ".properties" extension
      * 
@@ -236,10 +228,6 @@ public static ProjectResourceBundle getBundle(String projectName,
      * @param projectName The name of the project to which the class belongs.
      *        It must be a proper prefix of the caller's package.
      * 
-     * @param caller The calling class.
-     *        This is used to get the package name to further construct
-     *        the basename as well as to get the proper ClassLoader.
-     * 
      * @param resourceName The name of the resource without the
      *        ".properties" extension
      * 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java b/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java
index f9079085e..f26a7d615 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/i18n/RB.java
@@ -43,7 +43,7 @@
  * (as returned by Local.getDefault()). As property files are found the
  * property values are merged so that inheritance is preserved.</p>
  * <p>The order of searching is:</p>
- * <dir>
+ * <pre>
  * basename + "_" + langage + "_" + country + "_" + variant
  * basename + "_" + langage + "_" + country
  * basename + "_" + langage
@@ -51,7 +51,7 @@
  * basename + "_" + defaultLanguage + "_" + defaultCountry
  * basename + "_" + defaultLanguage
  * basename
- * </dir>
+ * </pre>
  * <p>The basename is the name of the property file without the ".properties"
  * extension.</p>
  * <p>Properties will be cached for performance.<p>
@@ -106,7 +106,7 @@ public RB(Object caller, String name) throws MissingResourceException
       * @param caller The calling object. This is used to get the package name
       * to further construct the basename as well as to get the proper ClassLoader
       * @param name The name of the property file without the ".properties" extension
-      * @param local The local
+      * @param locale The locale
       */
     public RB(Object caller, String name, Locale locale) throws MissingResourceException
     {
@@ -170,9 +170,9 @@ public String getString(String key) throws MissingResourceException
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @return The message
@@ -188,9 +188,9 @@ public String getString(String key, Object arg0) throws MissingResourceException
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -208,9 +208,9 @@ public String getString(String key, Object arg0, Object arg1) throws MissingReso
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -230,9 +230,9 @@ public String getString(String key, Object arg0, Object arg1, Object arg2) throw
       * <p>Gets a string message from the resource bundle for the given key. The
       * message may contain variables that will be substituted with the given
       * arguments. Variables have the format:</p>
-      * <dir>
+      * <pre>
       * This message has two variables: {0} and {1}
-      * </dir>
+      * </pre>
       * @param key The resource key
       * @param array An array of objects to place in corresponding variables
       * @return The message
@@ -515,7 +515,7 @@ public static String getString(Object caller, String key, Object arg0, Object ar
       * Get a message from resource.properties from the package of the given object.
       * @param caller The calling object, used to get the package name and class loader
       * @param key The resource key
-      * @param array An array of objects to place in corresponding variables
+      * @param args An array of objects to place in corresponding variables
       * @return The formatted message
       */
     public static String getString(Object caller, String key, Object[] args)
@@ -642,7 +642,7 @@ public static String getString(Object caller, Locale locale, String key, Object
       * @param caller The calling object, used to get the package name and class loader
       * @param locale The locale
       * @param key The resource key
-      * @param array An array of objects to place in corresponding variables
+      * @param args An array of objects to place in corresponding variables
       * @return The formatted message
       */
     public static String getString(Object caller, Locale locale, String key, Object[] args)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java b/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java
index 9e20fcb5e..e6f59b95f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/MessageElement.java
@@ -68,8 +68,8 @@
  *
  * Note: it was made Serializable to help users of Apache SOAP who had
  * exploited the serializability of the DOM tree to migrate to Axis.
- * @todo implement the NodeList methods properly, with tests. 
  */
+// TODO: implement the NodeList methods properly, with tests. 
 public class MessageElement extends NodeImpl implements SOAPElement,
         Serializable,
         org.w3c.dom.NodeList,  // ADD Nodelist Interfaces for SAAJ 1.2
@@ -378,7 +378,7 @@ public void setEndIndex(int endIndex)
 
     /**
      * get the attributes
-     * @return attributes. If this equals {@link NullAttributes.singleton} it is null
+     * @return attributes. If this equals {@link NullAttributes#singleton} it is null
      *
      */
     public Attributes getAttributesEx() { return attributes; }
@@ -1283,9 +1283,9 @@ public String toString() {
     /**
      * add a new namespace/prefix mapping
      * @param map new mapping to add
-     * @todo: this code does not verify that the mapping does not exist already; it
-     * is possible to create duplicate mappings.
      */
+    // TODO: this code does not verify that the mapping does not exist already; it
+    // is possible to create duplicate mappings.
     public void addMapping(Mapping map) {
         if (namespaces == null) {
             namespaces = new ArrayList();
@@ -1421,11 +1421,11 @@ public SOAPElement addAttribute(Name attrName, String value)
      * @param uri
      * @return
      * @throws SOAPException for any {@link RuntimeException} caught
-     * @todo for some reason this logic catches all rutime exceptions and
-     * rethrows them as SOAPExceptions. This is unusual behavio, and should
-     * be looked at closely.
      * @see javax.xml.soap.SOAPElement#addNamespaceDeclaration(String, String)
      */
+    // TODO: for some reason this logic catches all rutime exceptions and
+    // rethrows them as SOAPExceptions. This is unusual behavio, and should
+    // be looked at closely.
     public SOAPElement addNamespaceDeclaration(String prefix,
                                                String uri)
         throws SOAPException {
@@ -1741,10 +1741,10 @@ public boolean hasAttributeNS(String namespace, String localName) {
      * @see org.w3c.dom.Element#getAttributeNode(String)
      * @param attrName
      * @return null, always.
-     * @todo Fix this for SAAJ 1.2 Implementation. marked as deprecated to warn people
-     * it is broken
      * @deprecated this is not implemented
      */
+    // TODO: Fix this for SAAJ 1.2 Implementation. marked as deprecated to warn people
+    // it is broken
     public Attr getAttributeNode(String attrName) {
         return null;
     }
@@ -1769,8 +1769,8 @@ public Attr removeAttributeNode(Attr oldAttr) throws DOMException {
      * @return newAttr
      * @throws DOMException
      * @deprecated this is not implemented
-     * @todo implement
      */
+    // TODO: implement
     public Attr setAttributeNode(Attr newAttr) throws DOMException {
         return newAttr;
     }
@@ -1778,11 +1778,11 @@ public Attr setAttributeNode(Attr newAttr) throws DOMException {
     /**
      * set an attribute as a node
      * @see org.w3c.dom.Element#setAttributeNodeNS(org.w3c.dom.Attr)
-     * @todo implement properly.
      * @param newAttr
      * @return null
      * @throws DOMException
      */
+    // TODO: implement properly.
     public Attr setAttributeNodeNS(Attr newAttr) throws DOMException {
         //attributes.
         AttributesImpl attributes = makeAttributesEditable();
@@ -1826,8 +1826,8 @@ public NodeList getElementsByTagName(String tagName) {
      * @param namespaceURI namespace
      * @param localName name
      * @return string value or null if not found
-     * @todo: this could be refactored to use getAttributeValue()
      */
+    // TODO: this could be refactored to use getAttributeValue()
     public String getAttributeNS(String namespaceURI, String localName) {
     	if(namespaceURI == null) {
     		namespaceURI = "";
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java b/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java
index 0e3074edf..439830144 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/NullAttributes.java
@@ -6,7 +6,7 @@
  * Null implementation of the Attributes interface.
  *
  * @author David Megginson
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class NullAttributes implements Attributes {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java b/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
index db918a6ae..090961094 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
@@ -46,10 +46,12 @@
  * deserializing the XML for a method call or return.  In other words for
  * this XML:
  *
- * <methodName>
- *   <param1 xsi:type="xsd:string">Hello!</param1>
- *   <param2>3.14159</param2>
- * </methodName>
+ * <pre>
+ * &lt;methodName&gt;
+ *   &lt;param1 xsi:type="xsd:string"&gt;Hello!&lt;/param1&gt;
+ *   &lt;param2&gt;3.14159&lt;/param2&gt;
+ * &lt;/methodName&gt;
+ * </pre>
  *
  * ...we'll get onStartChild() events for <param1> and <param2>.
  *
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java b/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java
index 85e4b1083..2be9d1154 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/SOAPDocumentImpl.java
@@ -44,9 +44,9 @@
  * SOAPDcoumentImpl implements the Document API for SOAPPART. At the moment, it
  * again delgate the XERCES DOM Implementation Here is my argument on it: I
  * guess that there is 3 way to implement this. - fully implement the DOM API
- * here myself. => This is too much and duplicated work. - extends XERCES
- * Implementation => this makes we are fixed to one Implementation - choose
- * delgate depends on the user's parser preference => This is the practically
+ * here myself. =&gt; This is too much and duplicated work. - extends XERCES
+ * Implementation =&gt; this makes we are fixed to one Implementation - choose
+ * delgate depends on the user's parser preference =&gt; This is the practically
  * best solution I have now
  * 
  * @author Heejune Ahn (cityboy@tmax.co.kr)
@@ -75,7 +75,7 @@ public SOAPDocumentImpl(SOAPPart sp) {
     }
 
     /**
-     * @todo : link with SOAP
+     * TODO: link with SOAP
      * 
      * @return
      */
@@ -100,7 +100,7 @@ public Element getDocumentElement() {
      * based on the tagName, we will make different kind SOAP Elements Instance
      * Is really we can determine the Type by the Tagname???
      * 
-     * @todo : verify this method
+     * TODO: verify this method
      * 
      * @param tagName
      * @return @throws
@@ -147,11 +147,11 @@ public org.w3c.dom.Element createElement(String tagName)
 
     /**
      * 
-     * Creates an empty <code>DocumentFragment</code> object. @todo not
-     * implemented yet
+     * Creates an empty <code>DocumentFragment</code> object.
      * 
      * @return A new <code>DocumentFragment</code>.
      */
+    // TODO: not implemented yet
     public DocumentFragment createDocumentFragment() {
         return delegate.createDocumentFragment();
     }
@@ -219,7 +219,7 @@ public ProcessingInstruction createProcessingInstruction(
     }
 
     /**
-     * @todo: How Axis will maintain the Attribute representation ?
+     * TODO: How Axis will maintain the Attribute representation ?
      */
     public Attr createAttribute(String name) throws DOMException {
         return delegate.createAttribute(name);
@@ -634,7 +634,7 @@ public boolean hasChildNodes() {
     }
 
     /**
-     * @todo: Study it more.... to implement the deep mode correctly.
+     * TODO: Study it more.... to implement the deep mode correctly.
      *  
      */
     public Node cloneNode(boolean deep) {
@@ -642,7 +642,7 @@ public Node cloneNode(boolean deep) {
     }
 
     /**
-     * @todo: is it OK to simply call the superclass?
+     * TODO: is it OK to simply call the superclass?
      *  
      */
     public void normalize() {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java
index 77527692e..7cfc2a598 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AdminServlet.java
@@ -41,9 +41,6 @@
  * 
  * @author Glen Daniels (gdaniels@apache.org)
  * @author Steve Loughran
- * xdoclet tags are not active yet; keep web.xml in sync
- * @web.servlet name="AdminServlet"  display-name="Axis Admin Servlet"  load-on-startup="100"
- * @web.servlet-mapping url-pattern="/servlet/AdminServlet"
  */
 public class AdminServlet extends AxisServletBase {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java
index ad02cfdba..745b5d4a9 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AutoRegisterServlet.java
@@ -41,8 +41,6 @@
 /**
  * Servlet that autoregisters
  * @author Steve Loughran
- * xdoclet tags are not active yet; keep web.xml in sync
- * @web.servlet name="AutoRegisterServlet"  display-name="Axis Autoregister Servlet"  load-on-startup="30"
  */
 public class AutoRegisterServlet extends AxisServletBase {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java
index 4d7a8e82d..f91d67e04 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisHTTPSessionListener.java
@@ -26,7 +26,6 @@
 
 /**
  * A simple listener for Servlet 2.3 session lifecycle events.
- * @web.listener
  * @author Glen Daniels (gdaniels@apache.org)
  */ 
 public class AxisHTTPSessionListener implements HttpSessionListener {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java
index 36db9d035..8e2515485 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServlet.java
@@ -63,11 +63,6 @@
  * To change the location of the services, change url-pattern in web.xml and
  * set parameter axis.servicesPath in server-config.wsdd. For more information see
  * <a href="http://ws.apache.org/axis/java/reference.html">Axis Reference Guide</a>.
- *
- * @web.servlet name="AxisServlet"  display-name="Apache-Axis Servlet"
- * @web.servlet-mapping url-pattern="/servlet/AxisServlet"
- * @web.servlet-mapping url-pattern="*.jws"
- * @web.servlet-mapping url-pattern="/services/*"
   */
 public class AxisServlet extends AxisServletBase {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
index 75f2cfe4a..573a53d57 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/http/AxisServletBase.java
@@ -117,7 +117,7 @@ public void init() throws javax.servlet.ServletException {
      * Destroy method is called when the servlet is going away.  Pass this
      * down to the AxisEngine to let it clean up...  But don't create the
      * engine if it hasn't already been created.
-     * @todo Fixme for multiple servlets.
+     * TODO: Fixme for multiple servlets.
      * This has always been slightly broken
      * (the context's copy stayed around), but now we have extracted it into
      * a superclass it is blatantly broken.
@@ -155,7 +155,7 @@ public AxisServer getEngine() throws AxisFault {
     /**
      * This is a uniform method of initializing AxisServer in a servlet
      * context.
-     * @todo add catch for not being able to cast the context attr to an
+     * TODO: add catch for not being able to cast the context attr to an
      * engine and reinit the engine if so.
      */
     public static AxisServer getEngine(HttpServlet servlet) throws AxisFault
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
index 1e9cec04c..d39d15615 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalSender.java
@@ -34,7 +34,7 @@
 /**
  * This is meant to be used on a SOAP Client to call a SOAP server.
  *
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class LocalSender extends BasicHandler {
     protected static Log log =
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Day.java b/axis-rt-core/src/main/java/org/apache/axis/types/Day.java
index e3db2be37..06fbe5351 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Day.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Day.java
@@ -22,7 +22,7 @@
 /**
  * Implementation of the XML Schema type gDay
  *
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Tom Jordahl (tomj@macromedia.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#gDay">XML Schema 3.2.13</a>
  */
 public class Day implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java b/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
index e726d7edd..817836571 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
@@ -24,7 +24,7 @@
  * Implementation of the XML Schema type duration. Duration supports a minimum
  * fractional second precision of milliseconds.
  *
- * @author Wes Moulder <wes@themindelectric.com>
+ * @author Wes Moulder (wes@themindelectric.com)
  * @author Dominik Kacprzak (dominik@opentoolbox.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#duration">XML Schema 3.2.6</a>
  */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java b/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java
index 1b7800537..0ce90f617 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Entities.java
@@ -20,7 +20,7 @@
 /**
  * Custom class for supporting XSD data type Entities
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#ENTITIES">XML Schema 3.3.12 ENTITIES</a>
  */
 public class Entities extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java b/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java
index 07e1746db..0bb4f854f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Entity.java
@@ -20,7 +20,7 @@
 /**
  * Custom class for supporting XSD data type Entity
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#ENTITY">XML Schema 3.3.11 ENTITY</a>
  */
 public class Entity extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java b/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java
index 55aef0392..39ea253b6 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/HexBinary.java
@@ -22,7 +22,7 @@
 /**
  * Custom class for supporting primitive XSD data type hexBinary.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class HexBinary extends Object implements java.io.Serializable{
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java b/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java
index e7b9ab6a8..de26b503e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/IDRef.java
@@ -20,7 +20,7 @@
 /**
  * Custom class for supporting XSD data type IDRef
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#IDREF">XML Schema 3.3.10 IDREFS</a>
  */
 public class IDRef extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java b/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java
index 557296757..c483e43d4 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/IDRefs.java
@@ -23,7 +23,7 @@
 /**
  * Custom class for supporting XSD data type IDRefs
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#IDREFS">XML Schema 3.3.10 IDREFS</a>
  */
 public class IDRefs extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Id.java b/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
index 7bfb1ddcc..2b8f3508b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
@@ -21,7 +21,7 @@
  * Custom class for supporting XSD data type ID
  * The base type of Id is NCName.
  *
- * @author Eddie Pick <eddie@pick.eu.org>
+ * @author Eddie Pick (eddie@pick.eu.org)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#ID">XML Schema 3.3.8</a>
  */
 public class Id extends NCName {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Language.java b/axis-rt-core/src/main/java/org/apache/axis/types/Language.java
index b24a1b630..fb0e0339a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Language.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Language.java
@@ -26,7 +26,7 @@
  * as defined in the language identification section of [XML 1.0 (Second Edition)]. 
  * The base type of language is token. 
  *
- * @author Eddie Pick <eddie@pick.eu.org>
+ * @author Eddie Pick (eddie@pick.eu.org)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#language">XML Schema 3.3.3</a>
  */
 public class Language extends Token {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Month.java b/axis-rt-core/src/main/java/org/apache/axis/types/Month.java
index b1125d07f..a73d7fc18 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Month.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Month.java
@@ -22,7 +22,7 @@
 /**
  * Implementation of the XML Schema type gMonth
  *
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Tom Jordahl (tomj@macromedia.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#gMonth">XML Schema 3.2.14</a>
  */
 public class Month implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java b/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java
index c23fc7dc5..c3ed7468e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/MonthDay.java
@@ -22,7 +22,7 @@
 /**
  * Implementation of the XML Schema type gMonthDay
  *
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Tom Jordahl (tomj@macromedia.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#gMonthDay">XML Schema 3.2.12</a>
  */
 public class MonthDay implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java b/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java
index d011c947f..cea8b9359 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NCName.java
@@ -24,7 +24,7 @@
  * NCName represents XML "non-colonized" Names
  * The base type of NCName is Name.
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#NCName">XML Schema 3.3.7</a>
  * @see <A href="http://www.w3.org/TR/1999/REC-xml-names-19990114/#NT-NCName">NCName Production</a>
  */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java b/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java
index ed9ffd252..f4cffd8c2 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NMToken.java
@@ -26,7 +26,7 @@
  * is the set of tokens that match the Nmtoken production
  * in [XML 1.0 (Second Edition)].
  * The base type of NMTOKEN is token.
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#nmtoken">XML Schema 3.3.4</a>
  */
 public class NMToken extends Token {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java b/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java
index 14f293255..7cb5b7f7d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NMTokens.java
@@ -23,7 +23,7 @@
 /**
  * Custom class for supporting XSD data type NMTokens
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class NMTokens extends NCName {
     private NMToken[] tokens;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Name.java b/axis-rt-core/src/main/java/org/apache/axis/types/Name.java
index ed80c81cf..4fc1d6fb2 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Name.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Name.java
@@ -25,7 +25,7 @@
  * the set of all strings which match the Name production
  * of [XML 1.0 (Second Edition)].
  * The base type of Name is token.
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#Name">XML Schema 3.3.6</a>
  */
 public class Name extends Token {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java
index a09eb1550..6ff352f79 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NegativeInteger.java
@@ -30,7 +30,7 @@
  * negativeInteger is the infinite set {...,-2,-1}. 
  * The base type of negativeInteger is nonPositiveInteger. 
  *
- * @author Chris Haddad <haddadc@apache.org>
+ * @author Chris Haddad (haddadc@apache.org)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#negativeInteger">XML Schema 3.3.15</a>
  */
 public class NegativeInteger extends NonPositiveInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java
index 691e602fb..56087c87f 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NonNegativeInteger.java
@@ -24,7 +24,7 @@
 /**
  * Custom class for supporting primitive XSD data type nonNegativeInteger
  *
- * @author Russell Butek <butek@us.ibm.com>
+ * @author Russell Butek (butek@us.ibm.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">XML Schema 3.3.20</a>
  */
 public class NonNegativeInteger extends BigInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java
index 069e7ee36..d1bb29343 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NonPositiveInteger.java
@@ -29,7 +29,7 @@
  * concept of the non-positive integers. The value space of 
  * nonPositiveInteger is the infinite set {...,-2,-1,0}. 
  *
- * @author Chris Haddad <haddadc@apache.org
+ * @author Chris Haddad (haddadc@apache.org)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#nonPositiveInteger">XML Schema 3.3.14</a>
  */
 public class NonPositiveInteger extends BigInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java b/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
index 6831a1e81..dda08a971 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
@@ -22,7 +22,7 @@
  * normalizedString represents white space normalized strings.
  * The base type of normalizedString is string.
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#normalizedString">XML Schema Part 2: Datatypes 3.3.1</a>
  */
 public class NormalizedString extends Object implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java b/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java
index 256d079a8..53c531d35 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Notation.java
@@ -24,7 +24,7 @@
 /**
  * Custom class for supporting XSD data type NOTATION.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-1/#element-notation">XML Schema Part 1: 3.12 Notation Declarations</a>
  */
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java b/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java
index e63d77375..dc98b7f2e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/PositiveInteger.java
@@ -28,7 +28,7 @@
  * This results in the standard mathematical concept of the positive integer numbers. The value space
  * of positiveInteger is the infinite set {1,2,...}. 
  *
- * @author Chris Haddad <haddadc@apache.org>
+ * @author Chris Haddad (haddadc@apache.org)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#positiveInteger">XML Schema 3.3.25</a>
  */
 public class PositiveInteger extends NonNegativeInteger {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java b/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java
index 69dcd7cc7..7a20aa2c6 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Schema.java
@@ -19,7 +19,7 @@
 /**
  * Custom class for supporting XSD schema
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class Schema implements java.io.Serializable {
     private org.apache.axis.message.MessageElement[] _any;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Token.java b/axis-rt-core/src/main/java/org/apache/axis/types/Token.java
index 821bf8a5a..d530e3030 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Token.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Token.java
@@ -22,7 +22,7 @@
  * token represents tokenized strings.
  * The base type of token is normalizedString.
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#token">XML Schema 3.3.2</a>
  */
 public class Token extends NormalizedString {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
index d42361cf6..481ddce08 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
@@ -21,7 +21,7 @@
 /**
  * Custom class for supporting primitive XSD data type UnsignedByte
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#unsignedByte">XML Schema 3.3.24</a>
  */
 public class UnsignedByte extends UnsignedShort {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java
index 58bb908d0..9b53d3992 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedInt.java
@@ -22,7 +22,7 @@
 /**
  * Custom class for supporting primitive XSD data type UnsignedInt
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#unsignedInt">XML Schema 3.3.22</a>
  */
 public class UnsignedInt extends java.lang.Number implements java.lang.Comparable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java
index a545ce5c4..4332d0644 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedLong.java
@@ -22,7 +22,7 @@
 /**
  * Custom class for supporting primitive XSD data type UnsignedLong
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#unsignedLong">XML Schema 3.3.21</a>
  */
 public class UnsignedLong extends java.lang.Number
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java
index 3939be065..9da91264c 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedShort.java
@@ -20,7 +20,7 @@
 /**
  * Custom class for supporting primitive XSD data type UnsignedShort
  *
- * @author Chris Haddad <chaddad@cobia.net>
+ * @author Chris Haddad (chaddad@cobia.net)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#unsignedShort">XML Schema 3.3.23</a>
  */
 public class UnsignedShort extends UnsignedInt {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Year.java b/axis-rt-core/src/main/java/org/apache/axis/types/Year.java
index 70aae5df0..94669a094 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Year.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Year.java
@@ -22,7 +22,7 @@
 /**
  * Implementation of the XML Schema type gYear
  *
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Tom Jordahl (tomj@macromedia.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#gYear">XML Schema 3.2.11</a>
  */
 public class Year implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java b/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java
index 2e7769857..e76db1e82 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/YearMonth.java
@@ -22,7 +22,7 @@
 /**
  * Implementation of the XML Schema type gYearMonth
  *
- * @author Tom Jordahl <tomj@macromedia.com>
+ * @author Tom Jordahl (tomj@macromedia.com)
  * @see <a href="http://www.w3.org/TR/xmlschema-2/#gYearMonth">XML Schema 3.2.10</a>
  */
 public class YearMonth implements java.io.Serializable {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java b/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java
index f7edf1d04..8efd8609a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/BeanPropertyDescriptor.java
@@ -38,7 +38,7 @@
  * concerned, mostly involving the fact that we manage the arrays here
  * rather than relying on the value type class to do it itself.
  *
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  * @author Glen Daniels (gdaniels@apache.org)
  **/
 public class BeanPropertyDescriptor
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java b/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java
index d80deac16..3901a4359 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/ByteArrayOutputStream.java
@@ -25,14 +25,14 @@
  * This class implements an output stream in which the data is
  * written into a byte array. The buffer automatically grows as data
  * is written to it.
- * <p/>
+ * <p>
  * The data can be retrieved using <code>toByteArray()</code> and
  * <code>toString()</code>.
- * <p/>
+ * <p>
  * Closing a <tt>ByteArrayOutputStream</tt> has no effect. The methods in
  * this class can be called after the stream has been closed without
  * generating an <tt>IOException</tt>.
- * <p/>
+ * <p>
  * This is an alternative implementation of the java.io.ByteArrayOutputStream
  * class. The original implementation only allocates 32 bytes at the beginning.
  * As this class is designed for heavy duty it starts at 1024 bytes. In contrast
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java
index 411b1f9aa..84075d7bc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/IOUtils.java
@@ -44,7 +44,7 @@ public static int readFully(InputStream in, byte[] b)
      * Same as the normal <tt>in.read(b, off, len)</tt>, but tries to ensure that
      * the entire len number of bytes is read.
      * <p>
-     * @returns the number of bytes read, or -1 if the end of file is
+     * @return the number of bytes read, or -1 if the end of file is
      *  reached before any bytes are read
      */
     public static int readFully(InputStream in, byte[] b, int off, int len)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java b/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java
index 50099c7fd..264bbafda 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/IdentityHashMap.java
@@ -12,7 +12,7 @@
 
 /**
  * IdentityHashMap similar to JDK1.4's java.util.IdentityHashMap
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
  */
 public class IdentityHashMap extends HashMap
 {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java
index 63803613e..7375d9eb3 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/JavaUtils.java
@@ -225,8 +225,8 @@ public interface ConvertCache {
     /** Utility function to convert an Object to some desired Class.
      *
      * Right now this works for:
-     *     arrays <-> Lists,
-     *     Holders <-> held values
+     *     arrays &lt;-&gt; Lists,
+     *     Holders &lt;-&gt; held values
      * @param arg the array to convert
      * @param destClass the actual class we want
      */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java b/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
index 8dcfc6ac6..177566d83 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
@@ -55,8 +55,6 @@ public class Messages {
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @return The formatted message
       */
@@ -68,8 +66,6 @@ public static String getMessage(String key)
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @return The formatted message
@@ -82,8 +78,6 @@ public static String getMessage(String key, String arg0)
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -97,8 +91,6 @@ public static String getMessage(String key, String arg0, String arg1)
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -113,8 +105,6 @@ public static String getMessage(String key, String arg0, String arg1, String arg
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -130,8 +120,6 @@ public static String getMessage(String key, String arg0, String arg1, String arg
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @param arg0 The argument to place in variable {0}
       * @param arg1 The argument to place in variable {1}
@@ -148,8 +136,6 @@ public static String getMessage(String key, String arg0, String arg1, String arg
 
     /**
       * Get a message from resource.properties from the package of the given object.
-      * @param caller The calling object, used to get the package name and class loader
-      * @param locale The locale
       * @param key The resource key
       * @param array An array of objects to place in corresponding variables
       * @return The formatted message
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java b/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java
index 503af660a..6fcc6829e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/NSStack.java
@@ -200,11 +200,13 @@ public void add(String namespaceURI, String prefix) {
      * up the stack IF the prefix which was used has been repeated further
      * down the stack.  I.e.:
      * 
-     * <pre:outer xmlns:pre="namespace">
-     *   <pre:inner xmlns:pre="otherNamespace">
+     * <pre>
+     * &lt;pre:outer xmlns:pre="namespace"&gt;
+     *   &lt;pre:inner xmlns:pre="otherNamespace"&gt;
      *      *here's where we're looking*
-     *   </pre:inner>
-     * </pre:outer>
+     *   &lt;/pre:inner&gt;
+     * &lt;/pre:outer&gt;
+     * </pre>
      * 
      * If we look for a prefix for "namespace" at the indicated spot, we won't
      * find one because "pre" is actually mapped to "otherNamespace"
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
index 7fa7c838a..e5fc76a62 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/StringUtils.java
@@ -387,7 +387,7 @@ public static void escapeNumericChar(Writer out, String str)
      * <p>Unescapes numeric character referencs found in the <code>String</code>.</p>
      *
      * <p>For example, it will return a unicode string which means the specified numeric
-     *    character references looks like "&#x3088;&#x3046;&#x3053;&#x305d;".</p>
+     *    character references looks like "&amp;#x3088;&amp;#x3046;&amp;#x3053;&amp;#x305d;".</p>
      * 
      * @param str  the <code>String</code> to unescape, may be null
      * @return a new unescaped <code>String</code>, <code>null</code> if null string input
@@ -412,7 +412,7 @@ public static String unescapeNumericChar(String str) {
      * <code>Writer</code>.</p>
      *
      * <p>For example, it will return a unicode string which means the specified numeric
-     *    character references looks like "&#x3088;&#x3046;&#x3053;&#x305d;".</p>
+     *    character references looks like "&amp;#x3088;&amp;#x3046;&amp;#x3053;&amp;#x305d;".</p>
      * 
      * <p>A <code>null</code> string input has no effect.</p>
      * 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
index 4886fdcc1..2f0f0a938 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/WSDLUtils.java
@@ -31,7 +31,7 @@ public class WSDLUtils {
         LogFactory.getLog(WSDLUtils.class.getName());
 
     /**
-     * Return the endpoint address from a <soap:address location="..."> tag
+     * Return the endpoint address from a &lt;soap:address location="..."&gt; tag
      */
     public static String getAddressFromPort(Port p) {
         // Get the endpoint for a port
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java
index 8c20978e3..a3c271373 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaClass.java
@@ -23,7 +23,7 @@
 /**
  * A simple cache of previously loaded classes, and their methods.
  *
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class JavaClass implements Serializable {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java
index cf99fbbd4..f2c2a5864 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/JavaMethod.java
@@ -22,7 +22,7 @@
 /**
  * A simple cache of previously loaded methods
  *
- * @author Sam Ruby <rubys@us.ibm.com>
+ * @author Sam Ruby (rubys@us.ibm.com)
  */
 public class JavaMethod {
 
@@ -56,7 +56,6 @@ public JavaMethod(Class jc, String name) {
     /**
      * Lookup a method based on name.  This method returns an array just in
      * case there is more than one.
-     * @param name name of method
      */
     public Method[] getMethod() {
         return methods;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java
index dca17f0b7..7eb25e445 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/cache/MethodCache.java
@@ -28,8 +28,8 @@
  * cache for performance reasons.
  * This class is a singleton - so use getInstance to get an instance of it.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
- * @author Sebastian Dietrich <sebastian.dietrich@anecon.com>
+ * @author Davanum Srinivas (dims@yahoo.com)
+ * @author Sebastian Dietrich (sebastian.dietrich@anecon.com)
  */
 public class MethodCache {
     /**
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java
index 27ca71026..8a2db3ffc 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Generator.java
@@ -20,7 +20,7 @@
 /**
  * This is the interface for all writers.  All writers, very simply, must
  * support a write method.
- * <p/>
+ * <p>
  * Writer and WriterFactory are part of the Writer framework.  Folks who want
  * to use the emitter to generate stuff from WSDL should do 3 things:
  * 1.  Write implementations of the Writer interface, one each for PortType,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
index babe1df06..0a6e15431 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/gen/Parser.java
@@ -308,7 +308,7 @@ public String getWSDLURI() {
 
     /**
      * Parse a WSDL at a given URL.
-     * <p/>
+     * <p>
      * This method will time out after the number of milliseconds specified
      * by our timeoutms member.
      *
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
index 3e88bd50d..7b20acaab 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
@@ -27,7 +27,7 @@
 public class BackslashUtil implements java.io.Serializable {
 
    /** 
-     * @param QName[local] that may contain unescaped backslashes
+     * @param suspectQName QName[local] that may contain unescaped backslashes
      * @return QName[local] w/ no backslashes
      */
 	
@@ -40,7 +40,7 @@ public static QName getQNameWithBackslashlessLocal(QName suspectQName) {
 	}
 
    /** 
-     * @param QName[local] which may contain unescaped backslashes
+     * @param suspectQName QName[local] which may contain unescaped backslashes
      * @return QName[local] w/ escaped backslashes
      */
 	
diff --git a/pom.xml b/pom.xml
index 798433327..43dcf931a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -184,6 +184,7 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.0.0</version>
                     <configuration>
                         <source>1.4</source>
                     </configuration>

From f7245070618c048d7c052b162e666e91c00d00bc Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 18 Feb 2018 17:55:47 +0000
Subject: [PATCH 073/133] Fix Javadoc problems.

---
 .../org/apache/axis/client/AdminClient.java   |  4 +-
 .../org/apache/axis/client/AxisClient.java    |  2 +-
 .../java/org/apache/axis/client/Call.java     |  6 +--
 .../DefaultHTTPTransportClientProperties.java |  2 +-
 .../components/net/SocketFactoryFactory.java  |  2 +-
 .../axis/configuration/XMLStringProvider.java | 14 +++---
 .../axis/deployment/wsdd/WSDDDeployment.java  |  4 +-
 .../axis/deployment/wsdd/WSDDOperation.java   |  8 ++--
 .../deployment/wsdd/WSDDTargetedChain.java    |  1 -
 .../axis/description/JavaServiceDesc.java     |  2 +-
 .../axis/encoding/DeserializationContext.java |  6 +--
 .../axis/encoding/DeserializerFactory.java    |  4 +-
 .../axis/encoding/SerializationContext.java   | 16 +++----
 .../org/apache/axis/encoding/Serializer.java  |  4 +-
 .../axis/encoding/SerializerFactory.java      |  4 +-
 .../encoding/TypeMappingRegistryImpl.java     | 34 ++++++--------
 .../axis/encoding/ser/MapDeserializer.java    |  6 +--
 .../encoding/ser/SimpleListSerializer.java    |  2 +-
 .../org/apache/axis/message/RPCHandler.java   |  2 +-
 .../axis/providers/java/EJBProvider.java      |  3 +-
 .../servlet/ServletSecurityProvider.java      |  2 -
 .../simple/SimpleSecurityProvider.java        |  2 -
 .../axis/transport/local/LocalTransport.java  |  4 +-
 .../java/org/apache/axis/types/Duration.java  |  2 +-
 .../main/java/org/apache/axis/types/Id.java   |  2 +-
 .../apache/axis/types/NormalizedString.java   |  2 +-
 .../main/java/org/apache/axis/types/URI.java  |  4 +-
 .../org/apache/axis/types/UnsignedByte.java   |  2 +-
 .../java/org/apache/axis/utils/Messages.java  |  2 +-
 .../org/apache/axis/wsdl/fromJava/Types.java  |  8 ++--
 .../axis/wsdl/symbolTable/BackslashUtil.java  |  2 +-
 .../axis/wsdl/symbolTable/BindingEntry.java   |  2 +-
 .../wsdl/symbolTable/CollectionElement.java   |  4 +-
 .../axis/wsdl/symbolTable/CollectionType.java |  4 +-
 .../axis/wsdl/symbolTable/ElementDecl.java    |  2 +-
 .../axis/wsdl/symbolTable/FaultInfo.java      |  8 ++--
 .../axis/wsdl/symbolTable/SchemaUtils.java    | 46 +++++++++----------
 .../axis/wsdl/symbolTable/ServiceEntry.java   |  5 --
 .../axis/wsdl/symbolTable/SymbolTable.java    | 22 ++++-----
 .../axis/wsdl/symbolTable/TypeEntry.java      | 28 +++++------
 .../apache/axis/wsdl/symbolTable/Utils.java   | 10 ++--
 41 files changed, 136 insertions(+), 153 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java b/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
index 319d1459b..39faaaace 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/AdminClient.java
@@ -107,7 +107,7 @@ private static String getUsageInfo()
     /**
      * Construct an admin client w/o a logger.
      * If the client cannot create a call object, then it does not throw an exception.
-     * Instead it prints a message to {@link System.err}.
+     * Instead it prints a message to {@link System#err}.
      * This is for 'historical reasons'
      */
     public AdminClient()
@@ -152,7 +152,7 @@ private void initAdminClient() throws ServiceException {
 
 
     /**
-     * External access to our <code>Call</code< object.
+     * External access to our <code>Call</code> object.
      * This will be null if the non-excepting constructor was used
      * and the construction failed.
      * @return the <code>Call</code> object this instance uses
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java b/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java
index 1d64c9ee5..199fd8f76 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/AxisClient.java
@@ -35,7 +35,7 @@
 
 /**
  * Provides the equivalent of an "Axis engine" on the client side.
- * Subclasses hardcode initialization & setup logic for particular
+ * Subclasses hardcode initialization &amp; setup logic for particular
  * client-side transports.
  *
  * @author Rob Jellinghaus (robj@unrealities.com)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
index 9a0ce97fa..a71362ace 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/Call.java
@@ -2340,7 +2340,7 @@ public void registerTypeMapping(Class javaType,
      *             invoked method.  If any of these objects are RPCParams,
      *             Axis will use the embedded name of the RPCParam as the
      *             name of the parameter.  Otherwise, we will serialize
-     *             each argument as an XML element called "arg<n>".
+     *             each argument as an XML element called "arg&lt;n&gt;".
      * @return a deserialized Java Object containing the return value
      * @exception AxisFault
      */
@@ -2382,7 +2382,7 @@ public Object invoke(String namespace, String method, Object[] args)
      *             invoked method.  If any of these objects are RPCParams,
      *             Axis will use the embedded name of the RPCParam as the
      *             name of the parameter.  Otherwise, we will serialize
-     *             each argument as an XML element called "arg<n>".
+     *             each argument as an XML element called "arg&lt;n&gt;".
      * @return a deserialized Java Object containing the return value
      * @exception AxisFault
      */
@@ -2893,7 +2893,7 @@ public Service getService()
      *
      * Set the service so that it defers missing property gets to the
      * Call.  So when client-side Handlers get at the MessageContext,
-     * the property scoping will be MC -> SOAPService -> Call
+     * the property scoping will be MC -&gt; SOAPService -&gt; Call
      */
     public void setSOAPService(SOAPService service)
     {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
index 45310bc1c..44784bd1b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
@@ -58,7 +58,7 @@ public String getNonProxyHosts() {
     }
 
     /**
-     * @see org.apache.axis.components.net.TransportClientProperties#getPort()
+     * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
      */
     public String getProxyPort() {
         if (proxyPort == null) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java
index 9de2796fe..0d50f7347 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/SocketFactoryFactory.java
@@ -56,7 +56,7 @@ public class SocketFactoryFactory {
     /**
      * Returns a copy of the environment's default socket factory.
      * 
-     * @param protocol Today this only supports "http" & "https".
+     * @param protocol Today this only supports "http" &amp; "https".
      * @param attributes
      *
      * @return
diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java
index 6c0a33c91..b30aa4b29 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/configuration/XMLStringProvider.java
@@ -28,14 +28,14 @@
  * This provider does not write configuration to persistent storage.
  *
  * Example of usage:
- *    new XMLStringProvider("<engineConfig><handlers><handler name=" +
+ *    new XMLStringProvider("&lt;engineConfig&gt;&lt;handlers&gt;&lt;handler name=" +
  *        "\"MsgDispatcher\" class=\"org.apache.axis.providers.java" +
- *        ".MsgProvider\"/></handlers><services><service name=\"Adm" +
- *        "inService\" pivot=\"MsgDispatcher\"><option name=\"class" +
- *        "Name\" value=\"org.apache.axis.utils.Admin\"/><option na" +
- *        "me=\"allowedMethods\" value=\"AdminService\"/><option na" +
- *        "me=\"enableRemoteAdmin\" value=\"false\"/></service></se" +
- *        "rvices></engineConfig>");
+ *        ".MsgProvider\"/&gt;&lt;/handlers&gt;&lt;services&gt;&lt;service name=\"Adm" +
+ *        "inService\" pivot=\"MsgDispatcher\"&gt;&lt;option name=\"class" +
+ *        "Name\" value=\"org.apache.axis.utils.Admin\"/&gt;&lt;option na" +
+ *        "me=\"allowedMethods\" value=\"AdminService\"/&gt;&lt;option na" +
+ *        "me=\"enableRemoteAdmin\" value=\"false\"/&gt;&lt;/service&gt;&lt;/se" +
+ *        "rvices&gt;&lt;/engineConfig&gt;");
  *
  * @author Glen Daniels (gdaniels@apache.org)
  */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDDeployment.java b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDDeployment.java
index 7dbc97cb4..f19612056 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDDeployment.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDDeployment.java
@@ -57,7 +57,7 @@ public class WSDDDeployment
     private HashMap typeMappings = new HashMap();
     private WSDDGlobalConfiguration globalConfig = null;
     /**
-     * Mapping of namespaces -> services
+     * Mapping of namespaces -&gt; services
      */
             private HashMap namespaceToServices = new HashMap();
     private AxisEngine engine;
@@ -476,7 +476,7 @@ public void registerNamespaceForService(String namespace,
     }
 
     /**
-     * Remove a namespace -> WSDDService mapping.
+     * Remove a namespace -&gt; WSDDService mapping.
      *
      * @param namespace the namespace URI to unmap
      */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDOperation.java b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDOperation.java
index be39d9635..db6b774d7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDOperation.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDOperation.java
@@ -35,9 +35,9 @@
  * Parse the WSDD operation elements.
  * 
  * Example: 
- * <operation name="name" qname="element QName" returnQName="QName">
- *   <parameter ... />
- * </operation>
+ * &lt;operation name="name" qname="element QName" returnQName="QName"&gt;
+ *   &lt;parameter ... /&gt;
+ * &lt;/operation&gt;
  * 
  */
 public class WSDDOperation extends WSDDElement
@@ -55,7 +55,7 @@ public WSDDOperation(OperationDesc desc) {
     /**
      * Constructor from XML
      *
-     * @param e (Element) the <operation> element
+     * @param e (Element) the &lt;operation&gt; element
      * @param parent our ServiceDesc.
      * @throws WSDDException XXX
      */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
index 273006178..30777300d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDTargetedChain.java
@@ -136,7 +136,6 @@ public void setPivotQName(QName pivotQName) {
 
     /**
      *
-     * @param pivot XXX
      * @param registry XXX
      * @return XXX
      * @throws ConfigurationException XXX
diff --git a/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java b/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
index efc668ef8..2d03bc9ee 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/description/JavaServiceDesc.java
@@ -141,7 +141,7 @@ public class JavaServiceDesc implements ServiceDesc {
     /** Method names for which we have completed any introspection necessary */
     private ArrayList completedNames = new ArrayList();
 
-    /** Our typemapping for resolving Java<->XML type issues */
+    /** Our typemapping for resolving Java&lt;-&gt;XML type issues */
     private TypeMapping tm = null;
     private TypeMappingRegistry tmr = null;
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java
index dc7b9af45..dccf3dba7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializationContext.java
@@ -346,7 +346,7 @@ public String getNamespaceURI(String prefix)
     }
 
     /**
-     * Construct a QName from a string of the form <prefix>:<localName>
+     * Construct a QName from a string of the form &lt;prefix&gt;:&lt;localName&gt;
      * @param qNameStr is the prefixed name from the xml text
      * @return QName
      */
@@ -670,8 +670,8 @@ public void addObjectById(String id, Object obj)
     }
 
     /**
-     * During deserialization, an element with an href=#id<int>
-     * may be encountered before the element defining id=id<int> is
+     * During deserialization, an element with an href=#id&lt;int&gt;
+     * may be encountered before the element defining id=id&lt;int&gt; is
      * read.  In these cases, the getObjectByRef method above will
      * return null.  The deserializer is placed in a table keyed
      * by href (a fixup table). After the element id is processed,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java
index dbfd6fdf5..f2c619515 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/DeserializerFactory.java
@@ -24,8 +24,8 @@
  * of the following methods:
  *
  * public static create(Class javaType, QName xmlType)
- * public <constructor>(Class javaType, QName xmlType)
- * public <constructor>()
+ * public &lt;constructor&gt;(Class javaType, QName xmlType)
+ * public &lt;constructor&gt;()
  *
  * The deployment code will attempt to invoke these methods in the above order.
  * The xmlType, javaType arguments are filled in with the values supplied during the
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
index 9c39adda3..0cf0ac907 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
@@ -79,7 +79,7 @@
  * and element stacks.
  *
  * @author Glen Daniels (gdaniels@apache.org)
- * @author Rich Scheuerle <scheu@us.ibm.com>
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class SerializationContext implements javax.xml.rpc.encoding.SerializationContext
 {
@@ -406,7 +406,7 @@ public TypeMappingRegistry getTypeMappingRegistry() {
      * return a valid prefix - if the given URI is already mapped in this
      * serialization, we return the previous prefix.  If it is not mapped,
      * we will add a new mapping and return a generated prefix of the form
-     * "ns<num>".
+     * "ns&lt;num&gt;".
      * @param uri is the namespace uri
      * @return prefix
      */
@@ -419,7 +419,7 @@ public String getPrefixForURI(String uri)
      * Get a prefix for the given namespace URI.  If one has already been
      * defined in this serialization, use that.  Otherwise, map the passed
      * default prefix to the URI, and return that.  If a null default prefix
-     * is passed, use one of the form "ns<num>"
+     * is passed, use one of the form "ns&lt;num&gt;"
      */
     public String getPrefixForURI(String uri, String defaultPrefix)
     {
@@ -430,7 +430,7 @@ public String getPrefixForURI(String uri, String defaultPrefix)
      * Get a prefix for the given namespace URI.  If one has already been
      * defined in this serialization, use that.  Otherwise, map the passed
      * default prefix to the URI, and return that.  If a null default prefix
-     * is passed, use one of the form "ns<num>"
+     * is passed, use one of the form "ns&lt;num&gt;"
      */
     public String getPrefixForURI(String uri, String defaultPrefix, boolean attribute)
     {
@@ -522,7 +522,7 @@ public boolean isEncoded() {
     }
 
     /**
-     * Convert QName to a string of the form <prefix>:<localpart>
+     * Convert QName to a string of the form &lt;prefix&gt;:&lt;localpart&gt;
      * @param qName
      * @return prefixed qname representation for serialization.
      */
@@ -571,7 +571,7 @@ public String qName2String(QName qName)
     }
 
     /**
-     * Convert attribute QName to a string of the form <prefix>:<localpart>
+     * Convert attribute QName to a string of the form &lt;prefix&gt;:&lt;localpart&gt;
      * There are slightly different rules for attributes:
      *  - There is no default namespace
      *  - any attribute in a namespace must have a prefix
@@ -819,7 +819,7 @@ public void serialize(QName elemQName,
      * @param attributes are additional attributes
      * @param value is the object to serialize
      * @param xmlType is the qname of the type or null.
-     * @param javaType is the java type of the value
+     * @param javaClass is the java type of the value
      * @param sendNull determines whether to send null values.
      * @param sendType determines whether to set xsi:type attribute.
      */
@@ -1276,7 +1276,7 @@ public void writeString(String string)
 
     /**
      * Convenience operation to write out (to Writer) the String
-     * properly encoded with xml entities (like &amp)
+     * properly encoded with xml entities (like &amp;amp;)
      * @param string is the String to write.
      */
     public void writeSafeString(String string)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java
index 9bbc961ab..53b6d9541 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/Serializer.java
@@ -29,8 +29,8 @@
  * An Axis compliant Serializer must provide one or more
  * of the following methods:
  *
- * public <constructor>(Class javaType, QName xmlType)
- * public <constructor>()
+ * public &lt;constructor&gt;(Class javaType, QName xmlType)
+ * public &lt;constructor&gt;()
  *
  * This will allow for construction of generic factories that introspect the class
  * to determine how to construct a deserializer.
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java
index f49560d9c..590e2f498 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializerFactory.java
@@ -24,8 +24,8 @@
  * of the following methods:
  *
  * public static create(Class javaType, QName xmlType)
- * public <constructor>(Class javaType, QName xmlType)
- * public <constructor>()
+ * public &lt;constructor&gt;(Class javaType, QName xmlType)
+ * public &lt;constructor&gt;()
  *
  * The deployment code will attempt to invoke these methods in the above order.
  * The xmlType, javaType arguments are filled in with the values supplied during the
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java
index 37e99a218..0d44d90c0 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/TypeMappingRegistryImpl.java
@@ -22,44 +22,39 @@
 import java.util.HashMap;
 
 /**
- * <p>
  * The TypeMappingRegistry keeps track of the individual TypeMappings.
- * </p>
  * <p>
  * The TypeMappingRegistry for axis contains a default type mapping
  * that is set for either SOAP 1.1 or SOAP 1.2
  * The default type mapping is a singleton used for the entire
  * runtime and should not have anything new registered in it.
- * </p>
  * <p>
  * Instead the new TypeMappings for the deploy and service are
  * made in a separate TypeMapping which is identified by
  * the soap encoding.  These new TypeMappings delegate back to 
  * the default type mapping when information is not found.
- * </p>
  * <p>
  * So logically we have:
  * <pre>
  *         TMR
  *         | |  
- *         | +---------------> DefaultTM 
+ *         | +---------------&gt; DefaultTM 
  *         |                      ^
  *         |                      |
- *         +----> TM --delegate---+
+ *         +----&gt; TM --delegate---+
  * </pre>
  *
  * But in the implementation, the TMR references
  * "delegate" TypeMappings (TM') which then reference the actual TM's
- * </p>
  * <p>
  * So the picture is really:
  * <pre>
  *         TMR
  *         | |  
- *         | +-----------TM'------> DefaultTM 
+ *         | +-----------TM'------&gt; DefaultTM 
  *         |              ^
  *         |              |
- *         +-TM'-> TM ----+
+ *         +-TM'-&gt; TM ----+
  * </pre>
  *
  * This extra indirection is necessary because the user may want to 
@@ -71,8 +66,8 @@
  *         | |  
  *         | +-----------TM'--+     DefaultTM 
  *         |              ^   |
- *         |              |   +---> New User Defined Default TM
- *         +-TM'-> TM ----+
+ *         |              |   +---&gt; New User Defined Default TM
+ *         +-TM'-&gt; TM ----+
  * </pre>
  *
  * The other reason that it is necessary is when a deploy
@@ -82,26 +77,26 @@
  * <pre>
  *       Deploy TMR
  *         | |  
- *         | +-----------TM'------> DefaultTM 
+ *         | +-----------TM'------&gt; DefaultTM 
  *         |              ^
  *         |              |
- *         +-TM'-> TM ----+
+ *         +-TM'-&gt; TM ----+
  *
  *       Service TMR
  *         | |  
- *         | +-----------TM'------> DefaultTM 
+ *         | +-----------TM'------&gt; DefaultTM 
  *         |              ^
  *         |              |
- *         +-TM'-> TM ----+
+ *         +-TM'-&gt; TM ----+
  *
  *    ServiceTMR.delegate(DeployTMR)
  *
  *       Deploy TMR
  *         | |  
- *         | +------------TM'------> DefaultTM 
+ *         | +------------TM'------&gt; DefaultTM 
  *         |              ^ ^ 
  *         |              | |
- *         +-TM'-> TM ----+ |
+ *         +-TM'-&gt; TM ----+ |
  *           ^              |
  *   +-------+              |
  *   |                      |
@@ -110,7 +105,7 @@
  *   |     | +----------TM'-+               
  *   |     |              
  *   |     |              
- *   |     +-TM'-> TM +
+ *   |     +-TM'-&gt; TM +
  *   |                |
  *   +----------------+
  * </pre>
@@ -118,12 +113,11 @@
  * So now the service uses the DefaultTM of the Deploy TMR, and
  * the Service TM properly delegates to the deploy's TM.  And
  * if either the deploy defaultTM or TMs change, the links are not broken.
- * </p>
  * 
  * @author James Snell (jasnell@us.ibm.com)
  * @author Sam Ruby (rubys@us.ibm.com)
  * Re-written for JAX-RPC Compliance by
- * @author Rich Scheuerle (scheu@us.ibm.com
+ * @author Rich Scheuerle (scheu@us.ibm.com)
  */
 public class TypeMappingRegistryImpl implements TypeMappingRegistry { 
     
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java
index 3794b443f..d510fb9dd 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/MapDeserializer.java
@@ -31,13 +31,13 @@
 import java.util.HashMap;
 import java.util.Map;
 
-/*
+/**
  * A <code>MapSerializer</code> is be used to deserialize
  * deserialize Maps using the <code>SOAP-ENC</code>
  * encoding style.<p>
  * 
  * @author Glen Daniels (gdaniels@apache.org)
- * Modified by @author Rich scheuerle <scheu@us.ibm.com>
+ * Modified by @author Rich scheuerle (scheu@us.ibm.com)
  */
 public class MapDeserializer extends DeserializerImpl {
 
@@ -135,7 +135,7 @@ public void setChildValue(Object value, Object hint) throws SAXException
     }
     
     /**
-     * A deserializer for an <item>.  Handles getting the key and
+     * A deserializer for an &lt;item&gt;.  Handles getting the key and
      * value objects from their own deserializers, and then putting
      * the values into the HashMap we're building.
      * 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
index 123dfd67d..da2c3b380 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/ser/SimpleListSerializer.java
@@ -41,7 +41,7 @@
  * &lt;/xsd:simpleType&gt;
  * based on SimpleSerializer
  *
- * @author Ias <iasandcb@tmax.co.kr>
+ * @author Ias (iasandcb@tmax.co.kr)
  */
 public class SimpleListSerializer implements SimpleValueSerializer {
     public QName xmlType;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java b/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
index 090961094..4ce33fb31 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/message/RPCHandler.java
@@ -53,7 +53,7 @@
  * &lt;/methodName&gt;
  * </pre>
  *
- * ...we'll get onStartChild() events for <param1> and <param2>.
+ * ...we'll get onStartChild() events for &lt;param1&gt; and &lt;param2&gt;.
  *
  * @author Glen Daniels (gdaniels@apache.org)
  */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java b/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java
index 5a27d3dba..1511a4f1e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/providers/java/EJBProvider.java
@@ -444,11 +444,10 @@ protected Object getEJBHome(InitialContext context, String beanJndiName)
     /**
      * Override the default implementation such that we can include
      * special handling for {@link java.rmi.ServerException}.
-     * <p/>
+     * <p>
      * Converts {@link java.rmi.ServerException} exceptions to
      * {@link InvocationTargetException} exceptions with the same cause.
      * This allows the axis framework to create a SOAP fault.
-     * </p>
      *
      * @see org.apache.axis.providers.java.RPCProvider#invokeMethod(org.apache.axis.MessageContext, java.lang.reflect.Method, java.lang.Object, java.lang.Object[])
      */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java b/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java
index 68679aca6..f0107c331 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/security/servlet/ServletSecurityProvider.java
@@ -48,8 +48,6 @@ public class ServletSecurityProvider implements SecurityProvider {
 
     /** Authenticate a user from a username/password pair.
      *
-     * @param username the user name to check
-     * @param password the password to check
      * @return an AuthenticatedUser or null
      */
     public AuthenticatedUser authenticate(MessageContext msgContext) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java b/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java
index c9717a468..9e1384290 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/security/simple/SimpleSecurityProvider.java
@@ -93,8 +93,6 @@ private synchronized void initialize(MessageContext msgContext)
 
     /** Authenticate a user from a username/password pair.
      *
-     * @param username the user name to check
-     * @param password the password to check
      * @return an AuthenticatedUser or null
      */
     public AuthenticatedUser authenticate(MessageContext msgContext) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java
index 891f9377b..28d0303e5 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/transport/local/LocalTransport.java
@@ -81,8 +81,8 @@ public void setRemoteService(String remoteServiceName) {
 
     /**
      * Set up any transport-specific derived properties in the message context.
-     * @param context the context to set up
-     * @param message the client service instance
+     * @param mc the context to set up
+     * @param call the client service instance
      * @param engine the engine containing the registries
      */
     public void setupMessageContextImpl(MessageContext mc,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java b/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
index 817836571..2ab0443ae 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Duration.java
@@ -68,7 +68,7 @@ public Duration(boolean negative, int aYears, int aMonths, int aDays,
      * PnYnMnDTnHnMnS.
      *
      * @param duration String
-     * @throws SchemaException if the string doesn't parse correctly.
+     * @throws IllegalArgumentException if the string doesn't parse correctly.
      */
     public Duration(String duration) throws IllegalArgumentException {
         int position = 1;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/Id.java b/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
index 2b8f3508b..e8b3e8f7e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/Id.java
@@ -49,7 +49,7 @@ public Id(String stValue) throws IllegalArgumentException {
     /**
      *
      * validates the data and sets the value for the object.
-     * @param Token String value
+     * @param stValue String value
      * @throws IllegalArgumentException if invalid format
      */
     public void setValue(String stValue) throws IllegalArgumentException {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java b/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
index dda08a971..c80577975 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/NormalizedString.java
@@ -76,7 +76,7 @@ public int hashCode(){
      * nor tab (#x9) characters.
      *
      * @param stValue the String to test
-     * @returns true if valid normalizedString
+     * @return true if valid normalizedString
      */
     public static boolean isValid(String stValue)  {
         int scan;
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/URI.java b/axis-rt-core/src/main/java/org/apache/axis/types/URI.java
index bec9df887..86cceec94 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/URI.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/URI.java
@@ -1682,7 +1682,7 @@ public boolean equals(Object p_test) {
     /**
      * Returns a hash-code value for this URI.  The hash code is based upon all
      * of the URI's components, and satisfies the general contract of the
-     * {@link java.lang.Object#hashCode() Object.hashCode} method. </p>
+     * {@link java.lang.Object#hashCode() Object.hashCode} method.
      *
      * @return  A hash-code value for this URI
      */
@@ -1765,7 +1765,7 @@ public static boolean isConformantSchemeName(String p_scheme) {
   * '.'. Each group must consist of one to three digits. See RFC 2732 Section 3,
   * and RFC 2373 Section 2.2, for the definition of IPv6 references. A hostname 
   * consists of domain labels (each of which must begin and end with an alphanumeric 
-  * but may contain '-') separated & by a '.'. See RFC 2396 Section 3.2.2.
+  * but may contain '-') separated &amp; by a '.'. See RFC 2396 Section 3.2.2.
   *
   * @return true if the string is a syntactically valid IPv4 address, 
   * IPv6 reference or hostname
diff --git a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
index 481ddce08..4050b98f7 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/types/UnsignedByte.java
@@ -33,7 +33,7 @@ public UnsignedByte() {
 
     /**
      * ctor for UnsignedByte
-     * @exception Exception will be thrown if validation fails
+     * @exception NumberFormatException will be thrown if validation fails
      */
     public UnsignedByte(long sValue) throws NumberFormatException {
       setValue(sValue);
diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java b/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
index 177566d83..3d1610635 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/Messages.java
@@ -137,7 +137,7 @@ public static String getMessage(String key, String arg0, String arg1, String arg
     /**
       * Get a message from resource.properties from the package of the given object.
       * @param key The resource key
-      * @param array An array of objects to place in corresponding variables
+      * @param args An array of objects to place in corresponding variables
       * @return The formatted message
       */
     public static String getMessage(String key, String[] args)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java
index c9a7b87a4..45daab78a 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/fromJava/Types.java
@@ -65,9 +65,9 @@
 import java.util.Set;
 
 /**
- * <p>Description: </p> This class is used to recursively serializes a Java Class into
+ * This class is used to recursively serializes a Java Class into
  * an XML Schema representation.
- * <p/>
+ * <p>
  * It has utility methods to create a schema node, assosiate namespaces to the various types
  *
  * @author unascribed
@@ -1001,7 +1001,7 @@ private void writeWsdlTypesElement() {
      * Write a schema representation for the given <code>Class</code>. Recurse
      * through all the public fields as well as fields represented by java
      * bean compliant accessor methods.
-     * <p/>
+     * <p>
      * Then return the qualified string representation of the generated type
      *
      * @param type Class for which to generate schema
@@ -1016,7 +1016,7 @@ public String writeType(Class type) throws AxisFault {
      * Write a schema representation for the given <code>Class</code>. Recurse
      * through all the public fields as well as fields represented by java
      * bean compliant accessor methods.
-     * <p/>
+     * <p>
      * Then return the qualified string representation of the generated type
      *
      * @param type  Class for which to generate schema
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
index 7b20acaab..4b0a13e95 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BackslashUtil.java
@@ -78,7 +78,7 @@ public static String stripBackslashes(String string) {
 	}
 	
 	/**
-	 * Slave method for applyBackslashes & stripBackslashes .
+	 * Slave method for applyBackslashes &amp; stripBackslashes .
 	 * 
 	 */
 	public static String transformBackslashes(String string, boolean delete) {
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java
index ae0ff0943..b597fa565 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/BindingEntry.java
@@ -152,7 +152,7 @@ public BindingEntry(Binding binding, int bindingType, Style bindingStyle,
      * operation outputBodyTypes = USE_ENCODED
      * operation faultBodyTypes = USE_ENCODED
      * mimeTypes = null
-     * <p/>
+     * <p>
      * The caller of this constructor should
      * also call the various setter methods to fully fill out this object:
      * setBindingType, setBindingStyle, setHasLiteral, setAttribute,
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java
index b25c2ab42..1ae3f84fb 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionElement.java
@@ -22,10 +22,10 @@
 /**
  * This Element is for a QName that is a 'collection'.
  * For example,
- * <element ref="bar" maxOccurs="unbounded" />
+ * &lt;element ref="bar" maxOccurs="unbounded" /&gt;
  * We need a way to indicate in the symbol table that a foo is
  * 'collection of bars',  In such cases a collection element is
- * added with the special QName  <name>[<minOccurs>, <maxOccurs>]
+ * added with the special QName  &lt;name&gt;[&lt;minOccurs&gt;, &lt;maxOccurs&gt;]
  */
 public class CollectionElement extends DefinedElement implements CollectionTE {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java
index d4e44b917..6bcaa5017 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/CollectionType.java
@@ -22,10 +22,10 @@
 /**
  * This Type is for a QName that is a 'collection'.
  * For example,
- * <element name="foo" type="bar" maxOccurs="unbounded" />
+ * &lt;element name="foo" type="bar" maxOccurs="unbounded" /&gt;
  * We need a way to indicate in the symbol table that a foo is
  * 'collection of bars',  In such cases a collection type is
- * added with the special QName  <name>[<minOccurs>, <maxOccurs>]
+ * added with the special QName  &lt;name&gt;[&lt;minOccurs&gt;, &lt;maxOccurs&gt;]
  */
 public class CollectionType extends DefinedType implements CollectionTE {
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java
index c2d09a67a..45aecda93 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ElementDecl.java
@@ -19,7 +19,7 @@
 
 /**
  * Simple utility struct for holding element declarations.
- * <p/>
+ * <p>
  * This simply correlates a QName to a TypeEntry.
  * 
  * @author Glen Daniels (gdaniels@apache.org)
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java
index ae4677477..8c58f7733 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/FaultInfo.java
@@ -51,11 +51,11 @@ public class FaultInfo {
 
     /**
      * This constructor creates FaultInfo for a binding fault.
-     * <p/>
+     * <p>
      * If the part of the fault is a type, then the QName is
      * derived from the element name and the provided namespace
      * (this namespace SHOULD come from the binding).
-     * <p/>
+     * <p>
      * If the part of the fault is an element, then the QName is
      * the QName of the element, and the given namespace is ignored.
      * 
@@ -187,11 +187,11 @@ public Use getUse() {
     /**
      * Return the QName of a fault.  This method may return null if no parts
      * are in the fault message.
-     * <p/>
+     * <p>
      * If the part of the fault is a type, then the QName is
      * derived from the element name and the provided namespace
      * (this namespace SHOULD come from the binding).
-     * <p/>
+     * <p>
      * If the part of the fault is an element, then the QName is
      * the QName of the element, and the given namespace is ignored.
      * 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
index e5e71211c..956d7f982 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SchemaUtils.java
@@ -1338,18 +1338,18 @@ public static QName getArrayComponentQName(Node node,
     /**
      * If the specified node represents an element that references a collection
      * then return the qname repesenting the component of the collection.
-     * <p/>
-     * <xsd:element name="alias" type="xsd:string" maxOccurs="unbounded"/>
+     * <p>
+     * &lt;xsd:element name="alias" type="xsd:string" maxOccurs="unbounded"/&gt;
      * returns qname for"xsd:string"
-     * <p/>
-     * <xsd:complexType>
-     *  <xsd:sequence>
-     *   <xsd:element name="alias" type="xsd:string" maxOccurs="unbounded"/>
-     *  </xsd:sequence>
-     * </xsd:complexType>
+     * <p>
+     * &lt;xsd:complexType&gt;
+     *  &lt;xsd:sequence&gt;
+     *   &lt;xsd:element name="alias" type="xsd:string" maxOccurs="unbounded"/&gt;
+     *  &lt;/xsd:sequence&gt;
+     * &lt;/xsd:complexType&gt;
      * returns qname for"xsd:string"
-     * <p/>
-     * <xsd:element ref="alias"  maxOccurs="unbounded"/>
+     * <p>
+     * &lt;xsd:element ref="alias"  maxOccurs="unbounded"/&gt;
      * returns qname for "alias"
      *
      * @param node is the Node
@@ -1881,17 +1881,17 @@ private static void addAttributeGroupToVector(Vector v, Node attrGrpnode,
      * Return the attribute names and types if any in the node
      * The even indices are the attribute types (TypeEntry) and
      * the odd indices are the corresponding names (Strings).
-     * <p/>
+     * <p>
      * Example:
-     * <complexType name="Person">
-     * <sequence>
-     * <element minOccurs="1" maxOccurs="1" name="Age" type="double" />
-     * <element minOccurs="1" maxOccurs="1" name="ID" type="xsd:float" />
-     * </sequence>
-     * <attribute name="Name" type="string" />
-     * <attribute name="Male" type="boolean" />
-     * <attributeGroup ref="s0:MyAttrSet" />
-     * </complexType>
+     * &lt;complexType name="Person"&gt;
+     * &lt;sequence&gt;
+     * &lt;element minOccurs="1" maxOccurs="1" name="Age" type="double" /&gt;
+     * &lt;element minOccurs="1" maxOccurs="1" name="ID" type="xsd:float" /&gt;
+     * &lt;/sequence&gt;
+     * &lt;attribute name="Name" type="string" /&gt;
+     * &lt;attribute name="Male" type="boolean" /&gt;
+     * &lt;attributeGroup ref="s0:MyAttrSet" /&gt;
+     * &lt;/complexType&gt;
      *
      * @param node
      * @param symbolTable
@@ -2062,8 +2062,8 @@ public static TypeEntry getBaseType(TypeEntry type, SymbolTable symbolTable) {
     }
 
     /**
-     * Returns whether the specified node represents a <xsd:simpleType>
-     * with a nested <xsd:list itemType="...">.
+     * Returns whether the specified node represents a &lt;xsd:simpleType&gt;
+     * with a nested &lt;xsd:list itemType="..."&gt;.
      * @param node
      * @return
      */
@@ -2073,7 +2073,7 @@ public static boolean isListWithItemType(Node node) {
     }
 
     /**
-     * Returns the value of itemType attribute of <xsd:list> in <xsd:simpleType>
+     * Returns the value of itemType attribute of &lt;xsd:list&gt; in &lt;xsd:simpleType&gt;
      * @param node
      * @return
      */
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java
index 01ba5d80d..9e0fa37ea 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/ServiceEntry.java
@@ -39,11 +39,6 @@ public ServiceEntry(Service service) {
         this.service = service;
     }    // ctor
 
-    /**
-     *
-     * @param originalServiceName
-     *
-     */
     public String getOriginalServiceName(){
 	return this.originalServiceName;
     }
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
index aefb3f12e..5f295040e 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/SymbolTable.java
@@ -89,8 +89,8 @@
 /**
  * This class represents a table of all of the top-level symbols from a set of WSDL Definitions and
  * DOM Documents:  XML types; WSDL messages, portTypes, bindings, and services.
- * <p/>
- * This symbolTable contains entries of the form <key, value> where key is of type QName and value is
+ * <p>
+ * This symbolTable contains entries of the form &lt;key, value&gt; where key is of type QName and value is
  * of type Vector.  The Vector's elements are all of the objects that have the given QName.  This is
  * necessary since names aren't unique among the WSDL types.  message, portType, binding, service,
  * could all have the same QName and are differentiated merely by type.  SymbolTable contains
@@ -142,7 +142,7 @@ public class SymbolTable {
     private final Map typeIndex = Collections.unmodifiableMap(typeTypeEntries);
 
     /**
-     * cache of nodes -> base types for complexTypes.  The cache is
+     * cache of nodes -&gt; base types for complexTypes.  The cache is
      * built on nodes because multiple TypeEntry objects may use the
      * same node.
      */
@@ -366,7 +366,7 @@ public Vector getTypes() {
     }    // getTypes
 
     /**
-     * Return an unmodifiable map of qnames -> Elements in the symbol
+     * Return an unmodifiable map of qnames -&gt; Elements in the symbol
      * table.
      * 
      * @return an unmodifiable <code>Map</code> value
@@ -376,7 +376,7 @@ public Map getElementIndex() {
     }
 
     /**
-     * Return an unmodifiable map of qnames -> Elements in the symbol
+     * Return an unmodifiable map of qnames -&gt; Elements in the symbol
      * table.
      * 
      * @return an unmodifiable <code>Map</code> value
@@ -1515,16 +1515,16 @@ private void populateMessages(Definition def) throws IOException {
 
     /**
      * ensures that a message in a <code>&lt;input&gt;</code>, <code>&lt;output&gt;</code>,
-     * or <code>&lt;fault&gt;</fault> element in an <code>&lt;operation&gt;</code>
+     * or <code>&lt;fault&gt;</code> element in an <code>&lt;operation&gt;</code>
      * element is valid. In particular, ensures that
      * <ol>
      * <li>an attribute <code>message</code> is present (according to the
      * XML Schema for WSDL 1.1 <code>message</code> is <strong>required</strong>
-     * <p/>
+     * <p>
      * <li>the value of attribute <code>message</code> (a QName) refers to
      * an already defined message
      * </ol>
-     * <p/>
+     * <p>
      * <strong>Note</strong>: this method should throw a <code>javax.wsdl.WSDLException</code> rather than
      * a <code>java.io.IOException</code>
      *
@@ -1554,9 +1554,9 @@ protected void ensureOperationMessageValid(Message message)
 
     /**
      * ensures that an an element <code>&lt;operation&gt;</code> within
-     * an element <code>&lt;portType&gt;<code> is valid. Throws an exception
+     * an element <code>&lt;portType&gt;</code> is valid. Throws an exception
      * if the operation is not valid.
-     * <p/>
+     * <p>
      * <strong>Note</strong>: this method should throw a <code>javax.wsdl.WSDLException</code>
      * rather than a <code>java.io.IOException</code>
      *
@@ -1619,7 +1619,7 @@ protected void ensureOperationValid(Operation operation)
     /**
      * ensures that an an element <code>&lt;portType&gt;</code>
      * is valid. Throws an exception if the portType is not valid.
-     * <p/>
+     * <p>
      * <strong>Note</strong>: this method should throw a <code>javax.wsdl.WSDLException</code>
      * rather than a <code>java.io.IOException</code>
      *
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
index e9620a181..536b07601 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/TypeEntry.java
@@ -32,7 +32,7 @@
  * A TypeEntry object extends SymTabEntry and is built by the SymbolTable class for
  * each supported root complexType, simpleType, and elements that are
  * defined or encountered.
- * <p/>
+ * <p>
  * SymTabEntry
  * |
  * TypeEntry
@@ -43,28 +43,28 @@
  * CollectionType                CollectionElement,
  * DefinedType,                  UndefinedElement)
  * UndefinedType)
- * <p/>
+ * <p>
  * UndefinedType and UndefinedElement are placeholders when the real type or element
  * is not encountered yet.  Both of these implement the Undefined interface.
- * <p/>
+ * <p>
  * A TypeEntry whose java (or other language) name depends on an Undefined type, will
  * have its name initialization deferred until the Undefined type is replaced with
  * a defined type.  The updateUndefined() method is invoked by the UndefinedDelegate to
  * update the information.
- * <p/>
+ * <p>
  * Each TypeEntry whose language name depends on another TypeEntry will have the refType
  * field set.  For example:
- * <element name="foo" type="bar" />
+ * &lt;element name="foo" type="bar" /&gt;
  * The TypeEntry for "foo" will have a refType set to the TypeEntry of "bar".
- * <p/>
+ * <p>
  * Another Example:
- * <xsd:complexType name="hobbyArray">
- * <xsd:complexContent>
- * <xsd:restriction base="soapenc:Array">
- * <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/>
- * </xsd:restriction>
- * </xsd:complexContent>
- * </xsd:complexType>
+ * &lt;xsd:complexType name="hobbyArray"&gt;
+ * &lt;xsd:complexContent&gt;
+ * &lt;xsd:restriction base="soapenc:Array"&gt;
+ * &lt;xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="xsd:string[]"/&gt;
+ * &lt;/xsd:restriction&gt;
+ * &lt;/xsd:complexContent&gt;
+ * &lt;/xsd:complexType&gt;
  * The TypeEntry for "hobbyArray" will have a refType that locates the TypeEntry for xsd:string
  * and the dims field will be "[]"
  * 
@@ -89,7 +89,7 @@ public abstract class TypeEntry extends SymTabEntry implements Serializable {
     protected QName componentType = null;              // If this is an array, the component type
 
     /** If this TypeEntry represents an array with elements inside a "wrapper"
-     * this field can optionally change the inner QName (default is <item>).
+     * this field can optionally change the inner QName (default is &lt;item&gt;).
      */
     protected QName itemQName = null;
 
diff --git a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
index 05fe4cf46..a08b203e8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/wsdl/symbolTable/Utils.java
@@ -175,7 +175,7 @@ public static Vector getAttributesWithLocalName(Node node,
 
     /**
      * An xml element may have a name.
-     * For example &lt.element name="foo" type="b:bar"&gt.
+     * For example &lt;element name="foo" type="b:bar"&gt;
      * has the name "element".  This routine gets the full QName of the element.
      * 
      * @param node 
@@ -200,7 +200,7 @@ public static QName getNodeQName(Node node) {
 
     /**
      * XML nodes may have a name attribute.
-     * For example &lt.element name="foo" type="b:bar"&gt.
+     * For example &lt;element name="foo" type="b:bar"&gt;
      * has the name attribute value "foo".  This routine gets the QName of the name attribute value.
      * 
      * @param node 
@@ -274,12 +274,12 @@ public static QName getNodeNameQName(Node node) {
      * - use of an anonymous type (i.e. a nested type underneath itself)
      * - a wsdl:part can use the element attribute.
      * - an extension can use the base attribute.
-     * <p/>
+     * <p>
      * This routine returns a QName representing this "type".
      * The forElement value is also returned to indicate whether the
      * QName represents an element (i.e. obtained using the ref attribute)
      * or a type.
-     * <p/>
+     * <p>
      * Other attributes affect the QName that is returned.
      * If the "minOccurs" and "maxOccurs" are set such that the
      * type is a collection of "types", then an artificial qname is
@@ -1022,7 +1022,7 @@ public static String getWrapperType(String type) {
     }
 
     /**
-    * Determines if the DOM Node represents an xs:<node>
+    * Determines if the DOM Node represents an xs:&lt;node&gt;
     */
     public static boolean isXsNode (Node node, String nameName)
     {

From 8d1aebfae56a2a6c79e3d3606b5cab7b3a1a8154 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 18 Feb 2018 18:19:45 +0000
Subject: [PATCH 074/133] Remove excluded source files.

---
 axis-rt-core/pom.xml                          |  18 --
 .../net/IBMFakeTrustSocketFactory.java        | 124 -----------
 .../components/net/IBMJSSESocketFactory.java  | 210 ------------------
 .../apache/axis/providers/ComProvider.java    | 185 ---------------
 4 files changed, 537 deletions(-)
 delete mode 100644 axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java
 delete mode 100644 axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java
 delete mode 100644 axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java

diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index a43e9fa03..acb215023 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -156,30 +156,12 @@
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <excludes>
-                        <!-- Jimi is not available in any public repository -->
-                        <exclude>org/apache/axis/components/image/JimiIO.java</exclude>
-                        <!-- Depends on classes from the IBM JDK -->
-                        <exclude>org/apache/axis/components/net/IBM*.java</exclude>
-                        <!-- TODO: contains reference to non existing class org.apache.axis.components.bridge.COMBridge -->
-                        <exclude>org/apache/axis/providers/ComProvider.java</exclude>
-                    </excludes>
                     <compilerArgument>
                         <!-- Necessary because we only support DOM 2 and SAAJ 1.2 -->
                         -Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar${path.separator}${project.build.directory}/endorsed/axis-saaj.jar
                     </compilerArgument>
                 </configuration>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <configuration>
-                    <sourceFileExcludes>
-                        <sourceFileExclude>org/apache/axis/components/image/JimiIO.java</sourceFileExclude>
-                        <sourceFileExclude>org/apache/axis/components/net/IBM*.java</sourceFileExclude>
-                        <sourceFileExclude>org/apache/axis/providers/ComProvider.java</sourceFileExclude>
-                    </sourceFileExcludes>
-                </configuration>
-            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java
deleted file mode 100644
index b52de7767..000000000
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMFakeTrustSocketFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.net;
-
-import com.ibm.net.ssl.SSLContext;
-import com.ibm.net.ssl.TrustManager;
-import com.ibm.net.ssl.X509TrustManager;
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-import java.util.Hashtable;
-
-/**
- * Hook for Axis sender, allowing unsigned server certs
- */
-public class IBMFakeTrustSocketFactory extends IBMJSSESocketFactory {
-
-    /** Field log           */
-    protected static Log log =
-            LogFactory.getLog(IBMFakeTrustSocketFactory.class.getName());
-
-    /**
-     * Constructor FakeTrustSocketFactory
-     *
-     * @param attributes
-     */
-    public IBMFakeTrustSocketFactory(Hashtable attributes) {
-        super(attributes);
-    }
-
-    /**
-     * Method getContext
-     *
-     * @return
-     *
-     * @throws Exception
-     */
-    protected SSLContext getContext() throws Exception {
-
-        try {
-            SSLContext sc = SSLContext.getInstance("SSL");
-
-            sc.init(null, // we don't need no stinkin KeyManager
-                    new TrustManager[]{new FakeX509TrustManager()},
-                    new java.security.SecureRandom());
-            if (log.isDebugEnabled()) {
-                log.debug(Messages.getMessage("ftsf00"));
-            }
-            return sc;
-        } catch (Exception exc) {
-            log.error(Messages.getMessage("ftsf01"), exc);
-            throw new Exception(Messages.getMessage("ftsf02"));
-        }
-    }
-
-    /**
-     * Class FakeX509TrustManager
-     */
-    public static class FakeX509TrustManager implements X509TrustManager {
-
-        /** Field log           */
-        protected static Log log =
-                LogFactory.getLog(FakeX509TrustManager.class.getName());
-
-        /**
-         * Method isClientTrusted
-         *
-         * @param chain
-         *
-         * @return
-         */
-        public boolean isClientTrusted(java.security.cert
-                .X509Certificate[] chain) {
-
-            if (log.isDebugEnabled()) {
-                log.debug(Messages.getMessage("ftsf03"));
-            }
-            return true;
-        }
-
-        /**
-         * Method isServerTrusted
-         *
-         * @param chain
-         *
-         * @return
-         */
-        public boolean isServerTrusted(java.security.cert
-                .X509Certificate[] chain) {
-
-            if (log.isDebugEnabled()) {
-                log.debug(Messages.getMessage("ftsf04"));
-            }
-            return true;
-        }
-
-        /**
-         * Method getAcceptedIssuers
-         *
-         * @return
-         */
-        public java.security.cert.X509Certificate[] getAcceptedIssuers() {
-
-            if (log.isDebugEnabled()) {
-                log.debug(Messages.getMessage("ftsf05"));
-            }
-            return null;
-        }
-    }
-}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java
deleted file mode 100644
index 264de0cd4..000000000
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/IBMJSSESocketFactory.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.net;
-
-import com.ibm.jsse.JSSEProvider;
-import com.ibm.net.ssl.KeyManagerFactory;
-import com.ibm.net.ssl.SSLContext;
-import com.ibm.net.ssl.TrustManager;
-import com.ibm.net.ssl.TrustManagerFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import java.io.BufferedWriter;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.net.Socket;
-import java.security.KeyStore;
-import java.security.Security;
-import java.util.Hashtable;
-
-/**
- * SSL socket factory. It _requires_ a valid RSA key and
- * JSSE. (borrowed code from tomcat)
- *
- * @author Davanum Srinivas (dims@yahoo.com)
- */
-public class IBMJSSESocketFactory extends JSSESocketFactory implements SecureSocketFactory {
-
-    /** Field keystoreType           */
-    private String keystoreType;
-
-    /** Field defaultKeystoreType           */
-    static String defaultKeystoreType = "JKS";
-
-    /** Field defaultProtocol           */
-    static String defaultProtocol = "TLS";
-
-    /** Field defaultAlgorithm           */
-    static String defaultAlgorithm = "IbmX509";
-
-    /** Field defaultClientAuth           */
-    static boolean defaultClientAuth = false;
-
-    /** Field clientAuth           */
-    private boolean clientAuth = false;
-
-    /** Field defaultKeystoreFile           */
-    static String defaultKeystoreFile =
-        System.getProperty("user.home") + "/.keystore";
-
-    /** Field defaultKeyPass           */
-    static String defaultKeyPass = "changeit";
-
-    /**
-     * Constructor IBMJSSESocketFactory
-     *
-     * @param attributes
-     */
-    public IBMJSSESocketFactory(Hashtable attributes) {
-        super(attributes);
-    }
-
-    /**
-     * Read the keystore, init the SSL socket factory
-     *
-     * @throws IOException
-     */
-    protected void initFactory() throws IOException {
-
-        try {
-            Security.addProvider(new com.ibm.jsse.JSSEProvider());
-            Security.addProvider(new com.ibm.crypto.provider.IBMJCE());
-
-            if(attributes == null) {
-                //No configuration specified. Get the default.
-                sslFactory = (SSLSocketFactory) SSLSocketFactory.getDefault();
-            } else {
-                //Configuration specified in wsdd.
-                SSLContext context = getContext();
-                sslFactory = context.getSocketFactory();
-            }
-        } catch (Exception e) {
-            if (e instanceof IOException) {
-                throw (IOException) e;
-            }
-            throw new IOException(e.getMessage());
-        }
-    }
-
-    /**
-     * gets a SSL Context
-     *
-     * @return SSLContext
-     * @throws Exception
-     */
-    protected SSLContext getContext() throws Exception {
-        // Please don't change the name of the attribute - other
-        // software may depend on it ( j2ee for sure )
-        String keystoreFile = (String) attributes.get("keystore");
-        if (keystoreFile == null) {
-            keystoreFile = defaultKeystoreFile;
-        }
-
-        keystoreType = (String) attributes.get("keystoreType");
-        if (keystoreType == null) {
-            keystoreType = defaultKeystoreType;
-        }
-
-        // determine whether we want client authentication
-        // the presence of the attribute enables client auth
-        clientAuth = null != (String) attributes.get("clientauth");
-        String keyPass = (String) attributes.get("keypass");
-        if (keyPass == null) {
-            keyPass = defaultKeyPass;
-        }
-
-        String keystorePass = (String) attributes.get("keystorePass");
-        if (keystorePass == null) {
-            keystorePass = keyPass;
-        }
-
-        // protocol for the SSL ie - TLS, SSL v3 etc.
-        String protocol = (String) attributes.get("protocol");
-        if (protocol == null) {
-            protocol = defaultProtocol;
-        }
-
-        // Algorithm used to encode the certificate ie - SunX509
-        String algorithm = (String) attributes.get("algorithm");
-        if (algorithm == null) {
-            algorithm = defaultAlgorithm;
-        }
-
-        // You can't use ssl without a server certificate.
-        // Create a KeyStore ( to get server certs )
-        KeyStore kstore = initKeyStore(keystoreFile, keystorePass);
-
-        // Key manager will extract the server key
-        KeyManagerFactory kmf = KeyManagerFactory.getInstance(algorithm);
-
-        kmf.init(kstore, keyPass.toCharArray());
-
-        // If client authentication is needed, set up TrustManager
-        TrustManager[] tm = null;
-
-        if (clientAuth) {
-            TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-
-            tmf.init(kstore);
-            tm = tmf.getTrustManagers();
-        }
-
-        // Create a SSLContext ( to create the ssl factory )
-        // This is the only way to use server sockets with JSSE 1.0.1
-        SSLContext context = SSLContext.getInstance(protocol);    // SSL
-
-        // init context with the key managers
-        context.init(kmf.getKeyManagers(), tm,
-                new java.security.SecureRandom());
-        return context;
-    }
-
-    /**
-     * intializes a keystore.
-     *
-     * @param keystoreFile
-     * @param keyPass
-     *
-     * @return keystore
-     * @throws IOException
-     */
-    private KeyStore initKeyStore(String keystoreFile, String keyPass)
-            throws IOException {
-        try {
-            KeyStore kstore = KeyStore.getInstance(keystoreType);
-
-            InputStream istream = new FileInputStream(keystoreFile);
-            kstore.load(istream, keyPass.toCharArray());
-            return kstore;
-        } catch (FileNotFoundException fnfe) {
-            throw fnfe;
-        } catch (IOException ioe) {
-            throw ioe;
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            throw new IOException("Exception trying to load keystore "
-                    + keystoreFile + ": " + ex.getMessage());
-        }
-    }
-}
diff --git a/axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java b/axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java
deleted file mode 100644
index 8bbded641..000000000
--- a/axis-rt-core/src/main/java/org/apache/axis/providers/ComProvider.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.providers;
-
-import org.apache.axis.AxisFault;
-import org.apache.axis.Constants;
-import org.apache.axis.Message;
-import org.apache.axis.MessageContext;
-import org.apache.axis.components.bridge.COMBridge;
-import org.apache.axis.deployment.wsdd.providers.WSDDComProvider;
-import org.apache.axis.description.OperationDesc;
-import org.apache.axis.description.ParameterDesc;
-import org.apache.axis.handlers.soap.SOAPService;
-import org.apache.axis.message.RPCElement;
-import org.apache.axis.message.RPCHeaderParam;
-import org.apache.axis.message.RPCParam;
-import org.apache.axis.message.SOAPBodyElement;
-import org.apache.axis.message.SOAPEnvelope;
-import org.apache.axis.soap.SOAPConstants;
-import org.apache.axis.utils.JavaUtils;
-import org.apache.axis.utils.Messages;
-
-import javax.xml.namespace.QName;
-import java.util.Hashtable;
-import java.util.Vector;
-
-public class ComProvider extends BasicProvider {
-
-
-    public void invoke(MessageContext msgContext) throws AxisFault {
-        try {
-            SOAPService service = msgContext.getService();
-            String progID = (String) service.getOption(WSDDComProvider.OPTION_PROGID);
-            String threadingModel = (String) service.getOption(WSDDComProvider.OPTION_THREADING_MODEL);
-
-            if (log.isDebugEnabled()) {
-                log.debug("Enter: COMProvider.processMessage()");
-            }
-
-            OperationDesc operation = msgContext.getOperation();
-
-            Vector bodies = msgContext.getRequestMessage().getSOAPEnvelope().getBodyElements();
-            if (log.isDebugEnabled()) {
-                log.debug(Messages.getMessage("bodyElems00", "" + bodies.size()));
-                log.debug(Messages.getMessage("bodyIs00", "" + bodies.get(0)));
-            }
-
-            RPCElement body = null;
-            
-            // Find the first "root" body element, which is the RPC call.
-            for (int bNum = 0; body == null && bNum < bodies.size(); bNum++) {
-                // If this is a regular old SOAPBodyElement, and it's a root,
-                // we're probably a non-wrapped doc/lit service.  In this case,
-                // we deserialize the element, and create an RPCElement "wrapper"
-                // around it which points to the correct method.
-                // FIXME : There should be a cleaner way to do this...
-                if (!(bodies.get(bNum) instanceof RPCElement)) {
-                    SOAPBodyElement bodyEl = (SOAPBodyElement) bodies.get(bNum);
-                    // igors: better check if bodyEl.getID() != null
-                    // to make sure this loop does not step on SOAP-ENC objects
-                    // that follow the parameters! FIXME?
-                    if (bodyEl.isRoot() && operation != null && bodyEl.getID() == null) {
-                        ParameterDesc param = operation.getParameter(bNum);
-                        // at least do not step on non-existent parameters!
-                        if (param != null) {
-                            Object val = bodyEl.getValueAsType(param.getTypeQName());
-                            body = new RPCElement("",
-                                    operation.getName(),
-                                    new Object[]{val});
-                        }
-                    }
-                } else {
-                    body = (RPCElement) bodies.get(bNum);
-                }
-            }
-
-            String methodName = body.getMethodName();
-            Vector args = body.getParams();
-            int numArgs = args.size();
-
-            Vector argValues = new Vector();
-            
-            // Put the values contained in the RPCParams into an array
-            // suitable for passing to java.lang.reflect.Method.invoke()
-            // Make sure we respect parameter ordering if we know about it
-            // from metadata, and handle whatever conversions are necessary
-            // (values -> Holders, etc)
-            for (int i = 0; i < numArgs; i++) {
-                RPCParam rpcParam = (RPCParam) args.get(i);
-                Object value = rpcParam.getObjectValue();
-
-                // first check the type on the paramter
-                ParameterDesc paramDesc = rpcParam.getParamDesc();
-
-                // if we found some type info try to make sure the value type is
-                // correct.  For instance, if we deserialized a xsd:dateTime in
-                // to a Calendar and the service takes a Date, we need to convert
-                if (paramDesc != null && paramDesc.getJavaType() != null) {
-
-                    // Get the type in the signature (java type or its holder)
-                    Class sigType = paramDesc.getJavaType();
-
-                    // Convert the value into the expected type in the signature
-                    value = JavaUtils.convert(value,
-                            sigType);
-
-                    rpcParam.setObjectValue(value);
-                }
-                argValues.add(value);
-            }
-
-            COMBridge bridge = new COMBridge();
-            Hashtable props = new Hashtable();
-            props.put("progid", progID);
-            if (threadingModel != null)
-                props.put("threadmodel", threadingModel);
-
-            Object result = bridge.execute(methodName, argValues, props);
-
-            RPCElement resBody = new RPCElement(methodName + "Response");
-            resBody.setPrefix(body.getPrefix());
-            resBody.setNamespaceURI(body.getNamespaceURI());
-            resBody.setEncodingStyle(msgContext.getEncodingStyle());
-
-            Message resMsg = msgContext.getResponseMessage();
-            SOAPEnvelope resEnv;
-
-            // If we didn't have a response message, make sure we set one up
-            if (resMsg == null) {
-                resEnv = new SOAPEnvelope(msgContext.getSOAPConstants());
-
-                resMsg = new Message(resEnv);
-                msgContext.setResponseMessage(resMsg);
-            } else {
-                resEnv = resMsg.getSOAPEnvelope();
-            }
-
-            QName returnQName = operation.getReturnQName();
-            if (returnQName == null) {
-                returnQName = new QName("", methodName + "Return");
-            }
-
-            // For SOAP 1.2, add a result
-            if (msgContext.getSOAPConstants() ==
-                    SOAPConstants.SOAP12_CONSTANTS) {
-                returnQName = Constants.QNAME_RPC_RESULT;
-            }
-
-            RPCParam param = new RPCParam(returnQName, result);
-            param.setParamDesc(operation.getReturnParamDesc());
-            if (!operation.isReturnHeader()) {
-                resBody.addParam(param);
-            } else {
-                resEnv.addHeader(new RPCHeaderParam(param));
-            }
-
-            resEnv.addBodyElement(resBody);
-
-        } catch (Exception e) {
-            entLog.debug(Messages.getMessage("toAxisFault00"), e);
-            throw AxisFault.makeFault(e);
-        } catch (Throwable t) {
-            entLog.debug(Messages.getMessage("toAxisFault00"));
-            throw new AxisFault(Messages.getMessage("toAxisFault00"), t);
-        }
-    }
-
-    public void initServiceDesc(SOAPService service, MessageContext msgContext)
-            throws AxisFault {
-    }
-}

From 9fd747ea3f811e3a240e4d0e6db440bae31ee4a3 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 7 May 2018 12:04:10 +0000
Subject: [PATCH 075/133] Update repositories

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 43dcf931a..6e20e30ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,8 +157,8 @@
     </prerequisites>
     <pluginRepositories>
         <pluginRepository>
-            <id>veithen-github-mvn-repo</id>
-            <url>https://raw.github.com/veithen/mvn-repo/master/snapshots/</url>
+            <id>sonatype-snapshots</id>
+            <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
             <releases>
                 <enabled>false</enabled>
             </releases>

From e2648751dd465695949e4f8096f08903b2a0aeee Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 7 May 2018 16:16:03 +0000
Subject: [PATCH 076/133] Upgrade maven-compiler-plugin and avoid duplicate
 classes.

---
 axis-ant/pom.xml                      | 2 +-
 axis-ant/src/test/ant/extra/build.xml | 8 ++++----
 pom.xml                               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 02f439281..6f99b869a 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -194,7 +194,7 @@
                                     </allowedFiles>
                                 </fileSet>
                                 <fileSet>
-                                    <directory>${project.build.directory}/work/test/wsdl/extra</directory>
+                                    <directory>${project.build.directory}/work/test/wsdl/extra/gen</directory>
                                     <expectedFiles>
                                         <expectedFile>Extra.java</expectedFile> <!-- this is the important one -->
                                         <expectedFile>MyService.java</expectedFile>
diff --git a/axis-ant/src/test/ant/extra/build.xml b/axis-ant/src/test/ant/extra/build.xml
index 655f09ec1..018c9ebb3 100644
--- a/axis-ant/src/test/ant/extra/build.xml
+++ b/axis-ant/src/test/ant/extra/build.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" ?>
 <project>
   <target name="test">
-    <mkdir dir="${project.build.directory}/work/test/wsdl/extra"/>
+    <mkdir dir="${project.build.directory}/work/test/wsdl/extra/gen"/>
     
     <!-- Generate WSDL from java -->
-    <java2wsdl output="${project.build.directory}/work/test/wsdl/extra/MyService.wsdl"
+    <java2wsdl output="${project.build.directory}/work/test/wsdl/extra/gen/MyService.wsdl"
                className= "test.wsdl.extra.MyService"
                extraClasses="test.wsdl.extra.Extra"
                namespace="http://test.com/extraClasses"
@@ -14,12 +14,12 @@
     </java2wsdl>
     
     <!-- Verify files generated based on everything in WSDL -->
-    <wsdl2java url="${project.build.directory}/work/test/wsdl/extra/MyService.wsdl"
+    <wsdl2java url="${project.build.directory}/work/test/wsdl/extra/gen/MyService.wsdl"
                output="${project.build.directory}/work"
                all="yes"
                verbose="no"
                testcase="no">
-        <mapping namespace="http://test.com/extraClasses" package="test.wsdl.extra"/>
+        <mapping namespace="http://test.com/extraClasses" package="test.wsdl.extra.gen"/>
     </wsdl2java>
   </target>
 </project>
diff --git a/pom.xml b/pom.xml
index 6e20e30ac..becc3a07c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <inherited>true</inherited>
+                <version>3.7.0</version>
                 <configuration>
                     <source>${javaVersion}</source>
                     <target>${javaVersion}</target>

From 37d0370ec1095016d25e8f3a7e7123ad3a3f2421 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 7 May 2018 21:08:03 +0000
Subject: [PATCH 077/133] Use emf-maven-plugin to generate code in axis-model.

---
 axis-model/model/wsdd.ecore                   |    6 +
 axis-model/pom.xml                            |   22 +
 .../apache/axis/model/soap/SOAPFactory.java   |   26 -
 .../axis/model/soap/impl/SOAPFactoryImpl.java |  146 -
 .../axis/model/soap/impl/SOAPPackageImpl.java |  302 --
 .../apache/axis/model/util/AxisXMLHelper.java |   23 +-
 .../apache/axis/model/wsdd/ArrayMapping.java  |   53 -
 .../apache/axis/model/wsdd/BeanMapping.java   |   20 -
 .../org/apache/axis/model/wsdd/Chain.java     |   97 -
 .../axis/model/wsdd/DeployableItem.java       |   78 -
 .../apache/axis/model/wsdd/Deployment.java    |  138 -
 .../org/apache/axis/model/wsdd/Fault.java     |  130 -
 .../axis/model/wsdd/GlobalConfiguration.java  |   20 -
 .../org/apache/axis/model/wsdd/Handler.java   |   79 -
 .../org/apache/axis/model/wsdd/Mapping.java   |  104 -
 .../axis/model/wsdd/MappingContainer.java     |   77 -
 .../org/apache/axis/model/wsdd/Operation.java |  295 --
 .../axis/model/wsdd/OperationParameter.java   |  211 --
 .../org/apache/axis/model/wsdd/Parameter.java |   76 -
 .../apache/axis/model/wsdd/ParameterMode.java |  194 -
 .../axis/model/wsdd/Parameterizable.java      |   51 -
 .../org/apache/axis/model/wsdd/Service.java   |  166 -
 .../org/apache/axis/model/wsdd/Transport.java |   79 -
 .../apache/axis/model/wsdd/TypeMapping.java   |   77 -
 .../apache/axis/model/wsdd/WSDDFactory.java   |  159 -
 .../model/wsdd/impl/ArrayMappingImpl.java     |  153 -
 .../axis/model/wsdd/impl/BeanMappingImpl.java |   41 -
 .../axis/model/wsdd/impl/ChainImpl.java       |  257 --
 .../model/wsdd/impl/DeployableItemImpl.java   |  222 --
 .../axis/model/wsdd/impl/DeploymentImpl.java  |  355 --
 .../axis/model/wsdd/impl/FaultImpl.java       |  308 --
 .../wsdd/impl/GlobalConfigurationImpl.java    |   41 -
 .../axis/model/wsdd/impl/HandlerImpl.java     |  201 -
 .../apache/axis/model/wsdd/impl/Helper.java   |   59 +
 .../model/wsdd/impl/MappingContainerImpl.java |  223 --
 .../axis/model/wsdd/impl/MappingImpl.java     |  257 --
 .../axis/model/wsdd/impl/OperationImpl.java   |  659 ----
 .../wsdd/impl/OperationParameterImpl.java     |  462 ---
 .../axis/model/wsdd/impl/ParameterImpl.java   |  205 -
 .../model/wsdd/impl/ParameterizableImpl.java  |  165 -
 .../axis/model/wsdd/impl/ServiceImpl.java     |  549 ---
 .../axis/model/wsdd/impl/TransportImpl.java   |  204 -
 .../axis/model/wsdd/impl/TypeMappingImpl.java |  203 -
 .../axis/model/wsdd/impl/WSDDFactoryImpl.java |  308 --
 .../axis/model/wsdd/impl/WSDDPackageImpl.java | 3283 -----------------
 .../org/apache/axis/model/xml/XmlFactory.java |   26 -
 .../axis/model/xml/impl/XmlFactoryImpl.java   |  134 -
 .../axis/model/xml/impl/XmlPackageImpl.java   |  258 --
 48 files changed, 107 insertions(+), 11095 deletions(-)
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
 create mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/Helper.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/xml/XmlFactory.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlFactoryImpl.java
 delete mode 100644 axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java

diff --git a/axis-model/model/wsdd.ecore b/axis-model/model/wsdd.ecore
index 574792f2d..f207fd56d 100644
--- a/axis-model/model/wsdd.ecore
+++ b/axis-model/model/wsdd.ecore
@@ -97,6 +97,9 @@
     <eOperations name="setParameter">
       <eParameters name="name" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
       <eParameters name="value" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="Helper.setParameter(this, name, value);"/>
+      </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
         eType="#//Parameter" containment="true">
@@ -175,6 +178,9 @@
     </eAnnotations>
     <eOperations name="merge">
       <eParameters name="other" lowerBound="1" eType="#//Deployment"/>
+      <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+        <details key="body" value="Helper.merge(this, other);"/>
+      </eAnnotations>
     </eOperations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="globalConfiguration" eType="#//GlobalConfiguration"
diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index 639cc38de..d0bc463e0 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -67,7 +67,29 @@
         </dependency>
     </dependencies>
     <build>
+        <extensions>
+            <extension>
+                <groupId>com.github.veithen.cosmos</groupId>
+                <artifactId>p2-maven-connector</artifactId>
+                <version>0.3</version>
+            </extension>
+        </extensions>
         <plugins>
+            <plugin>
+                <groupId>com.github.veithen.cosmos</groupId>
+                <artifactId>emf-maven-plugin</artifactId>
+                <version>0.1-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-sources</goal>
+                        </goals>
+                        <configuration>
+                            <genmodel>model/axis.genmodel</genmodel>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <artifactId>maven-shade-plugin</artifactId>
                 <executions>
diff --git a/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java b/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
deleted file mode 100644
index cf4d7b093..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/soap/SOAPFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.soap;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface SOAPFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    SOAPFactory INSTANCE = org.apache.axis.model.soap.impl.SOAPFactoryImpl.eINSTANCE;
-
-} //SOAPFactory
diff --git a/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java b/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
deleted file mode 100644
index 1b8d0f15b..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPFactoryImpl.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.soap.impl;
-
-import org.apache.axis.constants.Style;
-import org.apache.axis.constants.Use;
-
-import org.apache.axis.model.soap.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SOAPFactoryImpl extends EFactoryImpl implements SOAPFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final SOAPFactoryImpl eINSTANCE = init();
-
-    /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static SOAPFactoryImpl init() {
-        try {
-            SOAPFactoryImpl theSOAPFactory = (SOAPFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http://axis.apache.org/emf/soap"); 
-            if (theSOAPFactory != null) {
-                return theSOAPFactory;
-            }
-        }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
-        }
-        return new SOAPFactoryImpl();
-    }
-
-    /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public SOAPFactoryImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EObject create(EClass eClass) {
-        switch (eClass.getClassifierID()) {
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object createFromString(EDataType eDataType, String initialValue) {
-        switch (eDataType.getClassifierID()) {
-            case SOAPPackageImpl.USE:
-                return createUseFromString(eDataType, initialValue);
-            case SOAPPackageImpl.STYLE:
-                return createStyleFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertToString(EDataType eDataType, Object instanceValue) {
-        switch (eDataType.getClassifierID()) {
-            case SOAPPackageImpl.USE:
-                return convertUseToString(eDataType, instanceValue);
-            case SOAPPackageImpl.STYLE:
-                return convertStyleToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    public Use createUseFromString(EDataType eDataType, String initialValue) {
-        return Use.getUse(initialValue);
-    }
-
-    public String convertUseToString(EDataType eDataType, Object instanceValue) {
-        return ((Use)instanceValue).getName();
-    }
-
-    public Style createStyleFromString(EDataType eDataType, String initialValue) {
-        return Style.getStyle(initialValue);
-    }
-
-    public String convertStyleToString(EDataType eDataType, Object instanceValue) {
-        return ((Style)instanceValue).getName();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public SOAPPackageImpl getSOAPPackage() {
-        return (SOAPPackageImpl)getEPackage();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @deprecated
-     * @generated
-     */
-    public static SOAPPackageImpl getPackage() {
-        return SOAPPackageImpl.eINSTANCE;
-    }
-
-} //SOAPFactoryImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java b/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
deleted file mode 100644
index 8a513fd24..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/soap/impl/SOAPPackageImpl.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.soap.impl;
-
-import org.apache.axis.constants.Style;
-import org.apache.axis.constants.Use;
-
-import org.apache.axis.model.soap.SOAPFactory;
-
-import org.apache.axis.model.wsdd.impl.WSDDPackageImpl;
-
-import org.apache.axis.model.xml.impl.XmlPackageImpl;
-
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.soap.SOAPFactory
- * @model kind="package"
- * @generated
- */
-public class SOAPPackageImpl extends EPackageImpl {
-    /**
-     * The package name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNAME = "soap";
-
-    /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNS_URI = "http://axis.apache.org/emf/soap";
-
-    /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNS_PREFIX = "soap";
-
-    /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final SOAPPackageImpl eINSTANCE = org.apache.axis.model.soap.impl.SOAPPackageImpl.init();
-
-    /**
-     * The meta object id for the '<em>Use</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.constants.Use
-     * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getUse()
-     * @generated
-     */
-    public static final int USE = 0;
-
-    /**
-     * The meta object id for the '<em>Style</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.constants.Style
-     * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getStyle()
-     * @generated
-     */
-    public static final int STYLE = 1;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType useEDataType = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType styleEDataType = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private SOAPPackageImpl() {
-        super(eNS_URI, ((EFactory)SOAPFactory.INSTANCE));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-     * 
-     * <p>This method is used to initialize {@link SOAPPackageImpl#eINSTANCE} when that field is accessed.
-     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static SOAPPackageImpl init() {
-        if (isInited) return (SOAPPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI);
-
-        // Obtain or create and register package
-        SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof SOAPPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new SOAPPackageImpl());
-
-        isInited = true;
-
-        // Obtain or create and register interdependencies
-        WSDDPackageImpl theWSDDPackage = (WSDDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) instanceof WSDDPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) : WSDDPackageImpl.eINSTANCE);
-        XmlPackageImpl theXmlPackage = (XmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) : XmlPackageImpl.eINSTANCE);
-
-        // Create package meta-data objects
-        theSOAPPackage.createPackageContents();
-        theWSDDPackage.createPackageContents();
-        theXmlPackage.createPackageContents();
-
-        // Initialize created meta-data
-        theSOAPPackage.initializePackageContents();
-        theWSDDPackage.initializePackageContents();
-        theXmlPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theSOAPPackage.freeze();
-
-  
-        // Update the registry and return the package
-        EPackage.Registry.INSTANCE.put(SOAPPackageImpl.eNS_URI, theSOAPPackage);
-        return theSOAPPackage;
-    }
-
-
-    /**
-     * Returns the meta object for data type '{@link org.apache.axis.constants.Use <em>Use</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Use</em>'.
-     * @see org.apache.axis.constants.Use
-     * @model instanceClass="org.apache.axis.constants.Use"
-     * @generated
-     */
-    public EDataType getUse() {
-        return useEDataType;
-    }
-
-    /**
-     * Returns the meta object for data type '{@link org.apache.axis.constants.Style <em>Style</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>Style</em>'.
-     * @see org.apache.axis.constants.Style
-     * @model instanceClass="org.apache.axis.constants.Style"
-     * @generated
-     */
-    public EDataType getStyle() {
-        return styleEDataType;
-    }
-
-    /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the factory that creates the instances of the model.
-     * @generated
-     */
-    public SOAPFactory getSOAPFactory() {
-        return (SOAPFactory)getEFactoryInstance();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isCreated = false;
-
-    /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void createPackageContents() {
-        if (isCreated) return;
-        isCreated = true;
-
-        // Create data types
-        useEDataType = createEDataType(USE);
-        styleEDataType = createEDataType(STYLE);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isInitialized = false;
-
-    /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void initializePackageContents() {
-        if (isInitialized) return;
-        isInitialized = true;
-
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
-
-        // Initialize data types
-        initEDataType(useEDataType, Use.class, "Use", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-        initEDataType(styleEDataType, Style.class, "Style", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-        // Create resource
-        createResource(eNS_URI);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * Defines literals for the meta objects that represent
-     * <ul>
-     *   <li>each class,</li>
-     *   <li>each feature of each class,</li>
-     *   <li>each enum,</li>
-     *   <li>and each data type</li>
-     * </ul>
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public interface Literals {
-        /**
-         * The meta object literal for the '<em>Use</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.constants.Use
-         * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getUse()
-         * @generated
-         */
-        public static final EDataType USE = eINSTANCE.getUse();
-
-        /**
-         * The meta object literal for the '<em>Style</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.constants.Style
-         * @see org.apache.axis.model.soap.impl.SOAPPackageImpl#getStyle()
-         * @generated
-         */
-        public static final EDataType STYLE = eINSTANCE.getStyle();
-
-    }
-
-} //SOAPPackageImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
index 3b834c1c9..f383b7b75 100644
--- a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
+++ b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLHelper.java
@@ -22,6 +22,9 @@
 
 import javax.xml.namespace.QName;
 
+import org.apache.axis.constants.Style;
+import org.apache.axis.constants.Use;
+import org.apache.axis.model.soap.impl.SOAPPackageImpl;
 import org.apache.axis.model.xml.impl.XmlPackageImpl;
 import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EFactory;
@@ -51,8 +54,8 @@ public void setOptions(Map options) {
         ignoreNamespaceForUnqualifiedQName = (String)options.get(AxisXMLResource.OPTION_IGNORE_NAMESPACE_FOR_UNQUALIFIED_QNAME);
     }
 
-    protected Object createFromString(EFactory eFactory, EDataType eDataType, String value) {
-        if (eDataType == XmlPackageImpl.eINSTANCE.getQName()) {
+    protected Object createFromString(EFactory eFactory, EDataType dataType, String value) {
+        if (dataType == XmlPackageImpl.eINSTANCE.getQName()) {
             String prefix;
             String localName;
             int idx = value.indexOf(':');
@@ -77,8 +80,22 @@ protected Object createFromString(EFactory eFactory, EDataType eDataType, String
                 namespaceURI = "";
             }
             return new QName(namespaceURI, localName, prefix);
+        } else if (dataType == SOAPPackageImpl.eINSTANCE.getStyle()) {
+            return Style.getStyle(value);
+        } else if (dataType == SOAPPackageImpl.eINSTANCE.getUse()) {
+            return Use.getUse(value);
         } else {
-            return super.createFromString(eFactory, eDataType, value);
+            return super.createFromString(eFactory, dataType, value);
+        }
+    }
+
+    public String convertToString(EFactory factory, EDataType dataType, Object value) {
+        if (dataType == SOAPPackageImpl.eINSTANCE.getStyle()) {
+            return ((Style)value).getName();
+        } else if (dataType == SOAPPackageImpl.eINSTANCE.getUse()) {
+            return ((Use)value).getName();
+        } else {
+            return super.convertToString(factory, dataType, value);
         }
     }
 
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
deleted file mode 100644
index 94aa465af..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/ArrayMapping.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import javax.xml.namespace.QName;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Array Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.ArrayMapping#getInnerType <em>Inner Type</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface ArrayMapping extends Mapping {
-    /**
-     * Returns the value of the '<em><b>Inner Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Inner Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Inner Type</em>' attribute.
-     * @see #setInnerType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getInnerType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.ArrayMapping#getInnerType <em>Inner Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Inner Type</em>' attribute.
-     * @see #getInnerType()
-     * @generated
-     */
-    void setInnerType(QName value);
-
-} // ArrayMapping
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
deleted file mode 100644
index 651df1a13..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/BeanMapping.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Bean Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @model
- * @generated
- */
-public interface BeanMapping extends Mapping {
-} // BeanMapping
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
deleted file mode 100644
index 2b728cf61..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-import javax.xml.namespace.QName;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Flow</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Chain {
-
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-    void setType(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Handler}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Handlers</em>' reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Handlers</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Handler" containment="true"
-     *        extendedMetaData="name='handler' kind='element' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getHandlers();
-} // Flow
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
deleted file mode 100644
index 9710fa3c2..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/DeployableItem.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deployable Item</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow <em>Request Flow</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow <em>Response Flow</em>}</li>
- * </ul>
- * </p>
- *
- * @model abstract="true"
- * @generated
- */
-public interface DeployableItem extends Parameterizable {
-    /**
-     * Returns the value of the '<em><b>Request Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Request Flow</em>' reference isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Request Flow</em>' containment reference.
-     * @see #setRequestFlow(Chain)
-     * @model containment="true"
-     *        extendedMetaData="kind='element' name='requestFlow' namespace='##targetNamespace'"
-     * @generated
-     */
-    Chain getRequestFlow();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow <em>Request Flow</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Request Flow</em>' containment reference.
-     * @see #getRequestFlow()
-     * @generated
-     */
-    void setRequestFlow(Chain value);
-
-    /**
-     * Returns the value of the '<em><b>Response Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Response Flow</em>' reference isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Response Flow</em>' containment reference.
-     * @see #setResponseFlow(Chain)
-     * @model containment="true"
-     *        extendedMetaData="kind='element' name='responseFlow' namespace='##targetNamespace'"
-     * @generated
-     */
-    Chain getResponseFlow();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow <em>Response Flow</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Response Flow</em>' containment reference.
-     * @see #getResponseFlow()
-     * @generated
-     */
-    void setResponseFlow(Chain value);
-
-} // DeployableItem
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
deleted file mode 100644
index 3efe9fb8d..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Deployment.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Deployment</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Deployment#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration <em>Global Configuration</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Deployment#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Deployment#getTransports <em>Transports</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Deployment#getServices <em>Services</em>}</li>
- * </ul>
- * </p>
- *
- * @model extendedMetaData="name='deployment' kind='element'"
- * @generated
- */
-public interface Deployment extends MappingContainer {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Deployment#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Global Configuration</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Global Configuration</em>' containment reference isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Global Configuration</em>' containment reference.
-     * @see #setGlobalConfiguration(GlobalConfiguration)
-     * @model containment="true"
-     *        extendedMetaData="kind='element' name='globalConfiguration' namespace='##targetNamespace'"
-     * @generated
-     */
-    GlobalConfiguration getGlobalConfiguration();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration <em>Global Configuration</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Global Configuration</em>' containment reference.
-     * @see #getGlobalConfiguration()
-     * @generated
-     */
-    void setGlobalConfiguration(GlobalConfiguration value);
-
-    /**
-     * Returns the value of the '<em><b>Handlers</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Handler}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Handlers</em>' reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Handlers</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Handler" containment="true"
-     *        extendedMetaData="name='handler' kind='element' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getHandlers();
-
-    /**
-     * Returns the value of the '<em><b>Transports</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Transport}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Transports</em>' reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Transports</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Transport" containment="true"
-     *        extendedMetaData="name='transport' kind='element' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getTransports();
-
-    /**
-     * Returns the value of the '<em><b>Services</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Service}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Services</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Services</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Service" containment="true"
-     *        extendedMetaData="name='service' kind='element' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getServices();
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @model otherRequired="true"
-     * @generated
-     */
-    void merge(Deployment other);
-
-} // Deployment
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
deleted file mode 100644
index 850353c92..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Fault.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import javax.xml.namespace.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Fault#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Fault#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Fault#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Fault#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Fault {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Fault#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Qname</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Qname</em>' attribute.
-     * @see #setQname(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getQname();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Fault#getQname <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Qname</em>' attribute.
-     * @see #getQname()
-     * @generated
-     */
-    void setQname(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Class</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Class</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Class</em>' attribute.
-     * @see #setClass(String)
-     * @model
-     * @generated
-     */
-    String getClass_();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Fault#getClass_ <em>Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Class</em>' attribute.
-     * @see #getClass_()
-     * @generated
-     */
-    void setClass(String value);
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Fault#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-    void setType(QName value);
-
-} // Fault
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
deleted file mode 100644
index e4e546a77..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/GlobalConfiguration.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Global Configuration</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @model
- * @generated
- */
-public interface GlobalConfiguration extends DeployableItem {
-} // GlobalConfiguration
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
deleted file mode 100644
index 82e4fb26d..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Handler.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import javax.xml.namespace.QName;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Handler#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Handler#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Handler extends Parameterizable {
-
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Handler#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Handler#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-    void setType(QName value);
-} // Handler
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
deleted file mode 100644
index 661d8e802..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Mapping.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import javax.xml.namespace.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Mapping#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Mapping#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Mapping#getEncodingStyle <em>Encoding Style</em>}</li>
- * </ul>
- * </p>
- *
- * @model abstract="true"
- * @generated
- */
-public interface Mapping {
-    /**
-     * Returns the value of the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Qname</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Qname</em>' attribute.
-     * @see #setQname(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getQname();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Mapping#getQname <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Qname</em>' attribute.
-     * @see #getQname()
-     * @generated
-     */
-    void setQname(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Mapping#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-    void setType(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Encoding Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Encoding Style</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Encoding Style</em>' attribute.
-     * @see #setEncodingStyle(String)
-     * @model
-     * @generated
-     */
-    String getEncodingStyle();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Mapping#getEncodingStyle <em>Encoding Style</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Encoding Style</em>' attribute.
-     * @see #getEncodingStyle()
-     * @generated
-     */
-    void setEncodingStyle(String value);
-
-} // Mapping
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java
deleted file mode 100644
index 93f83221e..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/MappingContainer.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Mapping Container</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.MappingContainer#getTypeMappings <em>Type Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.MappingContainer#getBeanMappings <em>Bean Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.MappingContainer#getArrayMappings <em>Array Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface MappingContainer {
-    /**
-     * Returns the value of the '<em><b>Type Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.TypeMapping}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type Mappings</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.TypeMapping" containment="true"
-     *        extendedMetaData="kind='element' name='typeMapping' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getTypeMappings();
-
-    /**
-     * Returns the value of the '<em><b>Bean Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.BeanMapping}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Bean Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Bean Mappings</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.BeanMapping" containment="true"
-     *        extendedMetaData="kind='element' name='beanMapping' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getBeanMappings();
-
-    /**
-     * Returns the value of the '<em><b>Array Mappings</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.ArrayMapping}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Array Mappings</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Array Mappings</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.ArrayMapping" containment="true"
-     *        extendedMetaData="kind='element' name='arrayMapping' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getArrayMappings();
-
-} // MappingContainer
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
deleted file mode 100644
index 7769b3567..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Operation.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-import javax.xml.namespace.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getReturnQName <em>Return QName</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getReturnItemQName <em>Return Item QName</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getReturnItemType <em>Return Item Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getSoapAction <em>Soap Action</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getMep <em>Mep</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getReturnHeader <em>Return Header</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Operation#getFaults <em>Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Operation {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Qname</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Qname</em>' attribute.
-     * @see #setQname(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getQname();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getQname <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Qname</em>' attribute.
-     * @see #getQname()
-     * @generated
-     */
-    void setQname(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Return QName</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Return QName</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Return QName</em>' attribute.
-     * @see #setReturnQName(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getReturnQName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnQName <em>Return QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Return QName</em>' attribute.
-     * @see #getReturnQName()
-     * @generated
-     */
-    void setReturnQName(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Return Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Return Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Return Type</em>' attribute.
-     * @see #setReturnType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getReturnType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnType <em>Return Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Return Type</em>' attribute.
-     * @see #getReturnType()
-     * @generated
-     */
-    void setReturnType(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Return Item QName</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Return Item QName</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Return Item QName</em>' attribute.
-     * @see #setReturnItemQName(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getReturnItemQName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnItemQName <em>Return Item QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Return Item QName</em>' attribute.
-     * @see #getReturnItemQName()
-     * @generated
-     */
-    void setReturnItemQName(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Return Item Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Return Item Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Return Item Type</em>' attribute.
-     * @see #setReturnItemType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getReturnItemType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnItemType <em>Return Item Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Return Item Type</em>' attribute.
-     * @see #getReturnItemType()
-     * @generated
-     */
-    void setReturnItemType(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Soap Action</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Soap Action</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Soap Action</em>' attribute.
-     * @see #setSoapAction(String)
-     * @model
-     * @generated
-     */
-    String getSoapAction();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getSoapAction <em>Soap Action</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Soap Action</em>' attribute.
-     * @see #getSoapAction()
-     * @generated
-     */
-    void setSoapAction(String value);
-
-    /**
-     * Returns the value of the '<em><b>Mep</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Mep</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Mep</em>' attribute.
-     * @see #setMep(String)
-     * @model
-     * @generated
-     */
-    String getMep();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getMep <em>Mep</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Mep</em>' attribute.
-     * @see #getMep()
-     * @generated
-     */
-    void setMep(String value);
-
-    /**
-     * Returns the value of the '<em><b>Return Header</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Return Header</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Return Header</em>' attribute.
-     * @see #setReturnHeader(Boolean)
-     * @model
-     * @generated
-     */
-    Boolean getReturnHeader();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Operation#getReturnHeader <em>Return Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Return Header</em>' attribute.
-     * @see #getReturnHeader()
-     * @generated
-     */
-    void setReturnHeader(Boolean value);
-
-    /**
-     * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.OperationParameter}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Parameters</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.OperationParameter" containment="true"
-     *        extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getParameters();
-
-    /**
-     * Returns the value of the '<em><b>Faults</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Fault}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Faults</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Faults</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Fault" containment="true"
-     *        extendedMetaData="kind='element' name='fault' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getFaults();
-
-} // Operation
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
deleted file mode 100644
index 0820d4f5f..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/OperationParameter.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import javax.xml.namespace.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Operation Parameter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getMode <em>Mode</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getInHeader <em>In Header</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getOutHeader <em>Out Header</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.OperationParameter#getItemQName <em>Item QName</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface OperationParameter {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Qname</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Qname</em>' attribute.
-     * @see #setQname(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getQname();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getQname <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Qname</em>' attribute.
-     * @see #getQname()
-     * @generated
-     */
-    void setQname(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Type</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Type</em>' attribute.
-     * @see #setType(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getType();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getType <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Type</em>' attribute.
-     * @see #getType()
-     * @generated
-     */
-    void setType(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Mode</b></em>' attribute.
-     * The literals are from the enumeration {@link org.apache.axis.model.wsdd.ParameterMode}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Mode</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Mode</em>' attribute.
-     * @see org.apache.axis.model.wsdd.ParameterMode
-     * @see #setMode(ParameterMode)
-     * @model
-     * @generated
-     */
-    ParameterMode getMode();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getMode <em>Mode</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Mode</em>' attribute.
-     * @see org.apache.axis.model.wsdd.ParameterMode
-     * @see #getMode()
-     * @generated
-     */
-    void setMode(ParameterMode value);
-
-    /**
-     * Returns the value of the '<em><b>In Header</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>In Header</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>In Header</em>' attribute.
-     * @see #setInHeader(Boolean)
-     * @model
-     * @generated
-     */
-    Boolean getInHeader();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getInHeader <em>In Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>In Header</em>' attribute.
-     * @see #getInHeader()
-     * @generated
-     */
-    void setInHeader(Boolean value);
-
-    /**
-     * Returns the value of the '<em><b>Out Header</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Out Header</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Out Header</em>' attribute.
-     * @see #setOutHeader(Boolean)
-     * @model
-     * @generated
-     */
-    Boolean getOutHeader();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getOutHeader <em>Out Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Out Header</em>' attribute.
-     * @see #getOutHeader()
-     * @generated
-     */
-    void setOutHeader(Boolean value);
-
-    /**
-     * Returns the value of the '<em><b>Item QName</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Item QName</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Item QName</em>' attribute.
-     * @see #setItemQName(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getItemQName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.OperationParameter#getItemQName <em>Item QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Item QName</em>' attribute.
-     * @see #getItemQName()
-     * @generated
-     */
-    void setItemQName(QName value);
-
-} // OperationParameter
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
deleted file mode 100644
index 475e4e368..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameter.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameter</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Parameter#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Parameter#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Parameter {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Parameter#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Value</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Value</em>' attribute.
-     * @see #setValue(String)
-     * @model
-     * @generated
-     */
-    String getValue();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Parameter#getValue <em>Value</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Value</em>' attribute.
-     * @see #getValue()
-     * @generated
-     */
-    void setValue(String value);
-
-} // Parameter
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
deleted file mode 100644
index 129488839..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/ParameterMode.java
+++ /dev/null
@@ -1,194 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>Parameter Mode</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterMode()
- * @model
- * @generated
- */
-public final class ParameterMode extends InternalParameterMode {
-    /**
-     * The '<em><b>IN</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>IN</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #IN_LITERAL
-     * @model
-     * @generated
-     * @ordered
-     */
-    public static final int IN = 1;
-
-    /**
-     * The '<em><b>OUT</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>OUT</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #OUT_LITERAL
-     * @model
-     * @generated
-     * @ordered
-     */
-    public static final int OUT = 2;
-
-    /**
-     * The '<em><b>INOUT</b></em>' literal value.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of '<em><b>INOUT</b></em>' literal object isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @see #INOUT_LITERAL
-     * @model
-     * @generated
-     * @ordered
-     */
-    public static final int INOUT = 3;
-
-    /**
-     * The '<em><b>IN</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #IN
-     * @generated
-     * @ordered
-     */
-    public static final ParameterMode IN_LITERAL = new ParameterMode(IN, "IN", "IN");
-
-    /**
-     * The '<em><b>OUT</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #OUT
-     * @generated
-     * @ordered
-     */
-    public static final ParameterMode OUT_LITERAL = new ParameterMode(OUT, "OUT", "OUT");
-
-    /**
-     * The '<em><b>INOUT</b></em>' literal object.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #INOUT
-     * @generated
-     * @ordered
-     */
-    public static final ParameterMode INOUT_LITERAL = new ParameterMode(INOUT, "INOUT", "INOUT");
-
-    /**
-     * An array of all the '<em><b>Parameter Mode</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static final ParameterMode[] VALUES_ARRAY =
-        new ParameterMode[] {
-            IN_LITERAL,
-            OUT_LITERAL,
-            INOUT_LITERAL,
-        };
-
-    /**
-     * A public read-only list of all the '<em><b>Parameter Mode</b></em>' enumerators.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-    /**
-     * Returns the '<em><b>Parameter Mode</b></em>' literal with the specified literal value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static ParameterMode get(String literal) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            ParameterMode result = VALUES_ARRAY[i];
-            if (result.toString().equals(literal)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Parameter Mode</b></em>' literal with the specified name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static ParameterMode getByName(String name) {
-        for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-            ParameterMode result = VALUES_ARRAY[i];
-            if (result.getName().equals(name)) {
-                return result;
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns the '<em><b>Parameter Mode</b></em>' literal with the specified integer value.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static ParameterMode get(int value) {
-        switch (value) {
-            case IN: return IN_LITERAL;
-            case OUT: return OUT_LITERAL;
-            case INOUT: return INOUT_LITERAL;
-        }
-        return null;
-    }
-
-    /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private ParameterMode(int value, String name, String literal) {
-        super(value, name, literal);
-    }
-
-} //ParameterMode
-
-/**
- * A private implementation class to construct the instances.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
-class InternalParameterMode extends org.eclipse.emf.common.util.AbstractEnumerator {
-    /**
-     * Only this class can construct instances.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected InternalParameterMode(int value, String name, String literal) {
-        super(value, name, literal);
-    }
-}
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
deleted file mode 100644
index 85e607b11..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Parameterizable.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Parameterizable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Parameterizable#getParameters <em>Parameters</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Parameterizable {
-    /**
-     * Returns the value of the '<em><b>Parameters</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Parameter}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Parameters</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Parameters</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Parameter" containment="true"
-     *        extendedMetaData="kind='element' name='parameter' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getParameters();
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @model nameRequired="true" valueRequired="true"
-     * @generated
-     */
-    void setParameter(String name, String value);
-
-} // Parameterizable
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
deleted file mode 100644
index 3146ae25c..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Service.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import java.util.List;
-import javax.xml.namespace.QName;
-import org.apache.axis.constants.Style;
-import org.apache.axis.constants.Use;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Service</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getProvider <em>Provider</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getUse <em>Use</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getStyle <em>Style</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getNamespaces <em>Namespaces</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Service#getOperations <em>Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Service extends DeployableItem, MappingContainer {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Provider</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Provider</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Provider</em>' attribute.
-     * @see #setProvider(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getProvider();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getProvider <em>Provider</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Provider</em>' attribute.
-     * @see #getProvider()
-     * @generated
-     */
-    void setProvider(QName value);
-
-    /**
-     * Returns the value of the '<em><b>Use</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Use</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Use</em>' attribute.
-     * @see #setUse(Use)
-     * @model dataType="org.apache.axis.model.soap.Use"
-     * @generated
-     */
-    Use getUse();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getUse <em>Use</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Use</em>' attribute.
-     * @see #getUse()
-     * @generated
-     */
-    void setUse(Use value);
-
-    /**
-     * Returns the value of the '<em><b>Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Style</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Style</em>' attribute.
-     * @see #setStyle(Style)
-     * @model dataType="org.apache.axis.model.soap.Style"
-     * @generated
-     */
-    Style getStyle();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Service#getStyle <em>Style</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Style</em>' attribute.
-     * @see #getStyle()
-     * @generated
-     */
-    void setStyle(Style value);
-
-    /**
-     * Returns the value of the '<em><b>Namespaces</b></em>' attribute list.
-     * The list contents are of type {@link java.lang.String}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Namespaces</em>' attribute list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Namespaces</em>' attribute list.
-     * @model extendedMetaData="kind='element' name='namespace' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getNamespaces();
-
-    /**
-     * Returns the value of the '<em><b>Operations</b></em>' containment reference list.
-     * The list contents are of type {@link org.apache.axis.model.wsdd.Operation}.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Operations</em>' containment reference list isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Operations</em>' containment reference list.
-     * @model type="org.apache.axis.model.wsdd.Operation" containment="true"
-     *        extendedMetaData="kind='element' name='operation' namespace='##targetNamespace'"
-     * @generated
-     */
-    List getOperations();
-
-} // Service
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
deleted file mode 100644
index a05803992..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/Transport.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-import javax.xml.namespace.QName;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Transport</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.Transport#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.Transport#getPivot <em>Pivot</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface Transport extends DeployableItem {
-    /**
-     * Returns the value of the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Name</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Name</em>' attribute.
-     * @see #setName(String)
-     * @model
-     * @generated
-     */
-    String getName();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Transport#getName <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Name</em>' attribute.
-     * @see #getName()
-     * @generated
-     */
-    void setName(String value);
-
-    /**
-     * Returns the value of the '<em><b>Pivot</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Pivot</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Pivot</em>' attribute.
-     * @see #setPivot(QName)
-     * @model dataType="org.apache.axis.model.xml.QName"
-     * @generated
-     */
-    QName getPivot();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.Transport#getPivot <em>Pivot</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Pivot</em>' attribute.
-     * @see #getPivot()
-     * @generated
-     */
-    void setPivot(QName value);
-
-} // Transport
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
deleted file mode 100644
index a89f3ca9d..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/TypeMapping.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Type Mapping</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.TypeMapping#getSerializer <em>Serializer</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.TypeMapping#getDeserializer <em>Deserializer</em>}</li>
- * </ul>
- * </p>
- *
- * @model
- * @generated
- */
-public interface TypeMapping extends Mapping {
-    /**
-     * Returns the value of the '<em><b>Serializer</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Serializer</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Serializer</em>' attribute.
-     * @see #setSerializer(String)
-     * @model
-     * @generated
-     */
-    String getSerializer();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.TypeMapping#getSerializer <em>Serializer</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Serializer</em>' attribute.
-     * @see #getSerializer()
-     * @generated
-     */
-    void setSerializer(String value);
-
-    /**
-     * Returns the value of the '<em><b>Deserializer</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <p>
-     * If the meaning of the '<em>Deserializer</em>' attribute isn't clear,
-     * there really should be more of a description here...
-     * </p>
-     * <!-- end-user-doc -->
-     * @return the value of the '<em>Deserializer</em>' attribute.
-     * @see #setDeserializer(String)
-     * @model
-     * @generated
-     */
-    String getDeserializer();
-
-    /**
-     * Sets the value of the '{@link org.apache.axis.model.wsdd.TypeMapping#getDeserializer <em>Deserializer</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @param value the new value of the '<em>Deserializer</em>' attribute.
-     * @see #getDeserializer()
-     * @generated
-     */
-    void setDeserializer(String value);
-
-} // TypeMapping
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
deleted file mode 100644
index 7e2c46c4c..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/WSDDFactory.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface WSDDFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    WSDDFactory INSTANCE = org.apache.axis.model.wsdd.impl.WSDDFactoryImpl.eINSTANCE;
-    /**
-     * Returns a new object of class '<em>Parameter</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Parameter</em>'.
-     * @generated
-     */
-    Parameter createParameter();
-
-    /**
-     * Returns a new object of class '<em>Type Mapping</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Type Mapping</em>'.
-     * @generated
-     */
-    TypeMapping createTypeMapping();
-
-    /**
-     * Returns a new object of class '<em>Array Mapping</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Array Mapping</em>'.
-     * @generated
-     */
-    ArrayMapping createArrayMapping();
-
-    /**
-     * Returns a new object of class '<em>Bean Mapping</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Bean Mapping</em>'.
-     * @generated
-     */
-    BeanMapping createBeanMapping();
-
-    /**
-     * Returns a new object of class '<em>Mapping Container</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Mapping Container</em>'.
-     * @generated
-     */
-    MappingContainer createMappingContainer();
-
-    /**
-     * Returns a new object of class '<em>Operation Parameter</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Operation Parameter</em>'.
-     * @generated
-     */
-    OperationParameter createOperationParameter();
-
-    /**
-     * Returns a new object of class '<em>Fault</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Fault</em>'.
-     * @generated
-     */
-    Fault createFault();
-
-    /**
-     * Returns a new object of class '<em>Operation</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Operation</em>'.
-     * @generated
-     */
-    Operation createOperation();
-
-    /**
-     * Returns a new object of class '<em>Parameterizable</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Parameterizable</em>'.
-     * @generated
-     */
-    Parameterizable createParameterizable();
-
-    /**
-     * Returns a new object of class '<em>Handler</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Handler</em>'.
-     * @generated
-     */
-    Handler createHandler();
-
-    /**
-     * Returns a new object of class '<em>Chain</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Chain</em>'.
-     * @generated
-     */
-    Chain createChain();
-
-    /**
-     * Returns a new object of class '<em>Global Configuration</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Global Configuration</em>'.
-     * @generated
-     */
-    GlobalConfiguration createGlobalConfiguration();
-
-    /**
-     * Returns a new object of class '<em>Transport</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Transport</em>'.
-     * @generated
-     */
-    Transport createTransport();
-
-    /**
-     * Returns a new object of class '<em>Service</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Service</em>'.
-     * @generated
-     */
-    Service createService();
-
-    /**
-     * Returns a new object of class '<em>Deployment</em>'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return a new object of class '<em>Deployment</em>'.
-     * @generated
-     */
-    Deployment createDeployment();
-
-} //WSDDFactory
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
deleted file mode 100644
index 32f2bd983..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ArrayMappingImpl.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.ArrayMapping;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Array Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ArrayMappingImpl#getInnerType <em>Inner Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ArrayMappingImpl extends MappingImpl implements ArrayMapping {
-    /**
-     * The default value of the '{@link #getInnerType() <em>Inner Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getInnerType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName INNER_TYPE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getInnerType() <em>Inner Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getInnerType()
-     * @generated
-     * @ordered
-     */
-    protected QName innerType = INNER_TYPE_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ArrayMappingImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.ARRAY_MAPPING;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getInnerType() {
-        return innerType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setInnerType(QName newInnerType) {
-        innerType = newInnerType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
-                return getInnerType();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
-                setInnerType((QName)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
-                setInnerType(INNER_TYPE_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.ARRAY_MAPPING__INNER_TYPE:
-                return INNER_TYPE_EDEFAULT == null ? innerType != null : !INNER_TYPE_EDEFAULT.equals(innerType);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (innerType: ");
-        result.append(innerType);
-        result.append(')');
-        return result.toString();
-    }
-
-} //ArrayMappingImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
deleted file mode 100644
index 9065ed225..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/BeanMappingImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.wsdd.BeanMapping;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Bean Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class BeanMappingImpl extends MappingImpl implements BeanMapping {
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected BeanMappingImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.BEAN_MAPPING;
-    }
-
-} //BeanMappingImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
deleted file mode 100644
index 76afa77b4..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-import java.util.List;
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.Chain;
-
-import org.apache.axis.model.wsdd.Handler;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Flow</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getHandlers <em>Handlers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ChainImpl extends EObjectImpl implements Chain {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-    /**
-     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName TYPE_EDEFAULT = null;
-    /**
-     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected QName type = TYPE_EDEFAULT;
-    /**
-     * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getHandlers()
-     * @generated
-     * @ordered
-     */
-    protected EList handlers;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ChainImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.CHAIN;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setType(QName newType) {
-        type = newType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getHandlers() {
-        if (handlers == null) {
-            handlers = new BasicInternalEList(Handler.class);
-        }
-        return handlers;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.CHAIN__HANDLERS:
-                return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.CHAIN__NAME:
-                return getName();
-            case WSDDPackageImpl.CHAIN__TYPE:
-                return getType();
-            case WSDDPackageImpl.CHAIN__HANDLERS:
-                return getHandlers();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.CHAIN__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.CHAIN__TYPE:
-                setType((QName)newValue);
-                return;
-            case WSDDPackageImpl.CHAIN__HANDLERS:
-                getHandlers().clear();
-                getHandlers().addAll((Collection)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.CHAIN__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.CHAIN__TYPE:
-                setType(TYPE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.CHAIN__HANDLERS:
-                getHandlers().clear();
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.CHAIN__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.CHAIN__TYPE:
-                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-            case WSDDPackageImpl.CHAIN__HANDLERS:
-                return handlers != null && !handlers.isEmpty();
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", type: ");
-        result.append(type);
-        result.append(')');
-        return result.toString();
-    }
-
-} //FlowImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
deleted file mode 100644
index ae94f6b50..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeployableItemImpl.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.wsdd.DeployableItem;
-
-import org.apache.axis.model.wsdd.Chain;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.InternalEObject;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deployable Item</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl#getRequestFlow <em>Request Flow</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl#getResponseFlow <em>Response Flow</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class DeployableItemImpl extends ParameterizableImpl implements DeployableItem {
-    /**
-     * The cached value of the '{@link #getRequestFlow() <em>Request Flow</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getRequestFlow()
-     * @generated
-     * @ordered
-     */
-    protected Chain requestFlow;
-    /**
-     * The cached value of the '{@link #getResponseFlow() <em>Response Flow</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getResponseFlow()
-     * @generated
-     * @ordered
-     */
-    protected Chain responseFlow;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected DeployableItemImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.DEPLOYABLE_ITEM;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Chain getRequestFlow() {
-        return requestFlow;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain basicSetRequestFlow(Chain newRequestFlow, NotificationChain msgs) {
-        Chain oldRequestFlow = requestFlow;
-        requestFlow = newRequestFlow;
-        return msgs;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setRequestFlow(Chain newRequestFlow) {
-        if (newRequestFlow != requestFlow) {
-            NotificationChain msgs = null;
-            if (requestFlow != null)
-                msgs = ((InternalEObject)requestFlow).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW, null, msgs);
-            if (newRequestFlow != null)
-                msgs = ((InternalEObject)newRequestFlow).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW, null, msgs);
-            msgs = basicSetRequestFlow(newRequestFlow, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Chain getResponseFlow() {
-        return responseFlow;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain basicSetResponseFlow(Chain newResponseFlow, NotificationChain msgs) {
-        Chain oldResponseFlow = responseFlow;
-        responseFlow = newResponseFlow;
-        return msgs;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setResponseFlow(Chain newResponseFlow) {
-        if (newResponseFlow != responseFlow) {
-            NotificationChain msgs = null;
-            if (responseFlow != null)
-                msgs = ((InternalEObject)responseFlow).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW, null, msgs);
-            if (newResponseFlow != null)
-                msgs = ((InternalEObject)newResponseFlow).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW, null, msgs);
-            msgs = basicSetResponseFlow(newResponseFlow, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                return basicSetRequestFlow(null, msgs);
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                return basicSetResponseFlow(null, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                return getRequestFlow();
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                return getResponseFlow();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                setRequestFlow((Chain)newValue);
-                return;
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                setResponseFlow((Chain)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                setRequestFlow((Chain)null);
-                return;
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                setResponseFlow((Chain)null);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__REQUEST_FLOW:
-                return requestFlow != null;
-            case WSDDPackageImpl.DEPLOYABLE_ITEM__RESPONSE_FLOW:
-                return responseFlow != null;
-        }
-        return super.eIsSet(featureID);
-    }
-
-} //DeployableItemImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
deleted file mode 100644
index 3cff4c809..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-
-import java.util.List;
-import org.apache.axis.model.wsdd.Deployment;
-import org.apache.axis.model.wsdd.GlobalConfiguration;
-import org.apache.axis.model.wsdd.Handler;
-import org.apache.axis.model.wsdd.Service;
-
-import org.apache.axis.model.wsdd.Transport;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Deployment</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getGlobalConfiguration <em>Global Configuration</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getHandlers <em>Handlers</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getTransports <em>Transports</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.DeploymentImpl#getServices <em>Services</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DeploymentImpl extends MappingContainerImpl implements Deployment {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-    /**
-     * The cached value of the '{@link #getGlobalConfiguration() <em>Global Configuration</em>}' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getGlobalConfiguration()
-     * @generated
-     * @ordered
-     */
-    protected GlobalConfiguration globalConfiguration;
-    /**
-     * The cached value of the '{@link #getHandlers() <em>Handlers</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getHandlers()
-     * @generated
-     * @ordered
-     */
-    protected EList handlers;
-    /**
-     * The cached value of the '{@link #getTransports() <em>Transports</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTransports()
-     * @generated
-     * @ordered
-     */
-    protected EList transports;
-    /**
-     * The cached value of the '{@link #getServices() <em>Services</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getServices()
-     * @generated
-     * @ordered
-     */
-    protected EList services;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected DeploymentImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.DEPLOYMENT;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public GlobalConfiguration getGlobalConfiguration() {
-        return globalConfiguration;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain basicSetGlobalConfiguration(GlobalConfiguration newGlobalConfiguration, NotificationChain msgs) {
-        GlobalConfiguration oldGlobalConfiguration = globalConfiguration;
-        globalConfiguration = newGlobalConfiguration;
-        return msgs;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setGlobalConfiguration(GlobalConfiguration newGlobalConfiguration) {
-        if (newGlobalConfiguration != globalConfiguration) {
-            NotificationChain msgs = null;
-            if (globalConfiguration != null)
-                msgs = ((InternalEObject)globalConfiguration).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION, null, msgs);
-            if (newGlobalConfiguration != null)
-                msgs = ((InternalEObject)newGlobalConfiguration).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION, null, msgs);
-            msgs = basicSetGlobalConfiguration(newGlobalConfiguration, msgs);
-            if (msgs != null) msgs.dispatch();
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getHandlers() {
-        if (handlers == null) {
-            handlers = new BasicInternalEList(Handler.class);
-        }
-        return handlers;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getTransports() {
-        if (transports == null) {
-            transports = new BasicInternalEList(Transport.class);
-        }
-        return transports;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getServices() {
-        if (services == null) {
-            services = new BasicInternalEList(Service.class);
-        }
-        return services;
-    }
-
-    public void merge(Deployment other) {
-        // TODO: very naive implementation; need more fine grained merging
-        GlobalConfiguration otherGlobalConfiguration = other.getGlobalConfiguration();
-        if (otherGlobalConfiguration != null) {
-            setGlobalConfiguration(otherGlobalConfiguration);
-        }
-        getHandlers().addAll(other.getHandlers());
-        getTransports().addAll(other.getTransports());
-        getServices().addAll(other.getServices());
-        getTypeMappings().addAll(other.getTypeMappings());
-        getBeanMappings().addAll(other.getBeanMappings());
-        getArrayMappings().addAll(other.getArrayMappings());
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
-                return basicSetGlobalConfiguration(null, msgs);
-            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
-                return ((InternalEList)getHandlers()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
-                return ((InternalEList)getTransports()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.DEPLOYMENT__SERVICES:
-                return ((InternalEList)getServices()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYMENT__NAME:
-                return getName();
-            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
-                return getGlobalConfiguration();
-            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
-                return getHandlers();
-            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
-                return getTransports();
-            case WSDDPackageImpl.DEPLOYMENT__SERVICES:
-                return getServices();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYMENT__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
-                setGlobalConfiguration((GlobalConfiguration)newValue);
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
-                getHandlers().clear();
-                getHandlers().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
-                getTransports().clear();
-                getTransports().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__SERVICES:
-                getServices().clear();
-                getServices().addAll((Collection)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYMENT__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
-                setGlobalConfiguration((GlobalConfiguration)null);
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
-                getHandlers().clear();
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
-                getTransports().clear();
-                return;
-            case WSDDPackageImpl.DEPLOYMENT__SERVICES:
-                getServices().clear();
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.DEPLOYMENT__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.DEPLOYMENT__GLOBAL_CONFIGURATION:
-                return globalConfiguration != null;
-            case WSDDPackageImpl.DEPLOYMENT__HANDLERS:
-                return handlers != null && !handlers.isEmpty();
-            case WSDDPackageImpl.DEPLOYMENT__TRANSPORTS:
-                return transports != null && !transports.isEmpty();
-            case WSDDPackageImpl.DEPLOYMENT__SERVICES:
-                return services != null && !services.isEmpty();
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(')');
-        return result.toString();
-    }
-
-} //DeploymentImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
deleted file mode 100644
index ba5b82cfc..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/FaultImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.Fault;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Fault</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.FaultImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.FaultImpl#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.FaultImpl#getClass_ <em>Class</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.FaultImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FaultImpl extends EObjectImpl implements Fault {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected static final QName QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected QName qname = QNAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getClass_() <em>Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClass_()
-     * @generated
-     * @ordered
-     */
-    protected static final String CLASS_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getClass_() <em>Class</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getClass_()
-     * @generated
-     * @ordered
-     */
-    protected String class_ = CLASS_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName TYPE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected QName type = TYPE_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected FaultImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.FAULT;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getQname() {
-        return qname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setQname(QName newQname) {
-        qname = newQname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getClass_() {
-        return class_;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setClass(String newClass) {
-        class_ = newClass;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setType(QName newType) {
-        type = newType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.FAULT__NAME:
-                return getName();
-            case WSDDPackageImpl.FAULT__QNAME:
-                return getQname();
-            case WSDDPackageImpl.FAULT__CLASS:
-                return getClass_();
-            case WSDDPackageImpl.FAULT__TYPE:
-                return getType();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.FAULT__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.FAULT__QNAME:
-                setQname((QName)newValue);
-                return;
-            case WSDDPackageImpl.FAULT__CLASS:
-                setClass((String)newValue);
-                return;
-            case WSDDPackageImpl.FAULT__TYPE:
-                setType((QName)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.FAULT__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.FAULT__QNAME:
-                setQname(QNAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.FAULT__CLASS:
-                setClass(CLASS_EDEFAULT);
-                return;
-            case WSDDPackageImpl.FAULT__TYPE:
-                setType(TYPE_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.FAULT__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.FAULT__QNAME:
-                return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
-            case WSDDPackageImpl.FAULT__CLASS:
-                return CLASS_EDEFAULT == null ? class_ != null : !CLASS_EDEFAULT.equals(class_);
-            case WSDDPackageImpl.FAULT__TYPE:
-                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", qname: ");
-        result.append(qname);
-        result.append(", class: ");
-        result.append(class_);
-        result.append(", type: ");
-        result.append(type);
-        result.append(')');
-        return result.toString();
-    }
-
-} //FaultImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
deleted file mode 100644
index 29481371f..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/GlobalConfigurationImpl.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.wsdd.GlobalConfiguration;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Global Configuration</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * </p>
- *
- * @generated
- */
-public class GlobalConfigurationImpl extends DeployableItemImpl implements GlobalConfiguration {
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected GlobalConfigurationImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.GLOBAL_CONFIGURATION;
-    }
-
-} //GlobalConfigurationImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
deleted file mode 100644
index fa7620670..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/HandlerImpl.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.Handler;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Handler</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.HandlerImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.HandlerImpl#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class HandlerImpl extends ParameterizableImpl implements Handler {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-    /**
-     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName TYPE_EDEFAULT = null;
-    /**
-     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected QName type = TYPE_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected HandlerImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.HANDLER;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setType(QName newType) {
-        type = newType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.HANDLER__NAME:
-                return getName();
-            case WSDDPackageImpl.HANDLER__TYPE:
-                return getType();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.HANDLER__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.HANDLER__TYPE:
-                setType((QName)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.HANDLER__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.HANDLER__TYPE:
-                setType(TYPE_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.HANDLER__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.HANDLER__TYPE:
-                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", type: ");
-        result.append(type);
-        result.append(')');
-        return result.toString();
-    }
-
-} //HandlerImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/Helper.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/Helper.java
new file mode 100644
index 000000000..620f92d39
--- /dev/null
+++ b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/Helper.java
@@ -0,0 +1,59 @@
+/*
+ * 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.axis.model.wsdd.impl;
+
+import java.util.Iterator;
+
+import org.apache.axis.model.wsdd.Deployment;
+import org.apache.axis.model.wsdd.GlobalConfiguration;
+import org.apache.axis.model.wsdd.Parameter;
+import org.apache.axis.model.wsdd.Parameterizable;
+import org.apache.axis.model.wsdd.WSDDFactory;
+
+final class Helper {
+    private Helper() {}
+
+    static void merge(Deployment that, Deployment other) {
+        // TODO: very naive implementation; need more fine grained merging
+        GlobalConfiguration otherGlobalConfiguration = other.getGlobalConfiguration();
+        if (otherGlobalConfiguration != null) {
+            that.setGlobalConfiguration(otherGlobalConfiguration);
+        }
+        that.getHandlers().addAll(other.getHandlers());
+        that.getTransports().addAll(other.getTransports());
+        that.getServices().addAll(other.getServices());
+        that.getTypeMappings().addAll(other.getTypeMappings());
+        that.getBeanMappings().addAll(other.getBeanMappings());
+        that.getArrayMappings().addAll(other.getArrayMappings());
+    }
+
+    static void setParameter(Parameterizable that, String name, String value) {
+        for (Iterator it = that.getParameters().iterator(); it.hasNext(); ) {
+            Parameter param = (Parameter)it.next();
+            if (name.equals(param.getName())) {
+                param.setValue(value);
+                return;
+            }
+        }
+        Parameter param = WSDDFactory.INSTANCE.createParameter();
+        param.setName(name);
+        param.setValue(value);
+        that.getParameters().add(param);
+    }
+}
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java
deleted file mode 100644
index ec705b905..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingContainerImpl.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.axis.model.wsdd.ArrayMapping;
-import org.apache.axis.model.wsdd.BeanMapping;
-import org.apache.axis.model.wsdd.MappingContainer;
-import org.apache.axis.model.wsdd.TypeMapping;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mapping Container</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl#getTypeMappings <em>Type Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl#getBeanMappings <em>Bean Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl#getArrayMappings <em>Array Mappings</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class MappingContainerImpl extends EObjectImpl implements MappingContainer {
-    /**
-     * The cached value of the '{@link #getTypeMappings() <em>Type Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTypeMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList typeMappings;
-
-    /**
-     * The cached value of the '{@link #getBeanMappings() <em>Bean Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getBeanMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList beanMappings;
-
-    /**
-     * The cached value of the '{@link #getArrayMappings() <em>Array Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getArrayMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList arrayMappings;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected MappingContainerImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.MAPPING_CONTAINER;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getTypeMappings() {
-        if (typeMappings == null) {
-            typeMappings = new BasicInternalEList(TypeMapping.class);
-        }
-        return typeMappings;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getBeanMappings() {
-        if (beanMappings == null) {
-            beanMappings = new BasicInternalEList(BeanMapping.class);
-        }
-        return beanMappings;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getArrayMappings() {
-        if (arrayMappings == null) {
-            arrayMappings = new BasicInternalEList(ArrayMapping.class);
-        }
-        return arrayMappings;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
-                return ((InternalEList)getTypeMappings()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
-                return ((InternalEList)getBeanMappings()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
-                return ((InternalEList)getArrayMappings()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
-                return getTypeMappings();
-            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
-                return getBeanMappings();
-            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
-                return getArrayMappings();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
-                getTypeMappings().clear();
-                getTypeMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
-                getBeanMappings().clear();
-                getBeanMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
-                getArrayMappings().clear();
-                getArrayMappings().addAll((Collection)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
-                getTypeMappings().clear();
-                return;
-            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
-                getBeanMappings().clear();
-                return;
-            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
-                getArrayMappings().clear();
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS:
-                return typeMappings != null && !typeMappings.isEmpty();
-            case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS:
-                return beanMappings != null && !beanMappings.isEmpty();
-            case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS:
-                return arrayMappings != null && !arrayMappings.isEmpty();
-        }
-        return super.eIsSet(featureID);
-    }
-
-} //MappingContainerImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
deleted file mode 100644
index f626a9ad4..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/MappingImpl.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.Mapping;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.MappingImpl#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.MappingImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.MappingImpl#getEncodingStyle <em>Encoding Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public abstract class MappingImpl extends EObjectImpl implements Mapping {
-    /**
-     * The default value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected static final QName QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected QName qname = QNAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName TYPE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected QName type = TYPE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getEncodingStyle() <em>Encoding Style</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getEncodingStyle()
-     * @generated
-     * @ordered
-     */
-    protected static final String ENCODING_STYLE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getEncodingStyle() <em>Encoding Style</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getEncodingStyle()
-     * @generated
-     * @ordered
-     */
-    protected String encodingStyle = ENCODING_STYLE_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected MappingImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.MAPPING;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getQname() {
-        return qname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setQname(QName newQname) {
-        qname = newQname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setType(QName newType) {
-        type = newType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getEncodingStyle() {
-        return encodingStyle;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setEncodingStyle(String newEncodingStyle) {
-        encodingStyle = newEncodingStyle;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING__QNAME:
-                return getQname();
-            case WSDDPackageImpl.MAPPING__TYPE:
-                return getType();
-            case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
-                return getEncodingStyle();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING__QNAME:
-                setQname((QName)newValue);
-                return;
-            case WSDDPackageImpl.MAPPING__TYPE:
-                setType((QName)newValue);
-                return;
-            case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
-                setEncodingStyle((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING__QNAME:
-                setQname(QNAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.MAPPING__TYPE:
-                setType(TYPE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
-                setEncodingStyle(ENCODING_STYLE_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.MAPPING__QNAME:
-                return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
-            case WSDDPackageImpl.MAPPING__TYPE:
-                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-            case WSDDPackageImpl.MAPPING__ENCODING_STYLE:
-                return ENCODING_STYLE_EDEFAULT == null ? encodingStyle != null : !ENCODING_STYLE_EDEFAULT.equals(encodingStyle);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (qname: ");
-        result.append(qname);
-        result.append(", type: ");
-        result.append(type);
-        result.append(", encodingStyle: ");
-        result.append(encodingStyle);
-        result.append(')');
-        return result.toString();
-    }
-
-} //MappingImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
deleted file mode 100644
index 1f65151dc..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationImpl.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-
-import java.util.List;
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.Fault;
-import org.apache.axis.model.wsdd.Operation;
-import org.apache.axis.model.wsdd.OperationParameter;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getReturnQName <em>Return QName</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getReturnItemQName <em>Return Item QName</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getReturnItemType <em>Return Item Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getSoapAction <em>Soap Action</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getMep <em>Mep</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getReturnHeader <em>Return Header</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getParameters <em>Parameters</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationImpl#getFaults <em>Faults</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OperationImpl extends EObjectImpl implements Operation {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected static final QName QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected QName qname = QNAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getReturnQName() <em>Return QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnQName()
-     * @generated
-     * @ordered
-     */
-    protected static final QName RETURN_QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getReturnQName() <em>Return QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnQName()
-     * @generated
-     * @ordered
-     */
-    protected QName returnQName = RETURN_QNAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getReturnType() <em>Return Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName RETURN_TYPE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getReturnType() <em>Return Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnType()
-     * @generated
-     * @ordered
-     */
-    protected QName returnType = RETURN_TYPE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getReturnItemQName() <em>Return Item QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnItemQName()
-     * @generated
-     * @ordered
-     */
-    protected static final QName RETURN_ITEM_QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getReturnItemQName() <em>Return Item QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnItemQName()
-     * @generated
-     * @ordered
-     */
-    protected QName returnItemQName = RETURN_ITEM_QNAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getReturnItemType() <em>Return Item Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnItemType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName RETURN_ITEM_TYPE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getReturnItemType() <em>Return Item Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnItemType()
-     * @generated
-     * @ordered
-     */
-    protected QName returnItemType = RETURN_ITEM_TYPE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getSoapAction() <em>Soap Action</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSoapAction()
-     * @generated
-     * @ordered
-     */
-    protected static final String SOAP_ACTION_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getSoapAction() <em>Soap Action</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSoapAction()
-     * @generated
-     * @ordered
-     */
-    protected String soapAction = SOAP_ACTION_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getMep() <em>Mep</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getMep()
-     * @generated
-     * @ordered
-     */
-    protected static final String MEP_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getMep() <em>Mep</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getMep()
-     * @generated
-     * @ordered
-     */
-    protected String mep = MEP_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getReturnHeader() <em>Return Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnHeader()
-     * @generated
-     * @ordered
-     */
-    protected static final Boolean RETURN_HEADER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getReturnHeader() <em>Return Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getReturnHeader()
-     * @generated
-     * @ordered
-     */
-    protected Boolean returnHeader = RETURN_HEADER_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getParameters()
-     * @generated
-     * @ordered
-     */
-    protected EList parameters;
-
-    /**
-     * The cached value of the '{@link #getFaults() <em>Faults</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getFaults()
-     * @generated
-     * @ordered
-     */
-    protected EList faults;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected OperationImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.OPERATION;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getQname() {
-        return qname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setQname(QName newQname) {
-        qname = newQname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getReturnQName() {
-        return returnQName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setReturnQName(QName newReturnQName) {
-        returnQName = newReturnQName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getReturnType() {
-        return returnType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setReturnType(QName newReturnType) {
-        returnType = newReturnType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getReturnItemQName() {
-        return returnItemQName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setReturnItemQName(QName newReturnItemQName) {
-        returnItemQName = newReturnItemQName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getReturnItemType() {
-        return returnItemType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setReturnItemType(QName newReturnItemType) {
-        returnItemType = newReturnItemType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getSoapAction() {
-        return soapAction;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setSoapAction(String newSoapAction) {
-        soapAction = newSoapAction;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getMep() {
-        return mep;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setMep(String newMep) {
-        mep = newMep;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Boolean getReturnHeader() {
-        return returnHeader;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setReturnHeader(Boolean newReturnHeader) {
-        returnHeader = newReturnHeader;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getParameters() {
-        if (parameters == null) {
-            parameters = new BasicInternalEList(OperationParameter.class);
-        }
-        return parameters;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getFaults() {
-        if (faults == null) {
-            faults = new BasicInternalEList(Fault.class);
-        }
-        return faults;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION__PARAMETERS:
-                return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.OPERATION__FAULTS:
-                return ((InternalEList)getFaults()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION__NAME:
-                return getName();
-            case WSDDPackageImpl.OPERATION__QNAME:
-                return getQname();
-            case WSDDPackageImpl.OPERATION__RETURN_QNAME:
-                return getReturnQName();
-            case WSDDPackageImpl.OPERATION__RETURN_TYPE:
-                return getReturnType();
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
-                return getReturnItemQName();
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
-                return getReturnItemType();
-            case WSDDPackageImpl.OPERATION__SOAP_ACTION:
-                return getSoapAction();
-            case WSDDPackageImpl.OPERATION__MEP:
-                return getMep();
-            case WSDDPackageImpl.OPERATION__RETURN_HEADER:
-                return getReturnHeader();
-            case WSDDPackageImpl.OPERATION__PARAMETERS:
-                return getParameters();
-            case WSDDPackageImpl.OPERATION__FAULTS:
-                return getFaults();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__QNAME:
-                setQname((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_QNAME:
-                setReturnQName((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_TYPE:
-                setReturnType((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
-                setReturnItemQName((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
-                setReturnItemType((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__SOAP_ACTION:
-                setSoapAction((String)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__MEP:
-                setMep((String)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_HEADER:
-                setReturnHeader((Boolean)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__PARAMETERS:
-                getParameters().clear();
-                getParameters().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION__FAULTS:
-                getFaults().clear();
-                getFaults().addAll((Collection)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__QNAME:
-                setQname(QNAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_QNAME:
-                setReturnQName(RETURN_QNAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_TYPE:
-                setReturnType(RETURN_TYPE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
-                setReturnItemQName(RETURN_ITEM_QNAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
-                setReturnItemType(RETURN_ITEM_TYPE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__SOAP_ACTION:
-                setSoapAction(SOAP_ACTION_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__MEP:
-                setMep(MEP_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__RETURN_HEADER:
-                setReturnHeader(RETURN_HEADER_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION__PARAMETERS:
-                getParameters().clear();
-                return;
-            case WSDDPackageImpl.OPERATION__FAULTS:
-                getFaults().clear();
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.OPERATION__QNAME:
-                return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
-            case WSDDPackageImpl.OPERATION__RETURN_QNAME:
-                return RETURN_QNAME_EDEFAULT == null ? returnQName != null : !RETURN_QNAME_EDEFAULT.equals(returnQName);
-            case WSDDPackageImpl.OPERATION__RETURN_TYPE:
-                return RETURN_TYPE_EDEFAULT == null ? returnType != null : !RETURN_TYPE_EDEFAULT.equals(returnType);
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_QNAME:
-                return RETURN_ITEM_QNAME_EDEFAULT == null ? returnItemQName != null : !RETURN_ITEM_QNAME_EDEFAULT.equals(returnItemQName);
-            case WSDDPackageImpl.OPERATION__RETURN_ITEM_TYPE:
-                return RETURN_ITEM_TYPE_EDEFAULT == null ? returnItemType != null : !RETURN_ITEM_TYPE_EDEFAULT.equals(returnItemType);
-            case WSDDPackageImpl.OPERATION__SOAP_ACTION:
-                return SOAP_ACTION_EDEFAULT == null ? soapAction != null : !SOAP_ACTION_EDEFAULT.equals(soapAction);
-            case WSDDPackageImpl.OPERATION__MEP:
-                return MEP_EDEFAULT == null ? mep != null : !MEP_EDEFAULT.equals(mep);
-            case WSDDPackageImpl.OPERATION__RETURN_HEADER:
-                return RETURN_HEADER_EDEFAULT == null ? returnHeader != null : !RETURN_HEADER_EDEFAULT.equals(returnHeader);
-            case WSDDPackageImpl.OPERATION__PARAMETERS:
-                return parameters != null && !parameters.isEmpty();
-            case WSDDPackageImpl.OPERATION__FAULTS:
-                return faults != null && !faults.isEmpty();
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", qname: ");
-        result.append(qname);
-        result.append(", returnQName: ");
-        result.append(returnQName);
-        result.append(", returnType: ");
-        result.append(returnType);
-        result.append(", returnItemQName: ");
-        result.append(returnItemQName);
-        result.append(", returnItemType: ");
-        result.append(returnItemType);
-        result.append(", soapAction: ");
-        result.append(soapAction);
-        result.append(", mep: ");
-        result.append(mep);
-        result.append(", returnHeader: ");
-        result.append(returnHeader);
-        result.append(')');
-        return result.toString();
-    }
-
-} //OperationImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
deleted file mode 100644
index a1d396b7d..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/OperationParameterImpl.java
+++ /dev/null
@@ -1,462 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.OperationParameter;
-import org.apache.axis.model.wsdd.ParameterMode;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Operation Parameter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getQname <em>Qname</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getType <em>Type</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getMode <em>Mode</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getInHeader <em>In Header</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getOutHeader <em>Out Header</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl#getItemQName <em>Item QName</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class OperationParameterImpl extends EObjectImpl implements OperationParameter {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected static final QName QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getQname() <em>Qname</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getQname()
-     * @generated
-     * @ordered
-     */
-    protected QName qname = QNAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected static final QName TYPE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getType()
-     * @generated
-     * @ordered
-     */
-    protected QName type = TYPE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getMode() <em>Mode</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getMode()
-     * @generated
-     * @ordered
-     */
-    protected static final ParameterMode MODE_EDEFAULT = ParameterMode.IN_LITERAL;
-
-    /**
-     * The cached value of the '{@link #getMode() <em>Mode</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getMode()
-     * @generated
-     * @ordered
-     */
-    protected ParameterMode mode = MODE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getInHeader() <em>In Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getInHeader()
-     * @generated
-     * @ordered
-     */
-    protected static final Boolean IN_HEADER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getInHeader() <em>In Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getInHeader()
-     * @generated
-     * @ordered
-     */
-    protected Boolean inHeader = IN_HEADER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getOutHeader() <em>Out Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getOutHeader()
-     * @generated
-     * @ordered
-     */
-    protected static final Boolean OUT_HEADER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getOutHeader() <em>Out Header</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getOutHeader()
-     * @generated
-     * @ordered
-     */
-    protected Boolean outHeader = OUT_HEADER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getItemQName() <em>Item QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getItemQName()
-     * @generated
-     * @ordered
-     */
-    protected static final QName ITEM_QNAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getItemQName() <em>Item QName</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getItemQName()
-     * @generated
-     * @ordered
-     */
-    protected QName itemQName = ITEM_QNAME_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected OperationParameterImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.OPERATION_PARAMETER;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getQname() {
-        return qname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setQname(QName newQname) {
-        qname = newQname;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getType() {
-        return type;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setType(QName newType) {
-        type = newType;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public ParameterMode getMode() {
-        return mode;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setMode(ParameterMode newMode) {
-        mode = newMode == null ? MODE_EDEFAULT : newMode;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Boolean getInHeader() {
-        return inHeader;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setInHeader(Boolean newInHeader) {
-        inHeader = newInHeader;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Boolean getOutHeader() {
-        return outHeader;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setOutHeader(Boolean newOutHeader) {
-        outHeader = newOutHeader;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getItemQName() {
-        return itemQName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setItemQName(QName newItemQName) {
-        itemQName = newItemQName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
-                return getName();
-            case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
-                return getQname();
-            case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
-                return getType();
-            case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
-                return getMode();
-            case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
-                return getInHeader();
-            case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
-                return getOutHeader();
-            case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
-                return getItemQName();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
-                setQname((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
-                setType((QName)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
-                setMode((ParameterMode)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
-                setInHeader((Boolean)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
-                setOutHeader((Boolean)newValue);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
-                setItemQName((QName)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
-                setQname(QNAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
-                setType(TYPE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
-                setMode(MODE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
-                setInHeader(IN_HEADER_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
-                setOutHeader(OUT_HEADER_EDEFAULT);
-                return;
-            case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
-                setItemQName(ITEM_QNAME_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.OPERATION_PARAMETER__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.OPERATION_PARAMETER__QNAME:
-                return QNAME_EDEFAULT == null ? qname != null : !QNAME_EDEFAULT.equals(qname);
-            case WSDDPackageImpl.OPERATION_PARAMETER__TYPE:
-                return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);
-            case WSDDPackageImpl.OPERATION_PARAMETER__MODE:
-                return mode != MODE_EDEFAULT;
-            case WSDDPackageImpl.OPERATION_PARAMETER__IN_HEADER:
-                return IN_HEADER_EDEFAULT == null ? inHeader != null : !IN_HEADER_EDEFAULT.equals(inHeader);
-            case WSDDPackageImpl.OPERATION_PARAMETER__OUT_HEADER:
-                return OUT_HEADER_EDEFAULT == null ? outHeader != null : !OUT_HEADER_EDEFAULT.equals(outHeader);
-            case WSDDPackageImpl.OPERATION_PARAMETER__ITEM_QNAME:
-                return ITEM_QNAME_EDEFAULT == null ? itemQName != null : !ITEM_QNAME_EDEFAULT.equals(itemQName);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", qname: ");
-        result.append(qname);
-        result.append(", type: ");
-        result.append(type);
-        result.append(", mode: ");
-        result.append(mode);
-        result.append(", inHeader: ");
-        result.append(inHeader);
-        result.append(", outHeader: ");
-        result.append(outHeader);
-        result.append(", itemQName: ");
-        result.append(itemQName);
-        result.append(')');
-        return result.toString();
-    }
-
-} //OperationParameterImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
deleted file mode 100644
index 13b0158cc..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterImpl.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.wsdd.Parameter;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameter</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ParameterImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ParameterImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParameterImpl extends EObjectImpl implements Parameter {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getValue()
-     * @generated
-     * @ordered
-     */
-    protected static final String VALUE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getValue()
-     * @generated
-     * @ordered
-     */
-    protected String value = VALUE_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ParameterImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.PARAMETER;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getValue() {
-        return value;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setValue(String newValue) {
-        value = newValue;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETER__NAME:
-                return getName();
-            case WSDDPackageImpl.PARAMETER__VALUE:
-                return getValue();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETER__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.PARAMETER__VALUE:
-                setValue((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETER__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.PARAMETER__VALUE:
-                setValue(VALUE_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETER__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.PARAMETER__VALUE:
-                return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", value: ");
-        result.append(value);
-        result.append(')');
-        return result.toString();
-    }
-
-} //ParameterImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
deleted file mode 100644
index 84dabe86e..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ParameterizableImpl.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.axis.model.wsdd.Parameter;
-import org.apache.axis.model.wsdd.Parameterizable;
-import org.apache.axis.model.wsdd.WSDDFactory;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Parameterizable</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ParameterizableImpl#getParameters <em>Parameters</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ParameterizableImpl extends EObjectImpl implements Parameterizable {
-    /**
-     * The cached value of the '{@link #getParameters() <em>Parameters</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getParameters()
-     * @generated
-     * @ordered
-     */
-    protected EList parameters;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ParameterizableImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.PARAMETERIZABLE;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getParameters() {
-        if (parameters == null) {
-            parameters = new BasicInternalEList(Parameter.class);
-        }
-        return parameters;
-    }
-
-    public void setParameter(String name, String value) {
-        for (Iterator it = getParameters().iterator(); it.hasNext(); ) {
-            Parameter param = (Parameter)it.next();
-            if (name.equals(param.getName())) {
-                param.setValue(value);
-                return;
-            }
-        }
-        Parameter param = WSDDFactory.INSTANCE.createParameter();
-        param.setName(name);
-        param.setValue(value);
-        getParameters().add(param);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
-                return ((InternalEList)getParameters()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
-                return getParameters();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
-                getParameters().clear();
-                getParameters().addAll((Collection)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
-                getParameters().clear();
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.PARAMETERIZABLE__PARAMETERS:
-                return parameters != null && !parameters.isEmpty();
-        }
-        return super.eIsSet(featureID);
-    }
-
-} //ParameterizableImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
deleted file mode 100644
index b9e2c8506..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ServiceImpl.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.constants.Style;
-import org.apache.axis.constants.Use;
-import org.apache.axis.model.wsdd.ArrayMapping;
-import org.apache.axis.model.wsdd.BeanMapping;
-import org.apache.axis.model.wsdd.MappingContainer;
-import org.apache.axis.model.wsdd.Operation;
-import org.apache.axis.model.wsdd.Service;
-import org.apache.axis.model.wsdd.TypeMapping;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.BasicInternalEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Service</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getTypeMappings <em>Type Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getBeanMappings <em>Bean Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getArrayMappings <em>Array Mappings</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getProvider <em>Provider</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getUse <em>Use</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getStyle <em>Style</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getNamespaces <em>Namespaces</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.ServiceImpl#getOperations <em>Operations</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ServiceImpl extends DeployableItemImpl implements Service {
-    /**
-     * The cached value of the '{@link #getTypeMappings() <em>Type Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getTypeMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList typeMappings;
-
-    /**
-     * The cached value of the '{@link #getBeanMappings() <em>Bean Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getBeanMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList beanMappings;
-
-    /**
-     * The cached value of the '{@link #getArrayMappings() <em>Array Mappings</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getArrayMappings()
-     * @generated
-     * @ordered
-     */
-    protected EList arrayMappings;
-
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getProvider() <em>Provider</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getProvider()
-     * @generated
-     * @ordered
-     */
-    protected static final QName PROVIDER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getProvider() <em>Provider</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getProvider()
-     * @generated
-     * @ordered
-     */
-    protected QName provider = PROVIDER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getUse() <em>Use</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getUse()
-     * @generated
-     * @ordered
-     */
-    protected static final Use USE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getUse() <em>Use</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getUse()
-     * @generated
-     * @ordered
-     */
-    protected Use use = USE_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getStyle()
-     * @generated
-     * @ordered
-     */
-    protected static final Style STYLE_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getStyle()
-     * @generated
-     * @ordered
-     */
-    protected Style style = STYLE_EDEFAULT;
-
-    /**
-     * The cached value of the '{@link #getNamespaces() <em>Namespaces</em>}' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getNamespaces()
-     * @generated
-     * @ordered
-     */
-    protected EList namespaces;
-
-    /**
-     * The cached value of the '{@link #getOperations() <em>Operations</em>}' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getOperations()
-     * @generated
-     * @ordered
-     */
-    protected EList operations;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected ServiceImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.SERVICE;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getProvider() {
-        return provider;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setProvider(QName newProvider) {
-        provider = newProvider;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Use getUse() {
-        return use;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setUse(Use newUse) {
-        use = newUse;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Style getStyle() {
-        return style;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setStyle(Style newStyle) {
-        style = newStyle;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getNamespaces() {
-        if (namespaces == null) {
-            namespaces = new BasicInternalEList(String.class);
-        }
-        return namespaces;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getOperations() {
-        if (operations == null) {
-            operations = new BasicInternalEList(Operation.class);
-        }
-        return operations;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getTypeMappings() {
-        if (typeMappings == null) {
-            typeMappings = new BasicInternalEList(TypeMapping.class);
-        }
-        return typeMappings;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getBeanMappings() {
-        if (beanMappings == null) {
-            beanMappings = new BasicInternalEList(BeanMapping.class);
-        }
-        return beanMappings;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public List getArrayMappings() {
-        if (arrayMappings == null) {
-            arrayMappings = new BasicInternalEList(ArrayMapping.class);
-        }
-        return arrayMappings;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-        switch (featureID) {
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                return ((InternalEList)getTypeMappings()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                return ((InternalEList)getBeanMappings()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                return ((InternalEList)getArrayMappings()).basicRemove(otherEnd, msgs);
-            case WSDDPackageImpl.SERVICE__OPERATIONS:
-                return ((InternalEList)getOperations()).basicRemove(otherEnd, msgs);
-        }
-        return super.eInverseRemove(otherEnd, featureID, msgs);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                return getTypeMappings();
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                return getBeanMappings();
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                return getArrayMappings();
-            case WSDDPackageImpl.SERVICE__NAME:
-                return getName();
-            case WSDDPackageImpl.SERVICE__PROVIDER:
-                return getProvider();
-            case WSDDPackageImpl.SERVICE__USE:
-                return getUse();
-            case WSDDPackageImpl.SERVICE__STYLE:
-                return getStyle();
-            case WSDDPackageImpl.SERVICE__NAMESPACES:
-                return getNamespaces();
-            case WSDDPackageImpl.SERVICE__OPERATIONS:
-                return getOperations();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                getTypeMappings().clear();
-                getTypeMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                getBeanMappings().clear();
-                getBeanMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                getArrayMappings().clear();
-                getArrayMappings().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__PROVIDER:
-                setProvider((QName)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__USE:
-                setUse((Use)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__STYLE:
-                setStyle((Style)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__NAMESPACES:
-                getNamespaces().clear();
-                getNamespaces().addAll((Collection)newValue);
-                return;
-            case WSDDPackageImpl.SERVICE__OPERATIONS:
-                getOperations().clear();
-                getOperations().addAll((Collection)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                getTypeMappings().clear();
-                return;
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                getBeanMappings().clear();
-                return;
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                getArrayMappings().clear();
-                return;
-            case WSDDPackageImpl.SERVICE__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.SERVICE__PROVIDER:
-                setProvider(PROVIDER_EDEFAULT);
-                return;
-            case WSDDPackageImpl.SERVICE__USE:
-                setUse(USE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.SERVICE__STYLE:
-                setStyle(STYLE_EDEFAULT);
-                return;
-            case WSDDPackageImpl.SERVICE__NAMESPACES:
-                getNamespaces().clear();
-                return;
-            case WSDDPackageImpl.SERVICE__OPERATIONS:
-                getOperations().clear();
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS:
-                return typeMappings != null && !typeMappings.isEmpty();
-            case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS:
-                return beanMappings != null && !beanMappings.isEmpty();
-            case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS:
-                return arrayMappings != null && !arrayMappings.isEmpty();
-            case WSDDPackageImpl.SERVICE__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.SERVICE__PROVIDER:
-                return PROVIDER_EDEFAULT == null ? provider != null : !PROVIDER_EDEFAULT.equals(provider);
-            case WSDDPackageImpl.SERVICE__USE:
-                return USE_EDEFAULT == null ? use != null : !USE_EDEFAULT.equals(use);
-            case WSDDPackageImpl.SERVICE__STYLE:
-                return STYLE_EDEFAULT == null ? style != null : !STYLE_EDEFAULT.equals(style);
-            case WSDDPackageImpl.SERVICE__NAMESPACES:
-                return namespaces != null && !namespaces.isEmpty();
-            case WSDDPackageImpl.SERVICE__OPERATIONS:
-                return operations != null && !operations.isEmpty();
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public int eBaseStructuralFeatureID(int derivedFeatureID, Class baseClass) {
-        if (baseClass == MappingContainer.class) {
-            switch (derivedFeatureID) {
-                case WSDDPackageImpl.SERVICE__TYPE_MAPPINGS: return WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS;
-                case WSDDPackageImpl.SERVICE__BEAN_MAPPINGS: return WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS;
-                case WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS: return WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS;
-                default: return -1;
-            }
-        }
-        return super.eBaseStructuralFeatureID(derivedFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public int eDerivedStructuralFeatureID(int baseFeatureID, Class baseClass) {
-        if (baseClass == MappingContainer.class) {
-            switch (baseFeatureID) {
-                case WSDDPackageImpl.MAPPING_CONTAINER__TYPE_MAPPINGS: return WSDDPackageImpl.SERVICE__TYPE_MAPPINGS;
-                case WSDDPackageImpl.MAPPING_CONTAINER__BEAN_MAPPINGS: return WSDDPackageImpl.SERVICE__BEAN_MAPPINGS;
-                case WSDDPackageImpl.MAPPING_CONTAINER__ARRAY_MAPPINGS: return WSDDPackageImpl.SERVICE__ARRAY_MAPPINGS;
-                default: return -1;
-            }
-        }
-        return super.eDerivedStructuralFeatureID(baseFeatureID, baseClass);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", provider: ");
-        result.append(provider);
-        result.append(", use: ");
-        result.append(use);
-        result.append(", style: ");
-        result.append(style);
-        result.append(", namespaces: ");
-        result.append(namespaces);
-        result.append(')');
-        return result.toString();
-    }
-
-} //ServiceImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
deleted file mode 100644
index 71faa2e56..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TransportImpl.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import javax.xml.namespace.QName;
-import org.apache.axis.model.wsdd.Transport;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Transport</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.TransportImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.TransportImpl#getPivot <em>Pivot</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TransportImpl extends DeployableItemImpl implements Transport {
-    /**
-     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected static final String NAME_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getName()
-     * @generated
-     * @ordered
-     */
-    protected String name = NAME_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getPivot() <em>Pivot</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getPivot()
-     * @generated
-     * @ordered
-     */
-    protected static final QName PIVOT_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getPivot() <em>Pivot</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getPivot()
-     * @generated
-     * @ordered
-     */
-    protected QName pivot = PIVOT_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected TransportImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.TRANSPORT;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setName(String newName) {
-        name = newName;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public QName getPivot() {
-        return pivot;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setPivot(QName newPivot) {
-        pivot = newPivot;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.TRANSPORT__NAME:
-                return getName();
-            case WSDDPackageImpl.TRANSPORT__PIVOT:
-                return getPivot();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.TRANSPORT__NAME:
-                setName((String)newValue);
-                return;
-            case WSDDPackageImpl.TRANSPORT__PIVOT:
-                setPivot((QName)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.TRANSPORT__NAME:
-                setName(NAME_EDEFAULT);
-                return;
-            case WSDDPackageImpl.TRANSPORT__PIVOT:
-                setPivot(PIVOT_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.TRANSPORT__NAME:
-                return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-            case WSDDPackageImpl.TRANSPORT__PIVOT:
-                return PIVOT_EDEFAULT == null ? pivot != null : !PIVOT_EDEFAULT.equals(pivot);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (name: ");
-        result.append(name);
-        result.append(", pivot: ");
-        result.append(pivot);
-        result.append(')');
-        return result.toString();
-    }
-
-} //TransportImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java
deleted file mode 100644
index 25125ab14..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/TypeMappingImpl.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.wsdd.TypeMapping;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Type Mapping</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.apache.axis.model.wsdd.impl.TypeMappingImpl#getSerializer <em>Serializer</em>}</li>
- *   <li>{@link org.apache.axis.model.wsdd.impl.TypeMappingImpl#getDeserializer <em>Deserializer</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TypeMappingImpl extends MappingImpl implements TypeMapping {
-    /**
-     * The default value of the '{@link #getSerializer() <em>Serializer</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSerializer()
-     * @generated
-     * @ordered
-     */
-    protected static final String SERIALIZER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getSerializer() <em>Serializer</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getSerializer()
-     * @generated
-     * @ordered
-     */
-    protected String serializer = SERIALIZER_EDEFAULT;
-
-    /**
-     * The default value of the '{@link #getDeserializer() <em>Deserializer</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getDeserializer()
-     * @generated
-     * @ordered
-     */
-    protected static final String DESERIALIZER_EDEFAULT = null;
-
-    /**
-     * The cached value of the '{@link #getDeserializer() <em>Deserializer</em>}' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #getDeserializer()
-     * @generated
-     * @ordered
-     */
-    protected String deserializer = DESERIALIZER_EDEFAULT;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected TypeMappingImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected EClass eStaticClass() {
-        return WSDDPackageImpl.Literals.TYPE_MAPPING;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getSerializer() {
-        return serializer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setSerializer(String newSerializer) {
-        serializer = newSerializer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String getDeserializer() {
-        return deserializer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void setDeserializer(String newDeserializer) {
-        deserializer = newDeserializer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object eGet(int featureID, boolean resolve, boolean coreType) {
-        switch (featureID) {
-            case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER:
-                return getSerializer();
-            case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER:
-                return getDeserializer();
-        }
-        return super.eGet(featureID, resolve, coreType);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eSet(int featureID, Object newValue) {
-        switch (featureID) {
-            case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER:
-                setSerializer((String)newValue);
-                return;
-            case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER:
-                setDeserializer((String)newValue);
-                return;
-        }
-        super.eSet(featureID, newValue);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void eUnset(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER:
-                setSerializer(SERIALIZER_EDEFAULT);
-                return;
-            case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER:
-                setDeserializer(DESERIALIZER_EDEFAULT);
-                return;
-        }
-        super.eUnset(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public boolean eIsSet(int featureID) {
-        switch (featureID) {
-            case WSDDPackageImpl.TYPE_MAPPING__SERIALIZER:
-                return SERIALIZER_EDEFAULT == null ? serializer != null : !SERIALIZER_EDEFAULT.equals(serializer);
-            case WSDDPackageImpl.TYPE_MAPPING__DESERIALIZER:
-                return DESERIALIZER_EDEFAULT == null ? deserializer != null : !DESERIALIZER_EDEFAULT.equals(deserializer);
-        }
-        return super.eIsSet(featureID);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String toString() {
-        if (eIsProxy()) return super.toString();
-
-        StringBuffer result = new StringBuffer(super.toString());
-        result.append(" (serializer: ");
-        result.append(serializer);
-        result.append(", deserializer: ");
-        result.append(deserializer);
-        result.append(')');
-        return result.toString();
-    }
-
-} //TypeMappingImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
deleted file mode 100644
index de0680aa6..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDFactoryImpl.java
+++ /dev/null
@@ -1,308 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.wsdd.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class WSDDFactoryImpl extends EFactoryImpl implements WSDDFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final WSDDFactoryImpl eINSTANCE = init();
-
-    /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static WSDDFactoryImpl init() {
-        try {
-            WSDDFactoryImpl theWSDDFactory = (WSDDFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http://xml.apache.org/axis/wsdd/"); 
-            if (theWSDDFactory != null) {
-                return theWSDDFactory;
-            }
-        }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
-        }
-        return new WSDDFactoryImpl();
-    }
-
-    /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public WSDDFactoryImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EObject create(EClass eClass) {
-        switch (eClass.getClassifierID()) {
-            case WSDDPackageImpl.PARAMETER: return (EObject)createParameter();
-            case WSDDPackageImpl.TYPE_MAPPING: return (EObject)createTypeMapping();
-            case WSDDPackageImpl.ARRAY_MAPPING: return (EObject)createArrayMapping();
-            case WSDDPackageImpl.BEAN_MAPPING: return (EObject)createBeanMapping();
-            case WSDDPackageImpl.MAPPING_CONTAINER: return (EObject)createMappingContainer();
-            case WSDDPackageImpl.OPERATION_PARAMETER: return (EObject)createOperationParameter();
-            case WSDDPackageImpl.FAULT: return (EObject)createFault();
-            case WSDDPackageImpl.OPERATION: return (EObject)createOperation();
-            case WSDDPackageImpl.PARAMETERIZABLE: return (EObject)createParameterizable();
-            case WSDDPackageImpl.HANDLER: return (EObject)createHandler();
-            case WSDDPackageImpl.CHAIN: return (EObject)createChain();
-            case WSDDPackageImpl.GLOBAL_CONFIGURATION: return (EObject)createGlobalConfiguration();
-            case WSDDPackageImpl.TRANSPORT: return (EObject)createTransport();
-            case WSDDPackageImpl.SERVICE: return (EObject)createService();
-            case WSDDPackageImpl.DEPLOYMENT: return (EObject)createDeployment();
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object createFromString(EDataType eDataType, String initialValue) {
-        switch (eDataType.getClassifierID()) {
-            case WSDDPackageImpl.PARAMETER_MODE:
-                return createParameterModeFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertToString(EDataType eDataType, Object instanceValue) {
-        switch (eDataType.getClassifierID()) {
-            case WSDDPackageImpl.PARAMETER_MODE:
-                return convertParameterModeToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Parameter createParameter() {
-        ParameterImpl parameter = new ParameterImpl();
-        return parameter;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public TypeMapping createTypeMapping() {
-        TypeMappingImpl typeMapping = new TypeMappingImpl();
-        return typeMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public ArrayMapping createArrayMapping() {
-        ArrayMappingImpl arrayMapping = new ArrayMappingImpl();
-        return arrayMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public BeanMapping createBeanMapping() {
-        BeanMappingImpl beanMapping = new BeanMappingImpl();
-        return beanMapping;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public MappingContainer createMappingContainer() {
-        MappingContainerImpl mappingContainer = new MappingContainerImpl();
-        return mappingContainer;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public OperationParameter createOperationParameter() {
-        OperationParameterImpl operationParameter = new OperationParameterImpl();
-        return operationParameter;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Fault createFault() {
-        FaultImpl fault = new FaultImpl();
-        return fault;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Operation createOperation() {
-        OperationImpl operation = new OperationImpl();
-        return operation;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Parameterizable createParameterizable() {
-        ParameterizableImpl parameterizable = new ParameterizableImpl();
-        return parameterizable;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Handler createHandler() {
-        HandlerImpl handler = new HandlerImpl();
-        return handler;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Chain createChain() {
-        ChainImpl chain = new ChainImpl();
-        return chain;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public GlobalConfiguration createGlobalConfiguration() {
-        GlobalConfigurationImpl globalConfiguration = new GlobalConfigurationImpl();
-        return globalConfiguration;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Transport createTransport() {
-        TransportImpl transport = new TransportImpl();
-        return transport;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Service createService() {
-        ServiceImpl service = new ServiceImpl();
-        return service;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Deployment createDeployment() {
-        DeploymentImpl deployment = new DeploymentImpl();
-        return deployment;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public ParameterMode createParameterModeFromString(EDataType eDataType, String initialValue) {
-        ParameterMode result = ParameterMode.get(initialValue);
-        if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-        return result;
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertParameterModeToString(EDataType eDataType, Object instanceValue) {
-        return instanceValue == null ? null : instanceValue.toString();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public WSDDPackageImpl getWSDDPackage() {
-        return (WSDDPackageImpl)getEPackage();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @deprecated
-     * @generated
-     */
-    public static WSDDPackageImpl getPackage() {
-        return WSDDPackageImpl.eINSTANCE;
-    }
-
-} //WSDDFactoryImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java b/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
deleted file mode 100644
index c59c699e6..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
+++ /dev/null
@@ -1,3283 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.wsdd.impl;
-
-import org.apache.axis.model.soap.impl.SOAPPackageImpl;
-import org.apache.axis.model.wsdd.ArrayMapping;
-import org.apache.axis.model.wsdd.BeanMapping;
-import org.apache.axis.model.wsdd.DeployableItem;
-import org.apache.axis.model.wsdd.Deployment;
-import org.apache.axis.model.wsdd.Fault;
-import org.apache.axis.model.wsdd.Chain;
-import org.apache.axis.model.wsdd.GlobalConfiguration;
-import org.apache.axis.model.wsdd.Handler;
-import org.apache.axis.model.wsdd.Mapping;
-import org.apache.axis.model.wsdd.MappingContainer;
-import org.apache.axis.model.wsdd.Operation;
-import org.apache.axis.model.wsdd.OperationParameter;
-import org.apache.axis.model.wsdd.Parameter;
-import org.apache.axis.model.wsdd.ParameterMode;
-import org.apache.axis.model.wsdd.Parameterizable;
-import org.apache.axis.model.wsdd.Service;
-import org.apache.axis.model.wsdd.Transport;
-import org.apache.axis.model.wsdd.TypeMapping;
-import org.apache.axis.model.wsdd.WSDDFactory;
-
-import org.apache.axis.model.xml.impl.XmlPackageImpl;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.wsdd.WSDDFactory
- * @model kind="package"
- * @generated
- */
-public class WSDDPackageImpl extends EPackageImpl {
-    /**
-     * The package name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNAME = "wsdd";
-
-    /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNS_URI = "http://xml.apache.org/axis/wsdd/";
-
-    /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNS_PREFIX = "wsdd";
-
-    /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final WSDDPackageImpl eINSTANCE = org.apache.axis.model.wsdd.impl.WSDDPackageImpl.init();
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.ParameterImpl <em>Parameter</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.ParameterImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameter()
-     * @generated
-     */
-    public static final int PARAMETER = 0;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int PARAMETER__NAME = 0;
-
-    /**
-     * The feature id for the '<em><b>Value</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int PARAMETER__VALUE = 1;
-
-    /**
-     * The number of structural features of the '<em>Parameter</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int PARAMETER_FEATURE_COUNT = 2;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.MappingImpl <em>Mapping</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.MappingImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getMapping()
-     * @generated
-     */
-    public static final int MAPPING = 1;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING__QNAME = 0;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING__TYPE = 1;
-
-    /**
-     * The feature id for the '<em><b>Encoding Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING__ENCODING_STYLE = 2;
-
-    /**
-     * The number of structural features of the '<em>Mapping</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING_FEATURE_COUNT = 3;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.TypeMappingImpl <em>Type Mapping</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.TypeMappingImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getTypeMapping()
-     * @generated
-     */
-    public static final int TYPE_MAPPING = 2;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TYPE_MAPPING__QNAME = MAPPING__QNAME;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TYPE_MAPPING__TYPE = MAPPING__TYPE;
-
-    /**
-     * The feature id for the '<em><b>Encoding Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TYPE_MAPPING__ENCODING_STYLE = MAPPING__ENCODING_STYLE;
-
-    /**
-     * The feature id for the '<em><b>Serializer</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TYPE_MAPPING__SERIALIZER = MAPPING_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Deserializer</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TYPE_MAPPING__DESERIALIZER = MAPPING_FEATURE_COUNT + 1;
-
-    /**
-     * The number of structural features of the '<em>Type Mapping</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TYPE_MAPPING_FEATURE_COUNT = MAPPING_FEATURE_COUNT + 2;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.ArrayMappingImpl <em>Array Mapping</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.ArrayMappingImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getArrayMapping()
-     * @generated
-     */
-    public static final int ARRAY_MAPPING = 3;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int ARRAY_MAPPING__QNAME = MAPPING__QNAME;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int ARRAY_MAPPING__TYPE = MAPPING__TYPE;
-
-    /**
-     * The feature id for the '<em><b>Encoding Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int ARRAY_MAPPING__ENCODING_STYLE = MAPPING__ENCODING_STYLE;
-
-    /**
-     * The feature id for the '<em><b>Inner Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int ARRAY_MAPPING__INNER_TYPE = MAPPING_FEATURE_COUNT + 0;
-
-    /**
-     * The number of structural features of the '<em>Array Mapping</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int ARRAY_MAPPING_FEATURE_COUNT = MAPPING_FEATURE_COUNT + 1;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.BeanMappingImpl <em>Bean Mapping</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.BeanMappingImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getBeanMapping()
-     * @generated
-     */
-    public static final int BEAN_MAPPING = 4;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int BEAN_MAPPING__QNAME = MAPPING__QNAME;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int BEAN_MAPPING__TYPE = MAPPING__TYPE;
-
-    /**
-     * The feature id for the '<em><b>Encoding Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int BEAN_MAPPING__ENCODING_STYLE = MAPPING__ENCODING_STYLE;
-
-    /**
-     * The number of structural features of the '<em>Bean Mapping</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int BEAN_MAPPING_FEATURE_COUNT = MAPPING_FEATURE_COUNT + 0;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl <em>Mapping Container</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.MappingContainerImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getMappingContainer()
-     * @generated
-     */
-    public static final int MAPPING_CONTAINER = 5;
-
-    /**
-     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING_CONTAINER__TYPE_MAPPINGS = 0;
-
-    /**
-     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING_CONTAINER__BEAN_MAPPINGS = 1;
-
-    /**
-     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING_CONTAINER__ARRAY_MAPPINGS = 2;
-
-    /**
-     * The number of structural features of the '<em>Mapping Container</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int MAPPING_CONTAINER_FEATURE_COUNT = 3;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl <em>Operation Parameter</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.OperationParameterImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getOperationParameter()
-     * @generated
-     */
-    public static final int OPERATION_PARAMETER = 6;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__NAME = 0;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__QNAME = 1;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__TYPE = 2;
-
-    /**
-     * The feature id for the '<em><b>Mode</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__MODE = 3;
-
-    /**
-     * The feature id for the '<em><b>In Header</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__IN_HEADER = 4;
-
-    /**
-     * The feature id for the '<em><b>Out Header</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__OUT_HEADER = 5;
-
-    /**
-     * The feature id for the '<em><b>Item QName</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER__ITEM_QNAME = 6;
-
-    /**
-     * The number of structural features of the '<em>Operation Parameter</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_PARAMETER_FEATURE_COUNT = 7;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.FaultImpl <em>Fault</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.FaultImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getFault()
-     * @generated
-     */
-    public static final int FAULT = 7;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int FAULT__NAME = 0;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int FAULT__QNAME = 1;
-
-    /**
-     * The feature id for the '<em><b>Class</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int FAULT__CLASS = 2;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int FAULT__TYPE = 3;
-
-    /**
-     * The number of structural features of the '<em>Fault</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int FAULT_FEATURE_COUNT = 4;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.OperationImpl <em>Operation</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.OperationImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getOperation()
-     * @generated
-     */
-    public static final int OPERATION = 8;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__NAME = 0;
-
-    /**
-     * The feature id for the '<em><b>Qname</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__QNAME = 1;
-
-    /**
-     * The feature id for the '<em><b>Return QName</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__RETURN_QNAME = 2;
-
-    /**
-     * The feature id for the '<em><b>Return Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__RETURN_TYPE = 3;
-
-    /**
-     * The feature id for the '<em><b>Return Item QName</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__RETURN_ITEM_QNAME = 4;
-
-    /**
-     * The feature id for the '<em><b>Return Item Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__RETURN_ITEM_TYPE = 5;
-
-    /**
-     * The feature id for the '<em><b>Soap Action</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__SOAP_ACTION = 6;
-
-    /**
-     * The feature id for the '<em><b>Mep</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__MEP = 7;
-
-    /**
-     * The feature id for the '<em><b>Return Header</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__RETURN_HEADER = 8;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__PARAMETERS = 9;
-
-    /**
-     * The feature id for the '<em><b>Faults</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION__FAULTS = 10;
-
-    /**
-     * The number of structural features of the '<em>Operation</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int OPERATION_FEATURE_COUNT = 11;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.ParameterizableImpl <em>Parameterizable</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.ParameterizableImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterizable()
-     * @generated
-     */
-    public static final int PARAMETERIZABLE = 9;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int PARAMETERIZABLE__PARAMETERS = 0;
-
-    /**
-     * The number of structural features of the '<em>Parameterizable</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int PARAMETERIZABLE_FEATURE_COUNT = 1;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.HandlerImpl <em>Handler</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.HandlerImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getHandler()
-     * @generated
-     */
-    public static final int HANDLER = 10;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int HANDLER__PARAMETERS = PARAMETERIZABLE__PARAMETERS;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int HANDLER__NAME = PARAMETERIZABLE_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int HANDLER__TYPE = PARAMETERIZABLE_FEATURE_COUNT + 1;
-
-    /**
-     * The number of structural features of the '<em>Handler</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int HANDLER_FEATURE_COUNT = PARAMETERIZABLE_FEATURE_COUNT + 2;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.ChainImpl <em>Chain</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.ChainImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getChain()
-     * @generated
-     */
-    public static final int CHAIN = 11;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int CHAIN__NAME = 0;
-
-    /**
-     * The feature id for the '<em><b>Type</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int CHAIN__TYPE = 1;
-
-    /**
-     * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int CHAIN__HANDLERS = 2;
-
-    /**
-     * The number of structural features of the '<em>Chain</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int CHAIN_FEATURE_COUNT = 3;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl <em>Deployable Item</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.DeployableItemImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getDeployableItem()
-     * @generated
-     */
-    public static final int DEPLOYABLE_ITEM = 12;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYABLE_ITEM__PARAMETERS = PARAMETERIZABLE__PARAMETERS;
-
-    /**
-     * The feature id for the '<em><b>Request Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYABLE_ITEM__REQUEST_FLOW = PARAMETERIZABLE_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Response Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYABLE_ITEM__RESPONSE_FLOW = PARAMETERIZABLE_FEATURE_COUNT + 1;
-
-    /**
-     * The number of structural features of the '<em>Deployable Item</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYABLE_ITEM_FEATURE_COUNT = PARAMETERIZABLE_FEATURE_COUNT + 2;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.GlobalConfigurationImpl <em>Global Configuration</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.GlobalConfigurationImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getGlobalConfiguration()
-     * @generated
-     */
-    public static final int GLOBAL_CONFIGURATION = 13;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int GLOBAL_CONFIGURATION__PARAMETERS = DEPLOYABLE_ITEM__PARAMETERS;
-
-    /**
-     * The feature id for the '<em><b>Request Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int GLOBAL_CONFIGURATION__REQUEST_FLOW = DEPLOYABLE_ITEM__REQUEST_FLOW;
-
-    /**
-     * The feature id for the '<em><b>Response Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int GLOBAL_CONFIGURATION__RESPONSE_FLOW = DEPLOYABLE_ITEM__RESPONSE_FLOW;
-
-    /**
-     * The number of structural features of the '<em>Global Configuration</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int GLOBAL_CONFIGURATION_FEATURE_COUNT = DEPLOYABLE_ITEM_FEATURE_COUNT + 0;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.TransportImpl <em>Transport</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.TransportImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getTransport()
-     * @generated
-     */
-    public static final int TRANSPORT = 14;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TRANSPORT__PARAMETERS = DEPLOYABLE_ITEM__PARAMETERS;
-
-    /**
-     * The feature id for the '<em><b>Request Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TRANSPORT__REQUEST_FLOW = DEPLOYABLE_ITEM__REQUEST_FLOW;
-
-    /**
-     * The feature id for the '<em><b>Response Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TRANSPORT__RESPONSE_FLOW = DEPLOYABLE_ITEM__RESPONSE_FLOW;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TRANSPORT__NAME = DEPLOYABLE_ITEM_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Pivot</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TRANSPORT__PIVOT = DEPLOYABLE_ITEM_FEATURE_COUNT + 1;
-
-    /**
-     * The number of structural features of the '<em>Transport</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int TRANSPORT_FEATURE_COUNT = DEPLOYABLE_ITEM_FEATURE_COUNT + 2;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.ServiceImpl <em>Service</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.ServiceImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getService()
-     * @generated
-     */
-    public static final int SERVICE = 15;
-
-    /**
-     * The feature id for the '<em><b>Parameters</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__PARAMETERS = DEPLOYABLE_ITEM__PARAMETERS;
-
-    /**
-     * The feature id for the '<em><b>Request Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__REQUEST_FLOW = DEPLOYABLE_ITEM__REQUEST_FLOW;
-
-    /**
-     * The feature id for the '<em><b>Response Flow</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__RESPONSE_FLOW = DEPLOYABLE_ITEM__RESPONSE_FLOW;
-
-    /**
-     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__TYPE_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__BEAN_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__ARRAY_MAPPINGS = DEPLOYABLE_ITEM_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__NAME = DEPLOYABLE_ITEM_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Provider</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__PROVIDER = DEPLOYABLE_ITEM_FEATURE_COUNT + 4;
-
-    /**
-     * The feature id for the '<em><b>Use</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__USE = DEPLOYABLE_ITEM_FEATURE_COUNT + 5;
-
-    /**
-     * The feature id for the '<em><b>Style</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__STYLE = DEPLOYABLE_ITEM_FEATURE_COUNT + 6;
-
-    /**
-     * The feature id for the '<em><b>Namespaces</b></em>' attribute list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__NAMESPACES = DEPLOYABLE_ITEM_FEATURE_COUNT + 7;
-
-    /**
-     * The feature id for the '<em><b>Operations</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE__OPERATIONS = DEPLOYABLE_ITEM_FEATURE_COUNT + 8;
-
-    /**
-     * The number of structural features of the '<em>Service</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int SERVICE_FEATURE_COUNT = DEPLOYABLE_ITEM_FEATURE_COUNT + 9;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.impl.DeploymentImpl <em>Deployment</em>}' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.impl.DeploymentImpl
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getDeployment()
-     * @generated
-     */
-    public static final int DEPLOYMENT = 16;
-
-    /**
-     * The feature id for the '<em><b>Type Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__TYPE_MAPPINGS = MAPPING_CONTAINER__TYPE_MAPPINGS;
-
-    /**
-     * The feature id for the '<em><b>Bean Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__BEAN_MAPPINGS = MAPPING_CONTAINER__BEAN_MAPPINGS;
-
-    /**
-     * The feature id for the '<em><b>Array Mappings</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__ARRAY_MAPPINGS = MAPPING_CONTAINER__ARRAY_MAPPINGS;
-
-    /**
-     * The feature id for the '<em><b>Name</b></em>' attribute.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__NAME = MAPPING_CONTAINER_FEATURE_COUNT + 0;
-
-    /**
-     * The feature id for the '<em><b>Global Configuration</b></em>' containment reference.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__GLOBAL_CONFIGURATION = MAPPING_CONTAINER_FEATURE_COUNT + 1;
-
-    /**
-     * The feature id for the '<em><b>Handlers</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__HANDLERS = MAPPING_CONTAINER_FEATURE_COUNT + 2;
-
-    /**
-     * The feature id for the '<em><b>Transports</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__TRANSPORTS = MAPPING_CONTAINER_FEATURE_COUNT + 3;
-
-    /**
-     * The feature id for the '<em><b>Services</b></em>' containment reference list.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT__SERVICES = MAPPING_CONTAINER_FEATURE_COUNT + 4;
-
-    /**
-     * The number of structural features of the '<em>Deployment</em>' class.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     * @ordered
-     */
-    public static final int DEPLOYMENT_FEATURE_COUNT = MAPPING_CONTAINER_FEATURE_COUNT + 5;
-
-    /**
-     * The meta object id for the '{@link org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}' enum.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.apache.axis.model.wsdd.ParameterMode
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterMode()
-     * @generated
-     */
-    public static final int PARAMETER_MODE = 17;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass parameterEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass mappingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass typeMappingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass arrayMappingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass beanMappingEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass mappingContainerEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass operationParameterEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass faultEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass operationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass parameterizableEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass handlerEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass chainEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass deployableItemEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass globalConfigurationEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass transportEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass serviceEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EClass deploymentEClass = null;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EEnum parameterModeEEnum = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private WSDDPackageImpl() {
-        super(eNS_URI, ((EFactory)WSDDFactory.INSTANCE));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-     * 
-     * <p>This method is used to initialize {@link WSDDPackageImpl#eINSTANCE} when that field is accessed.
-     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static WSDDPackageImpl init() {
-        if (isInited) return (WSDDPackageImpl)EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI);
-
-        // Obtain or create and register package
-        WSDDPackageImpl theWSDDPackage = (WSDDPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof WSDDPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new WSDDPackageImpl());
-
-        isInited = true;
-
-        // Obtain or create and register interdependencies
-        XmlPackageImpl theXmlPackage = (XmlPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI) : XmlPackageImpl.eINSTANCE);
-        SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) instanceof SOAPPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) : SOAPPackageImpl.eINSTANCE);
-
-        // Create package meta-data objects
-        theWSDDPackage.createPackageContents();
-        theXmlPackage.createPackageContents();
-        theSOAPPackage.createPackageContents();
-
-        // Initialize created meta-data
-        theWSDDPackage.initializePackageContents();
-        theXmlPackage.initializePackageContents();
-        theSOAPPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theWSDDPackage.freeze();
-
-  
-        // Update the registry and return the package
-        EPackage.Registry.INSTANCE.put(WSDDPackageImpl.eNS_URI, theWSDDPackage);
-        return theWSDDPackage;
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Parameter <em>Parameter</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Parameter</em>'.
-     * @see org.apache.axis.model.wsdd.Parameter
-     * @generated
-     */
-    public EClass getParameter() {
-        return parameterEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Parameter#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Parameter#getName()
-     * @see #getParameter()
-     * @generated
-     */
-    public EAttribute getParameter_Name() {
-        return (EAttribute)parameterEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Parameter#getValue <em>Value</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Value</em>'.
-     * @see org.apache.axis.model.wsdd.Parameter#getValue()
-     * @see #getParameter()
-     * @generated
-     */
-    public EAttribute getParameter_Value() {
-        return (EAttribute)parameterEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Mapping <em>Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Mapping</em>'.
-     * @see org.apache.axis.model.wsdd.Mapping
-     * @generated
-     */
-    public EClass getMapping() {
-        return mappingEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Mapping#getQname <em>Qname</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Qname</em>'.
-     * @see org.apache.axis.model.wsdd.Mapping#getQname()
-     * @see #getMapping()
-     * @generated
-     */
-    public EAttribute getMapping_Qname() {
-        return (EAttribute)mappingEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Mapping#getType <em>Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Type</em>'.
-     * @see org.apache.axis.model.wsdd.Mapping#getType()
-     * @see #getMapping()
-     * @generated
-     */
-    public EAttribute getMapping_Type() {
-        return (EAttribute)mappingEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Mapping#getEncodingStyle <em>Encoding Style</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Encoding Style</em>'.
-     * @see org.apache.axis.model.wsdd.Mapping#getEncodingStyle()
-     * @see #getMapping()
-     * @generated
-     */
-    public EAttribute getMapping_EncodingStyle() {
-        return (EAttribute)mappingEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.TypeMapping <em>Type Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Type Mapping</em>'.
-     * @see org.apache.axis.model.wsdd.TypeMapping
-     * @generated
-     */
-    public EClass getTypeMapping() {
-        return typeMappingEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.TypeMapping#getSerializer <em>Serializer</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Serializer</em>'.
-     * @see org.apache.axis.model.wsdd.TypeMapping#getSerializer()
-     * @see #getTypeMapping()
-     * @generated
-     */
-    public EAttribute getTypeMapping_Serializer() {
-        return (EAttribute)typeMappingEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.TypeMapping#getDeserializer <em>Deserializer</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Deserializer</em>'.
-     * @see org.apache.axis.model.wsdd.TypeMapping#getDeserializer()
-     * @see #getTypeMapping()
-     * @generated
-     */
-    public EAttribute getTypeMapping_Deserializer() {
-        return (EAttribute)typeMappingEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.ArrayMapping <em>Array Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Array Mapping</em>'.
-     * @see org.apache.axis.model.wsdd.ArrayMapping
-     * @generated
-     */
-    public EClass getArrayMapping() {
-        return arrayMappingEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.ArrayMapping#getInnerType <em>Inner Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Inner Type</em>'.
-     * @see org.apache.axis.model.wsdd.ArrayMapping#getInnerType()
-     * @see #getArrayMapping()
-     * @generated
-     */
-    public EAttribute getArrayMapping_InnerType() {
-        return (EAttribute)arrayMappingEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.BeanMapping <em>Bean Mapping</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Bean Mapping</em>'.
-     * @see org.apache.axis.model.wsdd.BeanMapping
-     * @generated
-     */
-    public EClass getBeanMapping() {
-        return beanMappingEClass;
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.MappingContainer <em>Mapping Container</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Mapping Container</em>'.
-     * @see org.apache.axis.model.wsdd.MappingContainer
-     * @generated
-     */
-    public EClass getMappingContainer() {
-        return mappingContainerEClass;
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.MappingContainer#getTypeMappings <em>Type Mappings</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Type Mappings</em>'.
-     * @see org.apache.axis.model.wsdd.MappingContainer#getTypeMappings()
-     * @see #getMappingContainer()
-     * @generated
-     */
-    public EReference getMappingContainer_TypeMappings() {
-        return (EReference)mappingContainerEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.MappingContainer#getBeanMappings <em>Bean Mappings</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Bean Mappings</em>'.
-     * @see org.apache.axis.model.wsdd.MappingContainer#getBeanMappings()
-     * @see #getMappingContainer()
-     * @generated
-     */
-    public EReference getMappingContainer_BeanMappings() {
-        return (EReference)mappingContainerEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.MappingContainer#getArrayMappings <em>Array Mappings</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Array Mappings</em>'.
-     * @see org.apache.axis.model.wsdd.MappingContainer#getArrayMappings()
-     * @see #getMappingContainer()
-     * @generated
-     */
-    public EReference getMappingContainer_ArrayMappings() {
-        return (EReference)mappingContainerEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.OperationParameter <em>Operation Parameter</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Operation Parameter</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter
-     * @generated
-     */
-    public EClass getOperationParameter() {
-        return operationParameterEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getName()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_Name() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getQname <em>Qname</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Qname</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getQname()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_Qname() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getType <em>Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Type</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getType()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_Type() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getMode <em>Mode</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Mode</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getMode()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_Mode() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getInHeader <em>In Header</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>In Header</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getInHeader()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_InHeader() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getOutHeader <em>Out Header</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Out Header</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getOutHeader()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_OutHeader() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.OperationParameter#getItemQName <em>Item QName</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Item QName</em>'.
-     * @see org.apache.axis.model.wsdd.OperationParameter#getItemQName()
-     * @see #getOperationParameter()
-     * @generated
-     */
-    public EAttribute getOperationParameter_ItemQName() {
-        return (EAttribute)operationParameterEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Fault <em>Fault</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Fault</em>'.
-     * @see org.apache.axis.model.wsdd.Fault
-     * @generated
-     */
-    public EClass getFault() {
-        return faultEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Fault#getName()
-     * @see #getFault()
-     * @generated
-     */
-    public EAttribute getFault_Name() {
-        return (EAttribute)faultEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getQname <em>Qname</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Qname</em>'.
-     * @see org.apache.axis.model.wsdd.Fault#getQname()
-     * @see #getFault()
-     * @generated
-     */
-    public EAttribute getFault_Qname() {
-        return (EAttribute)faultEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getClass_ <em>Class</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Class</em>'.
-     * @see org.apache.axis.model.wsdd.Fault#getClass_()
-     * @see #getFault()
-     * @generated
-     */
-    public EAttribute getFault_Class() {
-        return (EAttribute)faultEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Fault#getType <em>Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Type</em>'.
-     * @see org.apache.axis.model.wsdd.Fault#getType()
-     * @see #getFault()
-     * @generated
-     */
-    public EAttribute getFault_Type() {
-        return (EAttribute)faultEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Operation <em>Operation</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Operation</em>'.
-     * @see org.apache.axis.model.wsdd.Operation
-     * @generated
-     */
-    public EClass getOperation() {
-        return operationEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getName()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_Name() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getQname <em>Qname</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Qname</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getQname()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_Qname() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnQName <em>Return QName</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Return QName</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getReturnQName()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_ReturnQName() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnType <em>Return Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Return Type</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getReturnType()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_ReturnType() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnItemQName <em>Return Item QName</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Return Item QName</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getReturnItemQName()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_ReturnItemQName() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnItemType <em>Return Item Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Return Item Type</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getReturnItemType()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_ReturnItemType() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getSoapAction <em>Soap Action</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Soap Action</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getSoapAction()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_SoapAction() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(6);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getMep <em>Mep</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Mep</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getMep()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_Mep() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(7);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Operation#getReturnHeader <em>Return Header</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Return Header</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getReturnHeader()
-     * @see #getOperation()
-     * @generated
-     */
-    public EAttribute getOperation_ReturnHeader() {
-        return (EAttribute)operationEClass.getEStructuralFeatures().get(8);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Operation#getParameters <em>Parameters</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Parameters</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getParameters()
-     * @see #getOperation()
-     * @generated
-     */
-    public EReference getOperation_Parameters() {
-        return (EReference)operationEClass.getEStructuralFeatures().get(9);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Operation#getFaults <em>Faults</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Faults</em>'.
-     * @see org.apache.axis.model.wsdd.Operation#getFaults()
-     * @see #getOperation()
-     * @generated
-     */
-    public EReference getOperation_Faults() {
-        return (EReference)operationEClass.getEStructuralFeatures().get(10);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Parameterizable <em>Parameterizable</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Parameterizable</em>'.
-     * @see org.apache.axis.model.wsdd.Parameterizable
-     * @generated
-     */
-    public EClass getParameterizable() {
-        return parameterizableEClass;
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Parameterizable#getParameters <em>Parameters</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Parameters</em>'.
-     * @see org.apache.axis.model.wsdd.Parameterizable#getParameters()
-     * @see #getParameterizable()
-     * @generated
-     */
-    public EReference getParameterizable_Parameters() {
-        return (EReference)parameterizableEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Handler <em>Handler</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Handler</em>'.
-     * @see org.apache.axis.model.wsdd.Handler
-     * @generated
-     */
-    public EClass getHandler() {
-        return handlerEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Handler#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Handler#getName()
-     * @see #getHandler()
-     * @generated
-     */
-    public EAttribute getHandler_Name() {
-        return (EAttribute)handlerEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Handler#getType <em>Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Type</em>'.
-     * @see org.apache.axis.model.wsdd.Handler#getType()
-     * @see #getHandler()
-     * @generated
-     */
-    public EAttribute getHandler_Type() {
-        return (EAttribute)handlerEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Chain <em>Chain</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Chain</em>'.
-     * @see org.apache.axis.model.wsdd.Chain
-     * @generated
-     */
-    public EClass getChain() {
-        return chainEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Chain#getName()
-     * @see #getChain()
-     * @generated
-     */
-    public EAttribute getChain_Name() {
-        return (EAttribute)chainEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Type</em>'.
-     * @see org.apache.axis.model.wsdd.Chain#getType()
-     * @see #getChain()
-     * @generated
-     */
-    public EAttribute getChain_Type() {
-        return (EAttribute)chainEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Handlers</em>'.
-     * @see org.apache.axis.model.wsdd.Chain#getHandlers()
-     * @see #getChain()
-     * @generated
-     */
-    public EReference getChain_Handlers() {
-        return (EReference)chainEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.DeployableItem <em>Deployable Item</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Deployable Item</em>'.
-     * @see org.apache.axis.model.wsdd.DeployableItem
-     * @generated
-     */
-    public EClass getDeployableItem() {
-        return deployableItemEClass;
-    }
-
-    /**
-     * Returns the meta object for the containment reference '{@link org.apache.axis.model.wsdd.DeployableItem#getRequestFlow <em>Request Flow</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Request Flow</em>'.
-     * @see org.apache.axis.model.wsdd.DeployableItem#getRequestFlow()
-     * @see #getDeployableItem()
-     * @generated
-     */
-    public EReference getDeployableItem_RequestFlow() {
-        return (EReference)deployableItemEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the containment reference '{@link org.apache.axis.model.wsdd.DeployableItem#getResponseFlow <em>Response Flow</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Response Flow</em>'.
-     * @see org.apache.axis.model.wsdd.DeployableItem#getResponseFlow()
-     * @see #getDeployableItem()
-     * @generated
-     */
-    public EReference getDeployableItem_ResponseFlow() {
-        return (EReference)deployableItemEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.GlobalConfiguration <em>Global Configuration</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Global Configuration</em>'.
-     * @see org.apache.axis.model.wsdd.GlobalConfiguration
-     * @generated
-     */
-    public EClass getGlobalConfiguration() {
-        return globalConfigurationEClass;
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Transport <em>Transport</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Transport</em>'.
-     * @see org.apache.axis.model.wsdd.Transport
-     * @generated
-     */
-    public EClass getTransport() {
-        return transportEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Transport#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Transport#getName()
-     * @see #getTransport()
-     * @generated
-     */
-    public EAttribute getTransport_Name() {
-        return (EAttribute)transportEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Transport#getPivot <em>Pivot</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Pivot</em>'.
-     * @see org.apache.axis.model.wsdd.Transport#getPivot()
-     * @see #getTransport()
-     * @generated
-     */
-    public EAttribute getTransport_Pivot() {
-        return (EAttribute)transportEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Service <em>Service</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Service</em>'.
-     * @see org.apache.axis.model.wsdd.Service
-     * @generated
-     */
-    public EClass getService() {
-        return serviceEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getName()
-     * @see #getService()
-     * @generated
-     */
-    public EAttribute getService_Name() {
-        return (EAttribute)serviceEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getProvider <em>Provider</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Provider</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getProvider()
-     * @see #getService()
-     * @generated
-     */
-    public EAttribute getService_Provider() {
-        return (EAttribute)serviceEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getUse <em>Use</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Use</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getUse()
-     * @see #getService()
-     * @generated
-     */
-    public EAttribute getService_Use() {
-        return (EAttribute)serviceEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Service#getStyle <em>Style</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Style</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getStyle()
-     * @see #getService()
-     * @generated
-     */
-    public EAttribute getService_Style() {
-        return (EAttribute)serviceEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * Returns the meta object for the attribute list '{@link org.apache.axis.model.wsdd.Service#getNamespaces <em>Namespaces</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute list '<em>Namespaces</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getNamespaces()
-     * @see #getService()
-     * @generated
-     */
-    public EAttribute getService_Namespaces() {
-        return (EAttribute)serviceEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Service#getOperations <em>Operations</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Operations</em>'.
-     * @see org.apache.axis.model.wsdd.Service#getOperations()
-     * @see #getService()
-     * @generated
-     */
-    public EReference getService_Operations() {
-        return (EReference)serviceEClass.getEStructuralFeatures().get(5);
-    }
-
-    /**
-     * Returns the meta object for class '{@link org.apache.axis.model.wsdd.Deployment <em>Deployment</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for class '<em>Deployment</em>'.
-     * @see org.apache.axis.model.wsdd.Deployment
-     * @generated
-     */
-    public EClass getDeployment() {
-        return deploymentEClass;
-    }
-
-    /**
-     * Returns the meta object for the attribute '{@link org.apache.axis.model.wsdd.Deployment#getName <em>Name</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the attribute '<em>Name</em>'.
-     * @see org.apache.axis.model.wsdd.Deployment#getName()
-     * @see #getDeployment()
-     * @generated
-     */
-    public EAttribute getDeployment_Name() {
-        return (EAttribute)deploymentEClass.getEStructuralFeatures().get(0);
-    }
-
-    /**
-     * Returns the meta object for the containment reference '{@link org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration <em>Global Configuration</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference '<em>Global Configuration</em>'.
-     * @see org.apache.axis.model.wsdd.Deployment#getGlobalConfiguration()
-     * @see #getDeployment()
-     * @generated
-     */
-    public EReference getDeployment_GlobalConfiguration() {
-        return (EReference)deploymentEClass.getEStructuralFeatures().get(1);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Deployment#getHandlers <em>Handlers</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Handlers</em>'.
-     * @see org.apache.axis.model.wsdd.Deployment#getHandlers()
-     * @see #getDeployment()
-     * @generated
-     */
-    public EReference getDeployment_Handlers() {
-        return (EReference)deploymentEClass.getEStructuralFeatures().get(2);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Deployment#getTransports <em>Transports</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Transports</em>'.
-     * @see org.apache.axis.model.wsdd.Deployment#getTransports()
-     * @see #getDeployment()
-     * @generated
-     */
-    public EReference getDeployment_Transports() {
-        return (EReference)deploymentEClass.getEStructuralFeatures().get(3);
-    }
-
-    /**
-     * Returns the meta object for the containment reference list '{@link org.apache.axis.model.wsdd.Deployment#getServices <em>Services</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for the containment reference list '<em>Services</em>'.
-     * @see org.apache.axis.model.wsdd.Deployment#getServices()
-     * @see #getDeployment()
-     * @generated
-     */
-    public EReference getDeployment_Services() {
-        return (EReference)deploymentEClass.getEStructuralFeatures().get(4);
-    }
-
-    /**
-     * Returns the meta object for enum '{@link org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for enum '<em>Parameter Mode</em>'.
-     * @see org.apache.axis.model.wsdd.ParameterMode
-     * @generated
-     */
-    public EEnum getParameterMode() {
-        return parameterModeEEnum;
-    }
-
-    /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the factory that creates the instances of the model.
-     * @generated
-     */
-    public WSDDFactory getWSDDFactory() {
-        return (WSDDFactory)getEFactoryInstance();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isCreated = false;
-
-    /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void createPackageContents() {
-        if (isCreated) return;
-        isCreated = true;
-
-        // Create classes and their features
-        parameterEClass = createEClass(PARAMETER);
-        createEAttribute(parameterEClass, PARAMETER__NAME);
-        createEAttribute(parameterEClass, PARAMETER__VALUE);
-
-        mappingEClass = createEClass(MAPPING);
-        createEAttribute(mappingEClass, MAPPING__QNAME);
-        createEAttribute(mappingEClass, MAPPING__TYPE);
-        createEAttribute(mappingEClass, MAPPING__ENCODING_STYLE);
-
-        typeMappingEClass = createEClass(TYPE_MAPPING);
-        createEAttribute(typeMappingEClass, TYPE_MAPPING__SERIALIZER);
-        createEAttribute(typeMappingEClass, TYPE_MAPPING__DESERIALIZER);
-
-        arrayMappingEClass = createEClass(ARRAY_MAPPING);
-        createEAttribute(arrayMappingEClass, ARRAY_MAPPING__INNER_TYPE);
-
-        beanMappingEClass = createEClass(BEAN_MAPPING);
-
-        mappingContainerEClass = createEClass(MAPPING_CONTAINER);
-        createEReference(mappingContainerEClass, MAPPING_CONTAINER__TYPE_MAPPINGS);
-        createEReference(mappingContainerEClass, MAPPING_CONTAINER__BEAN_MAPPINGS);
-        createEReference(mappingContainerEClass, MAPPING_CONTAINER__ARRAY_MAPPINGS);
-
-        operationParameterEClass = createEClass(OPERATION_PARAMETER);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__NAME);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__QNAME);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__TYPE);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__MODE);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__IN_HEADER);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__OUT_HEADER);
-        createEAttribute(operationParameterEClass, OPERATION_PARAMETER__ITEM_QNAME);
-
-        faultEClass = createEClass(FAULT);
-        createEAttribute(faultEClass, FAULT__NAME);
-        createEAttribute(faultEClass, FAULT__QNAME);
-        createEAttribute(faultEClass, FAULT__CLASS);
-        createEAttribute(faultEClass, FAULT__TYPE);
-
-        operationEClass = createEClass(OPERATION);
-        createEAttribute(operationEClass, OPERATION__NAME);
-        createEAttribute(operationEClass, OPERATION__QNAME);
-        createEAttribute(operationEClass, OPERATION__RETURN_QNAME);
-        createEAttribute(operationEClass, OPERATION__RETURN_TYPE);
-        createEAttribute(operationEClass, OPERATION__RETURN_ITEM_QNAME);
-        createEAttribute(operationEClass, OPERATION__RETURN_ITEM_TYPE);
-        createEAttribute(operationEClass, OPERATION__SOAP_ACTION);
-        createEAttribute(operationEClass, OPERATION__MEP);
-        createEAttribute(operationEClass, OPERATION__RETURN_HEADER);
-        createEReference(operationEClass, OPERATION__PARAMETERS);
-        createEReference(operationEClass, OPERATION__FAULTS);
-
-        parameterizableEClass = createEClass(PARAMETERIZABLE);
-        createEReference(parameterizableEClass, PARAMETERIZABLE__PARAMETERS);
-
-        handlerEClass = createEClass(HANDLER);
-        createEAttribute(handlerEClass, HANDLER__NAME);
-        createEAttribute(handlerEClass, HANDLER__TYPE);
-
-        chainEClass = createEClass(CHAIN);
-        createEAttribute(chainEClass, CHAIN__NAME);
-        createEAttribute(chainEClass, CHAIN__TYPE);
-        createEReference(chainEClass, CHAIN__HANDLERS);
-
-        deployableItemEClass = createEClass(DEPLOYABLE_ITEM);
-        createEReference(deployableItemEClass, DEPLOYABLE_ITEM__REQUEST_FLOW);
-        createEReference(deployableItemEClass, DEPLOYABLE_ITEM__RESPONSE_FLOW);
-
-        globalConfigurationEClass = createEClass(GLOBAL_CONFIGURATION);
-
-        transportEClass = createEClass(TRANSPORT);
-        createEAttribute(transportEClass, TRANSPORT__NAME);
-        createEAttribute(transportEClass, TRANSPORT__PIVOT);
-
-        serviceEClass = createEClass(SERVICE);
-        createEAttribute(serviceEClass, SERVICE__NAME);
-        createEAttribute(serviceEClass, SERVICE__PROVIDER);
-        createEAttribute(serviceEClass, SERVICE__USE);
-        createEAttribute(serviceEClass, SERVICE__STYLE);
-        createEAttribute(serviceEClass, SERVICE__NAMESPACES);
-        createEReference(serviceEClass, SERVICE__OPERATIONS);
-
-        deploymentEClass = createEClass(DEPLOYMENT);
-        createEAttribute(deploymentEClass, DEPLOYMENT__NAME);
-        createEReference(deploymentEClass, DEPLOYMENT__GLOBAL_CONFIGURATION);
-        createEReference(deploymentEClass, DEPLOYMENT__HANDLERS);
-        createEReference(deploymentEClass, DEPLOYMENT__TRANSPORTS);
-        createEReference(deploymentEClass, DEPLOYMENT__SERVICES);
-
-        // Create enums
-        parameterModeEEnum = createEEnum(PARAMETER_MODE);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isInitialized = false;
-
-    /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void initializePackageContents() {
-        if (isInitialized) return;
-        isInitialized = true;
-
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
-
-        // Obtain other dependent packages
-        XmlPackageImpl theXmlPackage = (XmlPackageImpl)EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI);
-        SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI);
-
-        // Add supertypes to classes
-        typeMappingEClass.getESuperTypes().add(this.getMapping());
-        arrayMappingEClass.getESuperTypes().add(this.getMapping());
-        beanMappingEClass.getESuperTypes().add(this.getMapping());
-        handlerEClass.getESuperTypes().add(this.getParameterizable());
-        deployableItemEClass.getESuperTypes().add(this.getParameterizable());
-        globalConfigurationEClass.getESuperTypes().add(this.getDeployableItem());
-        transportEClass.getESuperTypes().add(this.getDeployableItem());
-        serviceEClass.getESuperTypes().add(this.getDeployableItem());
-        serviceEClass.getESuperTypes().add(this.getMappingContainer());
-        deploymentEClass.getESuperTypes().add(this.getMappingContainer());
-
-        // Initialize classes and features; add operations and parameters
-        initEClass(parameterEClass, Parameter.class, "Parameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getParameter_Value(), ecorePackage.getEString(), "value", null, 0, 1, Parameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(mappingEClass, Mapping.class, "Mapping", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getMapping_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMapping_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getMapping_EncodingStyle(), ecorePackage.getEString(), "encodingStyle", null, 0, 1, Mapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(typeMappingEClass, TypeMapping.class, "TypeMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTypeMapping_Serializer(), ecorePackage.getEString(), "serializer", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getTypeMapping_Deserializer(), ecorePackage.getEString(), "deserializer", null, 0, 1, TypeMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(arrayMappingEClass, ArrayMapping.class, "ArrayMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getArrayMapping_InnerType(), theXmlPackage.getQName(), "innerType", null, 0, 1, ArrayMapping.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(beanMappingEClass, BeanMapping.class, "BeanMapping", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(mappingContainerEClass, MappingContainer.class, "MappingContainer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getMappingContainer_TypeMappings(), this.getTypeMapping(), null, "typeMappings", null, 0, -1, MappingContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getMappingContainer_BeanMappings(), this.getBeanMapping(), null, "beanMappings", null, 0, -1, MappingContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getMappingContainer_ArrayMappings(), this.getArrayMapping(), null, "arrayMappings", null, 0, -1, MappingContainer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(operationParameterEClass, OperationParameter.class, "OperationParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getOperationParameter_Name(), ecorePackage.getEString(), "name", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperationParameter_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperationParameter_Type(), theXmlPackage.getQName(), "type", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperationParameter_Mode(), this.getParameterMode(), "mode", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperationParameter_InHeader(), ecorePackage.getEBooleanObject(), "inHeader", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperationParameter_OutHeader(), ecorePackage.getEBooleanObject(), "outHeader", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperationParameter_ItemQName(), theXmlPackage.getQName(), "itemQName", null, 0, 1, OperationParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(faultEClass, Fault.class, "Fault", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getFault_Name(), ecorePackage.getEString(), "name", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getFault_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getFault_Class(), ecorePackage.getEString(), "class", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getFault_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Fault.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(operationEClass, Operation.class, "Operation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getOperation_Name(), ecorePackage.getEString(), "name", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Qname(), theXmlPackage.getQName(), "qname", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ReturnQName(), theXmlPackage.getQName(), "returnQName", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ReturnType(), theXmlPackage.getQName(), "returnType", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ReturnItemQName(), theXmlPackage.getQName(), "returnItemQName", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ReturnItemType(), theXmlPackage.getQName(), "returnItemType", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_SoapAction(), ecorePackage.getEString(), "soapAction", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_Mep(), ecorePackage.getEString(), "mep", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getOperation_ReturnHeader(), ecorePackage.getEBooleanObject(), "returnHeader", null, 0, 1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_Parameters(), this.getOperationParameter(), null, "parameters", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getOperation_Faults(), this.getFault(), null, "faults", null, 0, -1, Operation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(parameterizableEClass, Parameterizable.class, "Parameterizable", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getParameterizable_Parameters(), this.getParameter(), null, "parameters", null, 0, -1, Parameterizable.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        EOperation op = addEOperation(parameterizableEClass, null, "setParameter");
-        addEParameter(op, ecorePackage.getEString(), "name", 1, 1);
-        addEParameter(op, ecorePackage.getEString(), "value", 1, 1);
-
-        initEClass(handlerEClass, Handler.class, "Handler", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getHandler_Name(), ecorePackage.getEString(), "name", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getHandler_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(chainEClass, Chain.class, "Chain", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getChain_Name(), ecorePackage.getEString(), "name", null, 0, 1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getChain_Type(), theXmlPackage.getQName(), "type", null, 0, 1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getChain_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(deployableItemEClass, DeployableItem.class, "DeployableItem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEReference(getDeployableItem_RequestFlow(), this.getChain(), null, "requestFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDeployableItem_ResponseFlow(), this.getChain(), null, "responseFlow", null, 0, 1, DeployableItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(globalConfigurationEClass, GlobalConfiguration.class, "GlobalConfiguration", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
-        initEClass(transportEClass, Transport.class, "Transport", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getTransport_Name(), ecorePackage.getEString(), "name", null, 0, 1, Transport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getTransport_Pivot(), theXmlPackage.getQName(), "pivot", null, 0, 1, Transport.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(serviceEClass, Service.class, "Service", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getService_Name(), ecorePackage.getEString(), "name", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Provider(), theXmlPackage.getQName(), "provider", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Use(), theSOAPPackage.getUse(), "use", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Style(), theSOAPPackage.getStyle(), "style", null, 0, 1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEAttribute(getService_Namespaces(), ecorePackage.getEString(), "namespaces", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getService_Operations(), this.getOperation(), null, "operations", null, 0, -1, Service.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        initEClass(deploymentEClass, Deployment.class, "Deployment", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-        initEAttribute(getDeployment_Name(), ecorePackage.getEString(), "name", null, 0, 1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDeployment_GlobalConfiguration(), this.getGlobalConfiguration(), null, "globalConfiguration", null, 0, 1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDeployment_Handlers(), this.getHandler(), null, "handlers", null, 0, -1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDeployment_Transports(), this.getTransport(), null, "transports", null, 0, -1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-        initEReference(getDeployment_Services(), this.getService(), null, "services", null, 0, -1, Deployment.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-        op = addEOperation(deploymentEClass, null, "merge");
-        addEParameter(op, this.getDeployment(), "other", 1, 1);
-
-        // Initialize enums and add enum literals
-        initEEnum(parameterModeEEnum, ParameterMode.class, "ParameterMode");
-        addEEnumLiteral(parameterModeEEnum, ParameterMode.IN_LITERAL);
-        addEEnumLiteral(parameterModeEEnum, ParameterMode.OUT_LITERAL);
-        addEEnumLiteral(parameterModeEEnum, ParameterMode.INOUT_LITERAL);
-
-        // Create resource
-        createResource(eNS_URI);
-
-        // Create annotations
-        // http:///org/eclipse/emf/ecore/util/ExtendedMetaData
-        createExtendedMetaDataAnnotations();
-    }
-
-    /**
-     * Initializes the annotations for <b>http:///org/eclipse/emf/ecore/util/ExtendedMetaData</b>.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    protected void createExtendedMetaDataAnnotations() {
-        String source = "http:///org/eclipse/emf/ecore/util/ExtendedMetaData";		
-        addAnnotation
-          (getMappingContainer_TypeMappings(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "typeMapping",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getMappingContainer_BeanMappings(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "beanMapping",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getMappingContainer_ArrayMappings(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "arrayMapping",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getOperation_Parameters(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "parameter",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getOperation_Faults(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "fault",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getParameterizable_Parameters(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "parameter",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getChain_Handlers(), 
-           source, 
-           new String[] {
-             "name", "handler",
-             "kind", "element",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getDeployableItem_RequestFlow(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "requestFlow",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getDeployableItem_ResponseFlow(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "responseFlow",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getService_Namespaces(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "namespace",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getService_Operations(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "operation",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (deploymentEClass, 
-           source, 
-           new String[] {
-             "name", "deployment",
-             "kind", "element"
-           });		
-        addAnnotation
-          (getDeployment_GlobalConfiguration(), 
-           source, 
-           new String[] {
-             "kind", "element",
-             "name", "globalConfiguration",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getDeployment_Handlers(), 
-           source, 
-           new String[] {
-             "name", "handler",
-             "kind", "element",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getDeployment_Transports(), 
-           source, 
-           new String[] {
-             "name", "transport",
-             "kind", "element",
-             "namespace", "##targetNamespace"
-           });		
-        addAnnotation
-          (getDeployment_Services(), 
-           source, 
-           new String[] {
-             "name", "service",
-             "kind", "element",
-             "namespace", "##targetNamespace"
-           });
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * Defines literals for the meta objects that represent
-     * <ul>
-     *   <li>each class,</li>
-     *   <li>each feature of each class,</li>
-     *   <li>each enum,</li>
-     *   <li>and each data type</li>
-     * </ul>
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public interface Literals {
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.ParameterImpl <em>Parameter</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.ParameterImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameter()
-         * @generated
-         */
-        public static final EClass PARAMETER = eINSTANCE.getParameter();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute PARAMETER__NAME = eINSTANCE.getParameter_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute PARAMETER__VALUE = eINSTANCE.getParameter_Value();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.MappingImpl <em>Mapping</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.MappingImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getMapping()
-         * @generated
-         */
-        public static final EClass MAPPING = eINSTANCE.getMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Qname</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute MAPPING__QNAME = eINSTANCE.getMapping_Qname();
-
-        /**
-         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute MAPPING__TYPE = eINSTANCE.getMapping_Type();
-
-        /**
-         * The meta object literal for the '<em><b>Encoding Style</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute MAPPING__ENCODING_STYLE = eINSTANCE.getMapping_EncodingStyle();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.TypeMappingImpl <em>Type Mapping</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.TypeMappingImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getTypeMapping()
-         * @generated
-         */
-        public static final EClass TYPE_MAPPING = eINSTANCE.getTypeMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Serializer</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute TYPE_MAPPING__SERIALIZER = eINSTANCE.getTypeMapping_Serializer();
-
-        /**
-         * The meta object literal for the '<em><b>Deserializer</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute TYPE_MAPPING__DESERIALIZER = eINSTANCE.getTypeMapping_Deserializer();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.ArrayMappingImpl <em>Array Mapping</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.ArrayMappingImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getArrayMapping()
-         * @generated
-         */
-        public static final EClass ARRAY_MAPPING = eINSTANCE.getArrayMapping();
-
-        /**
-         * The meta object literal for the '<em><b>Inner Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute ARRAY_MAPPING__INNER_TYPE = eINSTANCE.getArrayMapping_InnerType();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.BeanMappingImpl <em>Bean Mapping</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.BeanMappingImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getBeanMapping()
-         * @generated
-         */
-        public static final EClass BEAN_MAPPING = eINSTANCE.getBeanMapping();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.MappingContainerImpl <em>Mapping Container</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.MappingContainerImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getMappingContainer()
-         * @generated
-         */
-        public static final EClass MAPPING_CONTAINER = eINSTANCE.getMappingContainer();
-
-        /**
-         * The meta object literal for the '<em><b>Type Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference MAPPING_CONTAINER__TYPE_MAPPINGS = eINSTANCE.getMappingContainer_TypeMappings();
-
-        /**
-         * The meta object literal for the '<em><b>Bean Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference MAPPING_CONTAINER__BEAN_MAPPINGS = eINSTANCE.getMappingContainer_BeanMappings();
-
-        /**
-         * The meta object literal for the '<em><b>Array Mappings</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference MAPPING_CONTAINER__ARRAY_MAPPINGS = eINSTANCE.getMappingContainer_ArrayMappings();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.OperationParameterImpl <em>Operation Parameter</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.OperationParameterImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getOperationParameter()
-         * @generated
-         */
-        public static final EClass OPERATION_PARAMETER = eINSTANCE.getOperationParameter();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__NAME = eINSTANCE.getOperationParameter_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Qname</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__QNAME = eINSTANCE.getOperationParameter_Qname();
-
-        /**
-         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__TYPE = eINSTANCE.getOperationParameter_Type();
-
-        /**
-         * The meta object literal for the '<em><b>Mode</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__MODE = eINSTANCE.getOperationParameter_Mode();
-
-        /**
-         * The meta object literal for the '<em><b>In Header</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__IN_HEADER = eINSTANCE.getOperationParameter_InHeader();
-
-        /**
-         * The meta object literal for the '<em><b>Out Header</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__OUT_HEADER = eINSTANCE.getOperationParameter_OutHeader();
-
-        /**
-         * The meta object literal for the '<em><b>Item QName</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION_PARAMETER__ITEM_QNAME = eINSTANCE.getOperationParameter_ItemQName();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.FaultImpl <em>Fault</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.FaultImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getFault()
-         * @generated
-         */
-        public static final EClass FAULT = eINSTANCE.getFault();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute FAULT__NAME = eINSTANCE.getFault_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Qname</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute FAULT__QNAME = eINSTANCE.getFault_Qname();
-
-        /**
-         * The meta object literal for the '<em><b>Class</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute FAULT__CLASS = eINSTANCE.getFault_Class();
-
-        /**
-         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute FAULT__TYPE = eINSTANCE.getFault_Type();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.OperationImpl <em>Operation</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.OperationImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getOperation()
-         * @generated
-         */
-        public static final EClass OPERATION = eINSTANCE.getOperation();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__NAME = eINSTANCE.getOperation_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Qname</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__QNAME = eINSTANCE.getOperation_Qname();
-
-        /**
-         * The meta object literal for the '<em><b>Return QName</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__RETURN_QNAME = eINSTANCE.getOperation_ReturnQName();
-
-        /**
-         * The meta object literal for the '<em><b>Return Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__RETURN_TYPE = eINSTANCE.getOperation_ReturnType();
-
-        /**
-         * The meta object literal for the '<em><b>Return Item QName</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__RETURN_ITEM_QNAME = eINSTANCE.getOperation_ReturnItemQName();
-
-        /**
-         * The meta object literal for the '<em><b>Return Item Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__RETURN_ITEM_TYPE = eINSTANCE.getOperation_ReturnItemType();
-
-        /**
-         * The meta object literal for the '<em><b>Soap Action</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__SOAP_ACTION = eINSTANCE.getOperation_SoapAction();
-
-        /**
-         * The meta object literal for the '<em><b>Mep</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__MEP = eINSTANCE.getOperation_Mep();
-
-        /**
-         * The meta object literal for the '<em><b>Return Header</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute OPERATION__RETURN_HEADER = eINSTANCE.getOperation_ReturnHeader();
-
-        /**
-         * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference OPERATION__PARAMETERS = eINSTANCE.getOperation_Parameters();
-
-        /**
-         * The meta object literal for the '<em><b>Faults</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference OPERATION__FAULTS = eINSTANCE.getOperation_Faults();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.ParameterizableImpl <em>Parameterizable</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.ParameterizableImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterizable()
-         * @generated
-         */
-        public static final EClass PARAMETERIZABLE = eINSTANCE.getParameterizable();
-
-        /**
-         * The meta object literal for the '<em><b>Parameters</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference PARAMETERIZABLE__PARAMETERS = eINSTANCE.getParameterizable_Parameters();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.HandlerImpl <em>Handler</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.HandlerImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getHandler()
-         * @generated
-         */
-        public static final EClass HANDLER = eINSTANCE.getHandler();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute HANDLER__NAME = eINSTANCE.getHandler_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute HANDLER__TYPE = eINSTANCE.getHandler_Type();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.ChainImpl <em>Chain</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.ChainImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getChain()
-         * @generated
-         */
-        public static final EClass CHAIN = eINSTANCE.getChain();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute CHAIN__NAME = eINSTANCE.getChain_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Type</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute CHAIN__TYPE = eINSTANCE.getChain_Type();
-
-        /**
-         * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference CHAIN__HANDLERS = eINSTANCE.getChain_Handlers();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.DeployableItemImpl <em>Deployable Item</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.DeployableItemImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getDeployableItem()
-         * @generated
-         */
-        public static final EClass DEPLOYABLE_ITEM = eINSTANCE.getDeployableItem();
-
-        /**
-         * The meta object literal for the '<em><b>Request Flow</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference DEPLOYABLE_ITEM__REQUEST_FLOW = eINSTANCE.getDeployableItem_RequestFlow();
-
-        /**
-         * The meta object literal for the '<em><b>Response Flow</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference DEPLOYABLE_ITEM__RESPONSE_FLOW = eINSTANCE.getDeployableItem_ResponseFlow();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.GlobalConfigurationImpl <em>Global Configuration</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.GlobalConfigurationImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getGlobalConfiguration()
-         * @generated
-         */
-        public static final EClass GLOBAL_CONFIGURATION = eINSTANCE.getGlobalConfiguration();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.TransportImpl <em>Transport</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.TransportImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getTransport()
-         * @generated
-         */
-        public static final EClass TRANSPORT = eINSTANCE.getTransport();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute TRANSPORT__NAME = eINSTANCE.getTransport_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Pivot</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute TRANSPORT__PIVOT = eINSTANCE.getTransport_Pivot();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.ServiceImpl <em>Service</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.ServiceImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getService()
-         * @generated
-         */
-        public static final EClass SERVICE = eINSTANCE.getService();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute SERVICE__NAME = eINSTANCE.getService_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Provider</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute SERVICE__PROVIDER = eINSTANCE.getService_Provider();
-
-        /**
-         * The meta object literal for the '<em><b>Use</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute SERVICE__USE = eINSTANCE.getService_Use();
-
-        /**
-         * The meta object literal for the '<em><b>Style</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute SERVICE__STYLE = eINSTANCE.getService_Style();
-
-        /**
-         * The meta object literal for the '<em><b>Namespaces</b></em>' attribute list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute SERVICE__NAMESPACES = eINSTANCE.getService_Namespaces();
-
-        /**
-         * The meta object literal for the '<em><b>Operations</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference SERVICE__OPERATIONS = eINSTANCE.getService_Operations();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.impl.DeploymentImpl <em>Deployment</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.impl.DeploymentImpl
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getDeployment()
-         * @generated
-         */
-        public static final EClass DEPLOYMENT = eINSTANCE.getDeployment();
-
-        /**
-         * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EAttribute DEPLOYMENT__NAME = eINSTANCE.getDeployment_Name();
-
-        /**
-         * The meta object literal for the '<em><b>Global Configuration</b></em>' containment reference feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference DEPLOYMENT__GLOBAL_CONFIGURATION = eINSTANCE.getDeployment_GlobalConfiguration();
-
-        /**
-         * The meta object literal for the '<em><b>Handlers</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference DEPLOYMENT__HANDLERS = eINSTANCE.getDeployment_Handlers();
-
-        /**
-         * The meta object literal for the '<em><b>Transports</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference DEPLOYMENT__TRANSPORTS = eINSTANCE.getDeployment_Transports();
-
-        /**
-         * The meta object literal for the '<em><b>Services</b></em>' containment reference list feature.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public static final EReference DEPLOYMENT__SERVICES = eINSTANCE.getDeployment_Services();
-
-        /**
-         * The meta object literal for the '{@link org.apache.axis.model.wsdd.ParameterMode <em>Parameter Mode</em>}' enum.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see org.apache.axis.model.wsdd.ParameterMode
-         * @see org.apache.axis.model.wsdd.impl.WSDDPackageImpl#getParameterMode()
-         * @generated
-         */
-        public static final EEnum PARAMETER_MODE = eINSTANCE.getParameterMode();
-
-    }
-
-} //WSDDPackageImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/xml/XmlFactory.java b/axis-model/src/main/java/org/apache/axis/model/xml/XmlFactory.java
deleted file mode 100644
index 26276a52a..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/xml/XmlFactory.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.xml;
-
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @generated
- */
-public interface XmlFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    XmlFactory INSTANCE = org.apache.axis.model.xml.impl.XmlFactoryImpl.eINSTANCE;
-
-} //XmlFactory
diff --git a/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlFactoryImpl.java b/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlFactoryImpl.java
deleted file mode 100644
index cde19fabd..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlFactoryImpl.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.xml.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis.model.util.AxisXMLResource;
-import org.apache.axis.model.xml.*;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class XmlFactoryImpl extends EFactoryImpl implements XmlFactory {
-    /**
-     * The singleton instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final XmlFactoryImpl eINSTANCE = init();
-
-    /**
-     * Creates the default factory implementation.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static XmlFactoryImpl init() {
-        try {
-            XmlFactoryImpl theXmlFactory = (XmlFactoryImpl)EPackage.Registry.INSTANCE.getEFactory("http://axis.apache.org/emf/xml"); 
-            if (theXmlFactory != null) {
-                return theXmlFactory;
-            }
-        }
-        catch (Exception exception) {
-            EcorePlugin.INSTANCE.log(exception);
-        }
-        return new XmlFactoryImpl();
-    }
-
-    /**
-     * Creates an instance of the factory.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public XmlFactoryImpl() {
-        super();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public EObject create(EClass eClass) {
-        switch (eClass.getClassifierID()) {
-            default:
-                throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public Object createFromString(EDataType eDataType, String initialValue) {
-        switch (eDataType.getClassifierID()) {
-            case XmlPackageImpl.QNAME:
-                return createQNameFromString(eDataType, initialValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public String convertToString(EDataType eDataType, Object instanceValue) {
-        switch (eDataType.getClassifierID()) {
-            case XmlPackageImpl.QNAME:
-                return convertQNameToString(eDataType, instanceValue);
-            default:
-                throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-        }
-    }
-
-    public QName createQNameFromString(EDataType eDataType, String initialValue) {
-        throw new UnsupportedOperationException("Please use " + AxisXMLResource.class.getName() + " to load the model from XML");
-    }
-
-    public String convertQNameToString(EDataType eDataType, Object instanceValue) {
-        throw new UnsupportedOperationException("Please use " + AxisXMLResource.class.getName() + " to save the model to XML");
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public XmlPackageImpl getXmlPackage() {
-        return (XmlPackageImpl)getEPackage();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @deprecated
-     * @generated
-     */
-    public static XmlPackageImpl getPackage() {
-        return XmlPackageImpl.eINSTANCE;
-    }
-
-} //XmlFactoryImpl
diff --git a/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java b/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
deleted file mode 100644
index e6d436e7f..000000000
--- a/axis-model/src/main/java/org/apache/axis/model/xml/impl/XmlPackageImpl.java
+++ /dev/null
@@ -1,258 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id$
- */
-package org.apache.axis.model.xml.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.axis.model.soap.impl.SOAPPackageImpl;
-import org.apache.axis.model.wsdd.impl.WSDDPackageImpl;
-
-import org.apache.axis.model.xml.XmlFactory;
-
-import org.eclipse.emf.ecore.EDataType;
-import org.eclipse.emf.ecore.EFactory;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.apache.axis.model.xml.XmlFactory
- * @model kind="package"
- * @generated
- */
-public class XmlPackageImpl extends EPackageImpl {
-    /**
-     * The package name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNAME = "xml";
-
-    /**
-     * The package namespace URI.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNS_URI = "http://axis.apache.org/emf/xml";
-
-    /**
-     * The package namespace name.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final String eNS_PREFIX = "xsd";
-
-    /**
-     * The singleton instance of the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public static final XmlPackageImpl eINSTANCE = org.apache.axis.model.xml.impl.XmlPackageImpl.init();
-
-    /**
-     * The meta object id for the '<em>QName</em>' data type.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see javax.xml.namespace.QName
-     * @see org.apache.axis.model.xml.impl.XmlPackageImpl#getQName()
-     * @generated
-     */
-    public static final int QNAME = 0;
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private EDataType qNameEDataType = null;
-
-    /**
-     * Creates an instance of the model <b>Package</b>, registered with
-     * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-     * package URI value.
-     * <p>Note: the correct way to create the package is via the static
-     * factory method {@link #init init()}, which also performs
-     * initialization of the package, or returns the registered package,
-     * if one already exists.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see org.eclipse.emf.ecore.EPackage.Registry
-     * @see org.apache.axis.model.xml.impl.XmlPackageImpl#eNS_URI
-     * @see #init()
-     * @generated
-     */
-    private XmlPackageImpl() {
-        super(eNS_URI, ((EFactory)XmlFactory.INSTANCE));
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private static boolean isInited = false;
-
-    /**
-     * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
-     * 
-     * <p>This method is used to initialize {@link XmlPackageImpl#eINSTANCE} when that field is accessed.
-     * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @see #eNS_URI
-     * @see #createPackageContents()
-     * @see #initializePackageContents()
-     * @generated
-     */
-    public static XmlPackageImpl init() {
-        if (isInited) return (XmlPackageImpl)EPackage.Registry.INSTANCE.getEPackage(XmlPackageImpl.eNS_URI);
-
-        // Obtain or create and register package
-        XmlPackageImpl theXmlPackage = (XmlPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof XmlPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new XmlPackageImpl());
-
-        isInited = true;
-
-        // Obtain or create and register interdependencies
-        WSDDPackageImpl theWSDDPackage = (WSDDPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) instanceof WSDDPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(WSDDPackageImpl.eNS_URI) : WSDDPackageImpl.eINSTANCE);
-        SOAPPackageImpl theSOAPPackage = (SOAPPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) instanceof SOAPPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(SOAPPackageImpl.eNS_URI) : SOAPPackageImpl.eINSTANCE);
-
-        // Create package meta-data objects
-        theXmlPackage.createPackageContents();
-        theWSDDPackage.createPackageContents();
-        theSOAPPackage.createPackageContents();
-
-        // Initialize created meta-data
-        theXmlPackage.initializePackageContents();
-        theWSDDPackage.initializePackageContents();
-        theSOAPPackage.initializePackageContents();
-
-        // Mark meta-data to indicate it can't be changed
-        theXmlPackage.freeze();
-
-  
-        // Update the registry and return the package
-        EPackage.Registry.INSTANCE.put(XmlPackageImpl.eNS_URI, theXmlPackage);
-        return theXmlPackage;
-    }
-
-
-    /**
-     * Returns the meta object for data type '{@link javax.xml.namespace.QName <em>QName</em>}'.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the meta object for data type '<em>QName</em>'.
-     * @see javax.xml.namespace.QName
-     * @model instanceClass="javax.xml.namespace.QName"
-     * @generated
-     */
-    public EDataType getQName() {
-        return qNameEDataType;
-    }
-
-    /**
-     * Returns the factory that creates the instances of the model.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @return the factory that creates the instances of the model.
-     * @generated
-     */
-    public XmlFactory getXmlFactory() {
-        return (XmlFactory)getEFactoryInstance();
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isCreated = false;
-
-    /**
-     * Creates the meta-model objects for the package.  This method is
-     * guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void createPackageContents() {
-        if (isCreated) return;
-        isCreated = true;
-
-        // Create data types
-        qNameEDataType = createEDataType(QNAME);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    private boolean isInitialized = false;
-
-    /**
-     * Complete the initialization of the package and its meta-model.  This
-     * method is guarded to have no affect on any invocation but its first.
-     * <!-- begin-user-doc -->
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public void initializePackageContents() {
-        if (isInitialized) return;
-        isInitialized = true;
-
-        // Initialize package
-        setName(eNAME);
-        setNsPrefix(eNS_PREFIX);
-        setNsURI(eNS_URI);
-
-        // Initialize data types
-        initEDataType(qNameEDataType, QName.class, "QName", IS_SERIALIZABLE, !IS_GENERATED_INSTANCE_CLASS);
-
-        // Create resource
-        createResource(eNS_URI);
-    }
-
-    /**
-     * <!-- begin-user-doc -->
-     * Defines literals for the meta objects that represent
-     * <ul>
-     *   <li>each class,</li>
-     *   <li>each feature of each class,</li>
-     *   <li>each enum,</li>
-     *   <li>and each data type</li>
-     * </ul>
-     * <!-- end-user-doc -->
-     * @generated
-     */
-    public interface Literals {
-        /**
-         * The meta object literal for the '<em>QName</em>' data type.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see javax.xml.namespace.QName
-         * @see org.apache.axis.model.xml.impl.XmlPackageImpl#getQName()
-         * @generated
-         */
-        public static final EDataType QNAME = eINSTANCE.getQName();
-
-    }
-
-} //XmlPackageImpl

From 9750d80a7bcc9873152ca07d6b634e949313c7b6 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 7 May 2018 21:30:00 +0000
Subject: [PATCH 078/133] Fix Javadoc issues in axis-model.

---
 .../apache/axis/model/util/AxisXMLResource.java  | 16 ++++++++--------
 pom.xml                                          | 15 +++++++++++++++
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
index f5a87116e..071fdf1b4 100644
--- a/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
+++ b/axis-model/src/main/java/org/apache/axis/model/util/AxisXMLResource.java
@@ -40,14 +40,14 @@ public class AxisXMLResource extends XMLResourceImpl {
      * 
      * <pre>
      * &lt;deployment xmlns="http://xml.apache.org/axis/wsdd/"
-     *             xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-     *   &lt;transport name="http">
-     *     &lt;requestFlow>
-     *       &lt;handler type="URLMapper"/>
-     *       &lt;handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
-     *     &lt;/requestFlow>
-     *   &lt;/transport>
-     * &lt;/deployment>
+     *             xmlns:java="http://xml.apache.org/axis/wsdd/providers/java"&gt;
+     *   &lt;transport name="http"&gt;
+     *     &lt;requestFlow&gt;
+     *       &lt;handler type="URLMapper"/&gt;
+     *       &lt;handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/&gt;
+     *     &lt;/requestFlow&gt;
+     *   &lt;/transport&gt;
+     * &lt;/deployment&gt;
      * </pre>
      * 
      * If the <tt>type</tt> attribute is assumed to be of type <tt>xsd:QName</tt>, then the
diff --git a/pom.xml b/pom.xml
index becc3a07c..38a52a1a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,6 +187,21 @@
                     <version>3.0.0</version>
                     <configuration>
                         <source>1.4</source>
+                        <tags>
+                            <!-- Custom tags used by EMF -->
+                            <tag>
+                                <name>generated</name>
+                                <placement>X</placement>
+                            </tag>
+                            <tag>
+                                <name>model</name>
+                                <placement>X</placement>
+                            </tag>
+                            <tag>
+                                <name>ordered</name>
+                                <placement>X</placement>
+                            </tag>
+                        </tags>
                     </configuration>
                 </plugin>
                 <plugin>

From 6ab300d859209368a0464420bd4b589b9d697f93 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 06:50:54 +0000
Subject: [PATCH 079/133] Ignore HTML problems in Javadoc generated by EMF.

---
 axis-model/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index d0bc463e0..f0217351c 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -128,6 +128,13 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <!-- TODO: check if a newer EMF version produces correct HTML -->
+                    <doclint>all,-html</doclint>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

From 9f2fb33272d0e168e27ee6428a7000deeb0256f5 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 19:23:32 +0000
Subject: [PATCH 080/133] Set up Travis-CI.

---
 .travis.yml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..07a6b7699
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,9 @@
+dist: trusty
+language: java
+jdk:
+  - openjdk8
+install: echo NOOP Skipping pre-fetch of Maven dependencies
+cache:
+  directories:
+    - $HOME/.m2
+script: mvn clean verify -Papache-release -Dgpg.skip=true

From af832ace842f3fd8b570f7e69a6e693efb8590f4 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 20:25:23 +0000
Subject: [PATCH 081/133] Use the javax.tools API in axis-rt-jws.

---
 axis-rt-jws/pom.xml                           |   4 +
 .../components/compiler/AbstractCompiler.java | 189 -----------
 .../axis/components/compiler/Compiler.java    |  86 -----
 .../components/compiler/CompilerError.java    | 162 ---------
 .../components/compiler/CompilerFactory.java  |  57 ----
 .../axis/components/compiler/Javac.java       | 318 ------------------
 .../axis/components/compiler/Jikes.java       | 256 --------------
 .../org/apache/axis/handlers/JWSHandler.java  |  53 +--
 .../org/apache/axis/utils/ClasspathUtils.java |  56 ++-
 pom.xml                                       |   2 +
 src/site/apt/changelogs/1_4_1.apt             |   2 +
 11 files changed, 62 insertions(+), 1123 deletions(-)
 delete mode 100644 axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java
 delete mode 100644 axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java
 delete mode 100644 axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java
 delete mode 100644 axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java
 delete mode 100644 axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java
 delete mode 100644 axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java

diff --git a/axis-rt-jws/pom.xml b/axis-rt-jws/pom.xml
index fb885b1f0..1a8c26619 100644
--- a/axis-rt-jws/pom.xml
+++ b/axis-rt-jws/pom.xml
@@ -34,6 +34,10 @@
             <url>${baseSiteUrl}/jws</url>
         </site>
     </distributionManagement>
+    <properties>
+        <!-- We use the javax.tools API which was introduced in Java 6. -->
+        <javaVersion>1.6</javaVersion>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java
deleted file mode 100644
index e15961920..000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/AbstractCompiler.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.compiler;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * This class implements the functionality common to all Java compilers.
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @since 2.0
- */
-public abstract class AbstractCompiler implements Compiler {
-
-  /**
-   * The source program filenames
-   */
-  protected ArrayList  fileList = new ArrayList();
-
-  /**
-   * The name of the directory containing the source program file
-   */
-  protected String    srcDir;
-
-  /**
-   * The name of the directory to contain the resulting object program file
-   */
-  protected String    destDir;
-
-  /**
-   * The classpath to be used for compilation
-   */
-  protected String    classpath;
-
-  /**
-   * The encoding of the source program or <code>null</code> to use the
-   * platform's default encoding
-   */
-  protected String    encoding = null;
-
-  /**
-   * The input stream to output compilation errors
-   */
-  protected InputStream errors;
-
-  /**
-   * Add the name of the file containing the source program to the file list
-   *
-   * @param file The name of the file containing the source program
-   */
-  public void addFile(String file) {
-    this.fileList.add(file);
-  }
-
-  /**
-   * Set the name of the directory containing the source program file
-   *
-   * @param srcDir The name of the directory containing the source program file
-   */
-  public void setSource(String srcDir) {
-    this.srcDir = srcDir;
-  }
-
-  /**
-   * Set the name of the directory to contain the resulting object program file
-   *
-   * @param destDir The name of the directory to contain the resulting object
-   * program file
-   */
-  public void setDestination(String destDir) {
-      this.destDir = destDir;
-  }
-
-  /**
-   * Set the classpath to be used for this compilation
-   *
-   * @param classpath The classpath to be used for this compilation
-   */
-  public void setClasspath(String classpath) {
-    this.classpath = classpath;
-  }
-
-  /**
-   * Set the encoding of the input source file or <code>null</code> to use the
-   * platform's default encoding
-   *
-   * @param encoding The encoding of the input source file or <code>null</code>
-   * to use the platform's default encoding
-   */
-  public void setEncoding(String encoding) {
-    this.encoding = encoding;
-  }
-
-  /**
-   * Return the list of errors generated by this compilation
-   *
-   * @return The list of errors generated by this compilation
-   * @exception IOException If an error occurs during message collection
-   */
-  public List getErrors() throws IOException {
-    return parseStream(new BufferedReader(new InputStreamReader(errors)));
-  }
-
-  /**
-   * Parse the compiler error stream to produce a list of
-   * <code>CompilerError</code>s
-   *
-   * @param errors The error stream
-   * @return The list of compiler error messages
-   * @exception IOException If an error occurs during message collection
-   */
-  protected abstract List parseStream(BufferedReader errors)
-      throws IOException;
-
-  /**
-   * Fill the arguments taken by the Java compiler
-   *
-   * @param arguments The list of compilation arguments
-   * @return The prepared list of compilation arguments
-   */
-  protected List fillArguments(List arguments) {
-    // destination directory
-    arguments.add("-d");
-    arguments.add(destDir);
-
-    // classpath
-    arguments.add("-classpath");
-    arguments.add(classpath);
-
-    // sourcepath
-    if(srcDir != null) {
-        arguments.add("-sourcepath");
-        arguments.add(srcDir);
-    }
-
-    // add optimization (for what is worth)
-    arguments.add("-O");
-
-    // add debug option
-    arguments.add("-g");
-
-    // add encoding if set
-    if (encoding != null) {
-      arguments.add("-encoding");
-      arguments.add(encoding);
-    }
-
-    return arguments;
-  }
-
-  /**
-   * Copy arguments to a string array
-   *
-   * @param arguments The compiler arguments
-   * @return A string array containing compilation arguments
-   */
-  protected String[] toStringArray(List arguments) {
-    int    i;
-    String[] args = new String[arguments.size() + fileList.size()];
-
-    for (i = 0; i < arguments.size(); i++) {
-      args[i] = (String) arguments.get(i);
-    }
-
-    for (int j=0; j < fileList.size(); i++,j++) {
-        args[i] = (String)fileList.get(j);
-    }
-    return args;
-  }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java
deleted file mode 100644
index 92f34f5a7..000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Compiler.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.compiler;
-
-import java.io.IOException;
-import java.util.List;
-
-/**
- * This interface defines a compiler's functionality for all
- * (Java-based) compiled languages
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @since 2.0
- */
-public interface Compiler {
-  /**
-   * Set the name of the file containing the source program
-   *
-   * @param file The name of the file containing the source program
-   */
-  void addFile(String file);
-
-  /**
-   * Set the name of the directory containing the source program file
-   *
-   * @param srcDir The name of the directory containing the source program file
-   */
-  void setSource(String srcDir);
-
-  /**
-   * Set the name of the directory to contain the resulting object program file
-   *
-   * @param destDir The name of the directory to contain the resulting object
-   * program file
-   */
-  void setDestination(String destDir);
-
-  /**
-   * Set the classpath to be used for this compilation
-   *
-   * @param classpath The classpath to be used for this compilation
-   */
-  void setClasspath(String classpath);
-
-  /**
-   * Set the encoding of the input source file or <code>null</code> to use the
-   * platform's default encoding
-   *
-   * @param encoding The encoding of the input source file or <code>null</code>
-   * to use the platform's default encoding
-   */
-  void setEncoding(String encoding);
-
-  /**
-   * Compile a source file yielding a loadable program file.
-   *
-   * @param filename The object program base file name
-   * @param baseDirectory The directory containing the object program file
-   * @param encoding The encoding expected in the source file or
-   * <code>null</code> if it is the platform's default encoding
-   * @exception LanguageException If an error occurs during compilation
-   */
-  boolean compile() throws IOException;
-
-  /**
-   * Return the list of errors generated by this compilation
-   *
-   * @return The list of errors generated by this compilation
-   * @exception IOException If an error occurs during message collection
-   */
-  List getErrors() throws IOException;
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java
deleted file mode 100644
index bb006fd85..000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerError.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.compiler;
-
-/**
- * This class encapsulates an error message produced by a programming language
- * processor (whether interpreted or compiled)
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @since 2.0
- */
-
-public class CompilerError {
-  /**
-   * Is this a severe error or a warning?
-   */
-  private boolean error;
-  /**
-   * The start line number of the offending program text
-   */
-  private int startline;
-  /**
-   * The start column number of the offending program text
-   */
-  private int startcolumn;
-  /**
-   * The end line number of the offending program text
-   */
-  private int endline;
-  /**
-   * The end column number of the offending program text
-   */
-  private int endcolumn;
-  /**
-   * The name of the file containing the offending program text
-   */
-  private String file;
-  /**
-   * The actual error text produced by the language processor
-   */
-  private String message;
-    
-  /**
-   * The error message constructor.
-   *
-   * @param file The name of the file containing the offending program text
-   * @param error The actual error text produced by the language processor
-   * @param startline The start line number of the offending program text
-   * @param startcolumn The start column number of the offending program text
-   * @param endline The end line number of the offending program text
-   * @param endcolumn The end column number of the offending program text
-   * @param message The actual error text produced by the language processor
-   */
-  public CompilerError(
-    String file,
-    boolean error,
-    int startline,
-    int startcolumn,
-    int endline,
-    int endcolumn,
-    String message
-  ) 
-  {
-    this.file = file;
-    this.error = error;
-    this.startline = startline;
-    this.startcolumn = startcolumn;
-    this.endline = endline;
-    this.endcolumn = endcolumn;
-    this.message = message;
-  }
-
-  /**
-   * The error message constructor.
-   *
-   * @param message The actual error text produced by the language processor
-   */
-  public CompilerError(String message) {
-    this.message = message;
-  }
-  
-  /**
-   * Return the filename associated with this compiler error.
-   *
-   * @return The filename associated with this compiler error
-   */
-  public String getFile() {
-    return file;
-  }
-
-  /**
-   * Assert whether this is a severe error or a warning
-   *
-   * @return Whether the error is severe
-   */
-  public boolean isError() {
-    return error;
-  }
-
-  /**
-   * Return the starting line number of the program text originating this error
-   *
-   * @return The starting line number of the program text originating this error
-   */
-  public int getStartLine() {
-    return startline;
-  }
-
-  /**
-   * Return the starting column number of the program text originating this
-   * error
-   *
-   * @return The starting column number of the program text originating this
-   * error
-   */
-  public int getStartColumn() {
-    return startcolumn;
-  }
-
-  /**
-   * Return the ending line number of the program text originating this error
-   *
-   * @return The ending line number of the program text originating this error
-   */
-  public int getEndLine() {
-    return endline;
-  }
-
-  /**
-   * Return the ending column number of the program text originating this
-   * error
-   *
-   * @return The ending column number of the program text originating this
-   * error
-   */
-  public int getEndColumn() {
-    return endcolumn;
-  }
-
-  /**
-   * Return the message produced by the language processor
-   *
-   * @return The message produced by the language processor
-   */
-  public String getMessage() {
-    return message;
-  }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java
deleted file mode 100644
index e2db8d8fb..000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/CompilerFactory.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.compiler;
-
-import org.apache.axis.AxisProperties;
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-
-/**
- * This class implements a factory to instantiate a Compiler.
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @since 2.0
- */
-public class CompilerFactory {
-    protected static Log log =
-        LogFactory.getLog(CompilerFactory.class.getName());
-
-    static {
-        AxisProperties.setClassOverrideProperty(Compiler.class, "axis.Compiler");
-
-        AxisProperties.setClassDefault(Compiler.class,
-                                       "org.apache.axis.components.compiler.Javac");
-    }
-
-    public static Compiler getCompiler() {
-        Compiler compiler = (Compiler)AxisProperties.newInstance(Compiler.class);
-        
-        /**
-         * This shouldn't be needed, but seems to be a common feel-good:
-         */
-        if (compiler == null) {
-            log.debug(Messages.getMessage("defaultCompiler"));
-            compiler = new Javac();
-        }
-
-        log.debug("axis.Compiler:" + compiler.getClass().getName());
-
-        return compiler;
-    }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java
deleted file mode 100644
index db20ee011..000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Javac.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.compiler;
-
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.StringTokenizer;
-import java.net.URL;
-import java.net.MalformedURLException;
-import java.net.URLClassLoader;
-
-/**
- * This class wraps the Sun's Javac Compiler.
- *
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @since 2.0
- */
-
-public class Javac extends AbstractCompiler
-{
-    protected static Log log =
-        LogFactory.getLog(Javac.class.getName());
-
-    public static final String CLASSIC_CLASS = "sun.tools.javac.Main";
-    public static final String MODERN_CLASS = "com.sun.tools.javac.main.Main";
-
-    private boolean modern = false;
-
-    public Javac() {
-        ClassLoader cl = getClassLoader();
-        try {
-            ClassUtils.forName(MODERN_CLASS, true, cl);
-            modern = true;
-        } catch (ClassNotFoundException e) {
-            log.debug(Messages.getMessage("noModernCompiler"));
-            try {
-                ClassUtils.forName(CLASSIC_CLASS, true, cl);
-                modern = false;
-            } catch (Exception ex) {
-                log.error(Messages.getMessage("noCompiler00"), ex);
-                throw new RuntimeException(Messages.getMessage("noCompiler00"));
-            }
-        }
-        log.debug(Messages.getMessage("compilerClass",
-                (modern ? MODERN_CLASS : CLASSIC_CLASS)));
-    }
-
-    private ClassLoader getClassLoader() {
-        // Use reflection to be able to build on all JDKs
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-
-        URL toolsURL = null;
-        String tools = System.getProperty("java.home");
-        if (tools != null) {
-            File f = new File(tools + "/../lib/tools.jar");
-            if (f.exists()) {
-                try {
-                    toolsURL = f.toURL();
-                    cl = new URLClassLoader(new URL[]{toolsURL}, cl);
-                } catch (MalformedURLException e) {
-                }
-            }
-        }
-        
-        return cl;
-    }
-
-    /**
-     * Compile a source file yielding a loadable class file.
-     *
-     * @exception IOException If an error occurs during compilation
-     */
-    public boolean compile() throws IOException {
-        ByteArrayOutputStream err = new ByteArrayOutputStream();
-        boolean result = false;
-
-        try {
-            // Create an instance of the compiler, redirecting output to err
-            Class c = ClassUtils.forName(modern ? MODERN_CLASS : CLASSIC_CLASS, 
-                                         true,
-                                         getClassLoader());
-
-            Constructor cons;
-            Object compiler;
-            if (modern) {
-                PrintWriter pw = new PrintWriter(new OutputStreamWriter(err));
-                cons = 
-                    c.getConstructor(new Class[] { String.class,
-                                                   PrintWriter.class});
-       
-                compiler = cons.newInstance(new Object[] { "javac", pw });
-            }
-            else {
-                cons =
-                    c.getConstructor(new Class[] { OutputStream.class,
-                                                   String.class });
-                compiler = cons.newInstance(new Object[] { err, "javac" });
-        
-            }
-              
-            // Call the compile() method
-            Method compile = c.getMethod("compile",
-                                         new Class [] { String[].class });
-
-            if (modern) {
-                int compilationResult = 
-                    ((Integer)compile.invoke(compiler, new Object[] 
-                        {
-                            toStringArray(fillArguments
-                                          (new ArrayList()))})).intValue();
-
-                result = (compilationResult == 0);        
-                log.debug("Compilation Returned: " 
-                          + Integer.toString(compilationResult));
-            }
-            else {
-                Boolean ok = 
-                    (Boolean)compile.invoke(compiler, new Object[] 
-                        {toStringArray(fillArguments(new ArrayList()))});
-        
-                result = ok.booleanValue();
-            }
-        } catch (Exception cnfe){
-            log.error(Messages.getMessage("noCompiler00"), cnfe);
-            throw new RuntimeException(Messages.getMessage("noCompiler00"));
-        }
-
-        this.errors = new ByteArrayInputStream(err.toByteArray());
-        return result;
-    }
-
-    /**
-     * Parse the compiler error stream to produce a list of
-     * <code>CompilerError</code>s
-     *
-     * @param input The error stream
-     * @return The list of compiler error messages
-     * @exception IOException If an error occurs during message collection
-     */
-    protected List parseStream(BufferedReader input) throws IOException {
-        if (modern) {
-            return parseModernStream(input);
-        } else {
-            return parseClassicStream(input);
-        }
-    }
-
-    /**
-     * Parse the compiler error stream to produce a list of
-     * <code>CompilerError</code>s
-     *
-     * @param input The error stream
-     * @return The list of compiler error messages
-     * @exception IOException If an error occurs during message collection
-     */
-    protected List parseModernStream(BufferedReader input) throws IOException {
-        List errors = new ArrayList();
-        String line = null;
-        StringBuffer buffer = null;
-
-        while (true) {
-            // cleanup the buffer
-            buffer = new StringBuffer(); // this is quicker than clearing it
-
-            // most errors terminate with the '^' char
-            do {
-                if ((line = input.readLine()) == null)
-                {
-                    if (buffer.length() > 0) {
-                        // There's an error which doesn't end with a '^'
-                        errors.add(new CompilerError("\n" + buffer.toString()));
-                    }
-                    return errors;
-                }
-                log.debug(line);
-                buffer.append(line);
-                buffer.append('\n');
-            } while (!line.endsWith("^"));
-
-            // add the error bean
-            errors.add(parseModernError(buffer.toString()));
-        }
-    }
-
-    /**
-     * Parse an individual compiler error message with modern style.
-     *
-     * @param error The error text
-     * @return A messaged <code>CompilerError</code>
-     */
-    private CompilerError parseModernError(String error) {
-        StringTokenizer tokens = new StringTokenizer(error, ":");
-        try {
-            String file = tokens.nextToken();
-            if (file.length() == 1) file = new StringBuffer(file).append(":").append(tokens.nextToken()).toString();
-            int line = Integer.parseInt(tokens.nextToken());
-
-            String message = tokens.nextToken("\n").substring(1);
-            String context = tokens.nextToken("\n");
-            String pointer = tokens.nextToken("\n");
-            int startcolumn = pointer.indexOf("^");
-            int endcolumn = context.indexOf(" ", startcolumn);
-            if (endcolumn == -1) endcolumn = context.length();
-            return new CompilerError(file, false, line, startcolumn, line, endcolumn, message);
-        } catch(NoSuchElementException nse) {
-            return new CompilerError(Messages.getMessage("noMoreTokens", error));
-        } catch(Exception nse) {
-            return new CompilerError(Messages.getMessage("cantParse", error));
-        }
-    }
-
-    /**
-     * Parse the compiler error stream to produce a list of
-     * <code>CompilerError</code>s
-     *
-     * @param input The error stream
-     * @return The list of compiler error messages
-     * @exception IOException If an error occurs during message collection
-     */
-    protected List parseClassicStream(BufferedReader input) throws IOException {
-        List errors = null;
-        String line = null;
-        StringBuffer buffer = null;
-
-        while (true) {
-            // cleanup the buffer
-            buffer = new StringBuffer(); // this is faster than clearing it
-
-            // each error has 3 lines
-            for (int i = 0; i < 3 ; i++) {
-                if ((line = input.readLine()) == null) return errors;
-                log.debug(line);
-                buffer.append(line);
-                buffer.append('\n');
-            }
-
-            // if error is found create the vector
-            if (errors == null) errors = new ArrayList();
-
-            // add the error bean
-            errors.add(parseClassicError(buffer.toString()));
-        }
-    }
-
-    /**
-     * Parse an individual compiler error message with classic style.
-     *
-     * @param error The error text
-     * @return A messaged <code>CompilerError</code>
-     */
-    private CompilerError parseClassicError(String error) {
-        StringTokenizer tokens = new StringTokenizer(error, ":");
-        try {
-            String file = tokens.nextToken();
-            if (file.length() == 1) {
-                file = new StringBuffer(file).append(":").
-                        append(tokens.nextToken()).toString();
-            }
-            int line = Integer.parseInt(tokens.nextToken());
-
-            String last = tokens.nextToken();
-            // In case the message contains ':', it should be reassembled
-            while (tokens.hasMoreElements()) {
-                last += tokens.nextToken();
-            }
-            tokens = new StringTokenizer(last.trim(), "\n");
-            String message = tokens.nextToken();
-            String context = tokens.nextToken();
-            String pointer = tokens.nextToken();
-            int startcolumn = pointer.indexOf("^");
-            int endcolumn = context.indexOf(" ", startcolumn);
-            if (endcolumn == -1) endcolumn = context.length();
-
-            return new CompilerError(srcDir + File.separator + file, true,
-                    line, startcolumn, line, endcolumn, message);
-        } catch(NoSuchElementException nse) {
-            return new CompilerError(Messages.getMessage("noMoreTokens",
-                    error));
-        } catch(Exception nse) {
-            return new CompilerError(Messages.getMessage("cantParse", error));
-        }
-    }
-
-    public String toString() {
-        return Messages.getMessage("sunJavac");
-    }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java b/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java
deleted file mode 100644
index d4937019b..000000000
--- a/axis-rt-jws/src/main/java/org/apache/axis/components/compiler/Jikes.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Copyright 2001-2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.compiler;
-
-import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.utils.Messages;
-import org.apache.commons.logging.Log;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-/**
- * This class wraps IBM's <i>Jikes</i> Java compiler
- * NOTE: inspired by the Apache Jasper implementation.
- * @author <a href="mailto:dims@yahoo.com">Davanum Srinivas</a>
- * @author <a href="mailto:stefano@apache.org">Stefano Mazzocchi</a>
- * @since 2.0
- */
-
-public class Jikes extends AbstractCompiler
-{
-    protected static Log log =
-            LogFactory.getLog(Jikes.class.getName());
-    
-    static final int OUTPUT_BUFFER_SIZE = 1024;
-    static final int BUFFER_SIZE = 512;
-
-    private class StreamPumper extends Thread {
-
-        private BufferedInputStream stream;
-        private boolean endOfStream = false;
-        private boolean stopSignal  = false;
-        private int SLEEP_TIME = 5;
-        private OutputStream out;
-
-        public StreamPumper(BufferedInputStream is, OutputStream out) {
-            this.stream = is;
-            this.out = out;
-        }
-
-        public void pumpStream() throws IOException {
-            byte[] buf = new byte[BUFFER_SIZE];
-            if (!endOfStream) {
-                int bytesRead = stream.read(buf, 0, BUFFER_SIZE);
-
-                if (bytesRead > 0) {
-                    out.write(buf, 0, bytesRead);
-                } else if (bytesRead == -1) {
-                    endOfStream = true;
-                }
-            }
-        }
-
-        public void run() {
-            try {
-                while (!endOfStream) {
-                    pumpStream();
-                    sleep(SLEEP_TIME);
-                }
-            } catch (Exception e) {
-               // getLogger().warn("Jikes.run()", e);
-            }
-        }
-    }
-
-    /**
-     * Copy arguments to a string array
-     *
-     * @param arguments The compiler arguments
-     * @return A string array containing compilation arguments
-     */
-    protected String[] toStringArray(List arguments) {
-        int i;
-
-        for (i = 0; i < arguments.size(); i++) {
-            String arg = (String) arguments.get(i);
-            if (arg.equals("-sourcepath")) {
-                // Remove -sourcepath option. Jikes does not understand that.
-                arguments.remove(i);
-                arguments.remove(i);
-                break;
-            }
-        }
-
-        String[] args = new String[arguments.size() + fileList.size()];
-        for (i = 0; i < arguments.size(); i++) {
-            args[i] = (String) arguments.get(i);
-        }
-
-        for (int j=0; j < fileList.size(); i++,j++) {
-            args[i] = (String)fileList.get(j);
-        }
-
-        return args;
-    }
-
-    /**
-     * Execute the compiler
-     */
-    public boolean compile() throws IOException {
-
-        List args = new ArrayList();
-        // command line name
-        args.add("jikes");
-        // indicate Emacs output mode must be used
-        args.add("+E");
-        // avoid warnings
-        // Option nowarn with one hyphen only
-        args.add("-nowarn");
-
-        int exitValue;
-        ByteArrayOutputStream tmpErr = new ByteArrayOutputStream(OUTPUT_BUFFER_SIZE);
-
-        try {
-            Process p = Runtime.getRuntime().exec(toStringArray(fillArguments(args)));
-
-            BufferedInputStream compilerErr = new BufferedInputStream(p.getErrorStream());
-
-            StreamPumper errPumper = new StreamPumper(compilerErr, tmpErr);
-
-            errPumper.start();
-
-            p.waitFor();
-            exitValue = p.exitValue();
-
-            // Wait until the complete error stream has been read
-            errPumper.join();
-            compilerErr.close();
-
-            p.destroy();
-
-            tmpErr.close();
-            this.errors = new ByteArrayInputStream(tmpErr.toByteArray());
-
-        } catch (InterruptedException somethingHappened) {
-            log.debug("Jikes.compile():SomethingHappened", somethingHappened);
-            return false;
-        }
-
-        // Jikes returns 0 even when there are some types of errors.
-        // Check if any error output as well
-        // Return should be OK when both exitValue and
-        // tmpErr.size() are 0 ?!
-        return ((exitValue == 0) && (tmpErr.size() == 0));
-    }
-
-    /**
-     * Parse the compiler error stream to produce a list of
-     * <code>CompilerError</code>s
-     *
-     * @param input The error stream
-     * @return The list of compiler error messages
-     * @exception IOException If an error occurs during message collection
-     */
-    protected List parseStream(BufferedReader input) throws IOException {
-        List errors = null;
-        String line = null;
-        StringBuffer buffer = null;
-
-        while (true) {
-            // cleanup the buffer
-            buffer = new StringBuffer(); // this is faster than clearing it
-
-            // first line is not space-starting
-            if (line == null) line = input.readLine();
-            if (line == null) return errors;
-            log.debug(line);
-            buffer.append(line);
-
-            // all other space-starting lines are one error
-            while (true) {
-                line = input.readLine();
-                // EOF
-                if (line == null)
-                    break;
-                // Continuation of previous error starts with ' '
-                if (line.length() > 0 && line.charAt(0) != ' ')
-                    break;
-                log.debug(line);
-                buffer.append('\n');
-                buffer.append(line);
-            }
-
-            // if error is found create the vector
-            if (errors == null) errors = new ArrayList();
-
-            // add the error bean
-            errors.add(parseError(buffer.toString()));
-        }
-    }
-
-    /**
-     * Parse an individual compiler error message
-     *
-     * @param error The error text
-     * @return A mssaged <code>CompilerError</code>
-     */
-    private CompilerError parseError(String error) {
-        StringTokenizer tokens = new StringTokenizer(error, ":");
-        String file = tokens.nextToken();
-        if (file.length() == 1) file = new StringBuffer(file).append(":").append(tokens.nextToken()).toString();
-        StringBuffer message = new StringBuffer();
-        String type = "";
-        int startline = 0;
-        int startcolumn = 0;
-        int endline = 0;
-        int endcolumn = 0;
-
-        try {
-            startline = Integer.parseInt(tokens.nextToken());
-            startcolumn = Integer.parseInt(tokens.nextToken());
-            endline = Integer.parseInt(tokens.nextToken());
-            endcolumn = Integer.parseInt(tokens.nextToken());
-        } catch (Exception e) {
-            // FIXME: VG: This is not needed anymore?
-            message.append(Messages.getMessage("compilerFail00"));
-            type="error";
-            log.error(Messages.getMessage("compilerFail00"), e);
-        }
-
-        if ("".equals(message)) {
-            type = tokens.nextToken().trim().toLowerCase();
-            message.append(tokens.nextToken("\n").substring(1).trim());
-
-            while (tokens.hasMoreTokens())
-                message.append("\n").append(tokens.nextToken());
-        }
-
-        return new CompilerError(file, type.equals("error"), startline, startcolumn, endline, endcolumn, message.toString());
-    }
-
-    public String toString() {
-        return Messages.getMessage("ibmJikes");
-    }
-}
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java b/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java
index cede9feca..6626e0520 100644
--- a/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java
+++ b/axis-rt-jws/src/main/java/org/apache/axis/handlers/JWSHandler.java
@@ -19,9 +19,6 @@
 import org.apache.axis.AxisFault;
 import org.apache.axis.Constants;
 import org.apache.axis.MessageContext;
-import org.apache.axis.components.compiler.Compiler;
-import org.apache.axis.components.compiler.CompilerError;
-import org.apache.axis.components.compiler.CompilerFactory;
 import org.apache.axis.components.logger.LogFactory;
 import org.apache.axis.constants.Scope;
 import org.apache.axis.handlers.soap.SOAPService;
@@ -38,11 +35,21 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.FileWriter;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Hashtable;
-import java.util.List;
 import java.util.Map;
 
+import javax.tools.Diagnostic;
+import javax.tools.Diagnostic.Kind;
+import javax.tools.DiagnosticCollector;
+import javax.tools.JavaCompiler;
+import javax.tools.JavaCompiler.CompilationTask;
+import javax.tools.JavaFileObject;
+import javax.tools.StandardJavaFileManager;
+import javax.tools.StandardLocation;
+import javax.tools.ToolProvider;
+
 /** A <code>JWSHandler</code> sets the target service and JWS filename
  * in the context depending on the JWS configuration and the target URL.
  *
@@ -192,13 +199,17 @@ protected void setupService(MessageContext msgContext) throws Exception {
                 log.debug("javac " + jFile );
                 // Process proc = rt.exec( "javac " + jFile );
                 // proc.waitFor();
-                Compiler          compiler = CompilerFactory.getCompiler();
+                JavaCompiler compiler = ToolProvider.getSystemJavaCompiler();
+                StandardJavaFileManager fileManager = compiler.getStandardFileManager(null, null, null);
+                
+                fileManager.setLocation(StandardLocation.CLASS_PATH, ClasspathUtils.getDefaultClasspath(msgContext));
+                fileManager.setLocation(StandardLocation.CLASS_OUTPUT, Collections.singletonList(new File(outdir)));
                 
-                compiler.setClasspath(ClasspathUtils.getDefaultClasspath(msgContext));
-                compiler.setDestination(outdir);
-                compiler.addFile(jFile);
+                DiagnosticCollector<JavaFileObject> diagnosticCollector = new DiagnosticCollector<JavaFileObject>();
+                CompilationTask task = compiler.getTask(null, fileManager, diagnosticCollector, null, null,
+                        fileManager.getJavaFileObjectsFromFiles(Collections.singletonList(new File(jFile))));
                 
-                boolean result   = compiler.compile();
+                boolean result = task.call();
                 
                 /* Delete the temporary *.java file and check return code */
                 /**********************************************************/
@@ -216,19 +227,17 @@ protected void setupService(MessageContext msgContext) throws Exception {
                     Element         root = doc.createElementNS("", "Errors");
                     StringBuffer message = new StringBuffer("Error compiling ");
                     message.append(jFile);
-                    message.append(":\n");
-                    
-                    List errors = compiler.getErrors();
-                    int count = errors.size();
-                    for (int i = 0; i < count; i++) {
-                        CompilerError error = (CompilerError) errors.get(i);
-                        if (i > 0) message.append("\n");
-                        message.append("Line ");
-                        message.append(error.getStartLine());
-                        message.append(", column ");
-                        message.append(error.getStartColumn());
-                        message.append(": ");
-                        message.append(error.getMessage());
+                    message.append(":");
+
+                    for (Diagnostic<? extends JavaFileObject> diagnostic : diagnosticCollector.getDiagnostics()) {
+                        if (diagnostic.getKind() == Kind.ERROR) {
+                            message.append("\nLine ");
+                            message.append(diagnostic.getLineNumber());
+                            message.append(", column ");
+                            message.append(diagnostic.getStartPosition());
+                            message.append(": ");
+                            message.append(diagnostic.getMessage(null));
+                        }
                     }
                     root.appendChild( doc.createTextNode( message.toString() ) );
                     throw new AxisFault( "Server.compileError",
diff --git a/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java b/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java
index 1858b9a6d..350262816 100644
--- a/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java
+++ b/axis-rt-jws/src/main/java/org/apache/axis/utils/ClasspathUtils.java
@@ -27,6 +27,9 @@
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.net.URLDecoder;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.StringTokenizer;
 import java.util.jar.Attributes;
 import java.util.jar.JarFile;
@@ -50,23 +53,19 @@ public class ClasspathUtils {
      * @param dirPaths The string containing the directory path or list of
      *                 directory paths.
      * @return The file paths of the jar files in the directories. This is an
-     *         empty string if no files were found, and is terminated by an
-     *         additional pathSeparator in all other cases.
+     *         empty list if no files were found.
      */
-    public static String expandDirs(String dirPaths) {
+    public static List<File> expandDirs(String dirPaths) {
         StringTokenizer st = new StringTokenizer(dirPaths, File.pathSeparator);
-        StringBuffer buffer = new StringBuffer();
+        List<File> files = new ArrayList<File>();
         while (st.hasMoreTokens()) {
             String d = st.nextToken();
             File dir = new File(d);
             if (dir.isDirectory()) {
-                File[] files = dir.listFiles(new JavaArchiveFilter());
-                for (int i = 0; i < files.length; i++) {
-                    buffer.append(files[i]).append(File.pathSeparator);
-                }
+                files.addAll(Arrays.asList(dir.listFiles(new JavaArchiveFilter())));
             }
         }
-        return buffer.toString();
+        return files;
     }
 
     /**
@@ -90,8 +89,8 @@ public static boolean isJar(InputStream is) {
      * @param msgContext
      * @return default classpath
      */ 
-    public static String getDefaultClasspath(MessageContext msgContext) {
-        StringBuffer classpath = new StringBuffer();
+    public static List<File> getDefaultClasspath(MessageContext msgContext) {
+        List<File> classpath = new ArrayList<File>();
         ClassLoader cl = Thread.currentThread().getContextClassLoader();
         fillClassPath(cl, classpath);
 
@@ -100,8 +99,7 @@ public static String getDefaultClasspath(MessageContext msgContext) {
 
         String webBase = (String) msgContext.getProperty(HTTPConstants.MC_HTTP_SERVLETLOCATION);
         if (webBase != null) {
-            classpath.append(webBase + File.separatorChar + "classes" +
-                    File.pathSeparatorChar);
+            classpath.add(new File(webBase, "classes"));
             try {
                 String libBase = webBase + File.separatorChar + "lib";
                 File libDir = new File(libBase);
@@ -109,10 +107,7 @@ public static String getDefaultClasspath(MessageContext msgContext) {
                 for (int i = 0; i < jarFiles.length; i++) {
                     String jarFile = jarFiles[i];
                     if (jarFile.endsWith(".jar")) {
-                        classpath.append(libBase +
-                                File.separatorChar +
-                                jarFile +
-                                File.pathSeparatorChar);
+                        classpath.add(new File(libBase, jarFile));
                     }
                 }
             } catch (Exception e) {
@@ -138,7 +133,8 @@ public static String getDefaultClasspath(MessageContext msgContext) {
         
         // boot classpath isn't found in above search
         getClassPathFromProperty(classpath, "sun.boot.class.path");
-        return classpath.toString();
+        
+        return classpath;
     }
 
     /**
@@ -146,18 +142,13 @@ public static String getDefaultClasspath(MessageContext msgContext) {
      * @param classpath
      * @param property
      */ 
-    private static void getClassPathFromDirectoryProperty(StringBuffer classpath, String property) {
+    private static void getClassPathFromDirectoryProperty(List<File> classpath, String property) {
         String dirs = AxisProperties.getProperty(property);
-        String path = null;
         try {
-            path = ClasspathUtils.expandDirs(dirs);
+            classpath.addAll(ClasspathUtils.expandDirs(dirs));
         } catch (Exception e) {
             // Oh well.  No big deal.
         }
-        if (path != null) {
-            classpath.append(path);
-            classpath.append(File.pathSeparatorChar);
-        }
     }
 
     /**
@@ -165,11 +156,12 @@ private static void getClassPathFromDirectoryProperty(StringBuffer classpath, St
      * @param classpath
      * @param property
      */ 
-    private static void getClassPathFromProperty(StringBuffer classpath, String property) {
+    private static void getClassPathFromProperty(List<File> classpath, String property) {
         String path = AxisProperties.getProperty(property);
         if (path != null) {
-            classpath.append(path);
-            classpath.append(File.pathSeparatorChar);
+            for (String item : path.split(File.pathSeparator)) {
+                classpath.add(new File(item));
+            }
         }
     }
 
@@ -178,7 +170,7 @@ private static void getClassPathFromProperty(StringBuffer classpath, String prop
      * @param cl
      * @param classpath
      */
-    private static void fillClassPath(ClassLoader cl, StringBuffer classpath) {
+    private static void fillClassPath(ClassLoader cl, List<File> classpath) {
         while (cl != null) {
             if (cl instanceof URLClassLoader) {
                 URL[] urls = ((URLClassLoader) cl).getURLs();
@@ -187,8 +179,7 @@ private static void fillClassPath(ClassLoader cl, StringBuffer classpath) {
                     //If it is a drive letter, adjust accordingly.
                     if (path.length() >= 3 && path.charAt(0) == '/' && path.charAt(2) == ':')
                         path = path.substring(1);
-                    classpath.append(URLDecoder.decode(path));
-                    classpath.append(File.pathSeparatorChar);
+                    classpath.add(new File(URLDecoder.decode(path)));
 
                     // if its a jar extract Class-Path entries from manifest
                     File file = new File(urls[i].getFile());
@@ -208,8 +199,7 @@ private static void fillClassPath(ClassLoader cl, StringBuffer classpath) {
                                             StringTokenizer st = new StringTokenizer(s, " ");
                                             while (st.hasMoreTokens()) {
                                                 String t = st.nextToken();
-                                                classpath.append(base + File.separatorChar + t);
-                                                classpath.append(File.pathSeparatorChar);
+                                                classpath.add(new File(base, t));
                                             }
                                         }
                                     }
diff --git a/pom.xml b/pom.xml
index 38a52a1a7..7ed626d58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -330,6 +330,8 @@
                                     artifactId = 'java14-sun'
                                 } else if (javaVersion == '1.5') {
                                     artifactId = 'java15-sun'
+                                } else if (javaVersion == '1.6') {
+                                    artifactId = 'java16-sun'
                                 }
                                 project.properties['signatureArtifactId'] = artifactId
                                 project.properties['signatureVersion'] = '1.0'
diff --git a/src/site/apt/changelogs/1_4_1.apt b/src/site/apt/changelogs/1_4_1.apt
index d9184ad21..13ab1e888 100644
--- a/src/site/apt/changelogs/1_4_1.apt
+++ b/src/site/apt/changelogs/1_4_1.apt
@@ -51,3 +51,5 @@ Changes from 1.4 final
     * <<<AxisServlet>>> no longer attempts to register the Axis MBeans automatically. To enable them, add
       <<<axis-rt-management>>> as a dependency and register <<<org.apache.axis.management.servlet.AxisServerMBeanExporter>>>
       as a listener in <<<web.xml>>>.
+    
+    * The JWS support was updated to use the <<<javax.tools>>> API, which requires Java 6.

From 9221cade02473e0d4b74691b1f5442089ffb3110 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 20:59:43 +0000
Subject: [PATCH 082/133] Correctly set the source version for Javadoc.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7ed626d58..266776d7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,7 +186,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.0.0</version>
                     <configuration>
-                        <source>1.4</source>
+                        <source>${javaVersion}</source>
                         <tags>
                             <!-- Custom tags used by EMF -->
                             <tag>

From 6607aec460f3777aa8b274070c08ad60d0ac56f8 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 22:12:21 +0000
Subject: [PATCH 083/133] Fix packaging of apidocs module.

---
 apidocs/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 141a70c3c..3862ee5e2 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -26,6 +26,7 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>apidocs</artifactId>
+    <packaging>pom</packaging>
     <name>Javadoc</name>
     <url>${baseUrl}/apiDocs</url>
     <distributionManagement>

From 83e4c366568ddae5499f10741037e7a6ba60e5a5 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 23:18:17 +0000
Subject: [PATCH 084/133] Switch to Oracle JDK.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 07a6b7699..9b8e48058 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,8 @@
 dist: trusty
 language: java
+# There are test cases that use ImageIO with JPEG and that only work on Oracle JDK.
 jdk:
-  - openjdk8
+  - oraclejdk8
 install: echo NOOP Skipping pre-fetch of Maven dependencies
 cache:
   directories:

From 4f758aa4cc6aec2c61d2f39c141a5fbfdc25a29f Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Tue, 8 May 2018 23:45:49 +0000
Subject: [PATCH 085/133] Fix Javadoc problems.

---
 .../org/apache/axis/wsdl/toJava/Emitter.java  |  6 ++--
 .../axis/wsdl/toJava/GeneratedFileInfo.java   |  6 ++--
 .../axis/wsdl/toJava/JavaBeanFaultWriter.java |  6 ++--
 .../wsdl/toJava/JavaBeanHelperWriter.java     |  4 +--
 .../axis/wsdl/toJava/JavaBeanWriter.java      |  6 ++--
 .../axis/wsdl/toJava/JavaBindingWriter.java   |  2 +-
 .../axis/wsdl/toJava/JavaClassWriter.java     | 11 +++-----
 .../axis/wsdl/toJava/JavaDeployWriter.java    | 10 +++----
 .../axis/wsdl/toJava/JavaEnumTypeWriter.java  |  2 +-
 .../axis/wsdl/toJava/JavaFaultWriter.java     |  4 +--
 .../wsdl/toJava/JavaGeneratorFactory.java     | 28 +++++++++----------
 .../axis/wsdl/toJava/JavaHolderWriter.java    |  2 +-
 .../axis/wsdl/toJava/JavaImplWriter.java      |  6 ++--
 .../axis/wsdl/toJava/JavaInterfaceWriter.java |  4 +--
 .../wsdl/toJava/JavaServiceIfaceWriter.java   |  2 +-
 .../wsdl/toJava/JavaServiceImplWriter.java    | 10 +++----
 .../axis/wsdl/toJava/JavaServiceWriter.java   |  2 +-
 .../axis/wsdl/toJava/JavaSkelWriter.java      |  6 ++--
 .../axis/wsdl/toJava/JavaStubWriter.java      |  6 ++--
 .../axis/wsdl/toJava/JavaTestCaseWriter.java  |  2 +-
 .../axis/wsdl/toJava/JavaTypeWriter.java      |  2 +-
 .../apache/axis/wsdl/toJava/JavaWriter.java   |  5 +---
 .../apache/axis/wsdl/toJava/Namespaces.java   |  2 +-
 .../org/apache/axis/wsdl/toJava/Utils.java    |  6 ++--
 24 files changed, 66 insertions(+), 74 deletions(-)

diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
index 89879bded..59476ee6a 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Emitter.java
@@ -349,7 +349,7 @@ public void setNStoPkg(String NStoPkgFilename) {
     }    // setNStoPkg
 
     /**
-     * Set a map of namespace -> Java package names
+     * Set a map of namespace -&gt; Java package names
      * 
      * @param map 
      */
@@ -358,7 +358,7 @@ public void setNamespaceMap(HashMap map) {
     }
 
     /**
-     * Get the map of namespace -> Java package names
+     * Get the map of namespace -&gt; Java package names
      * 
      * @return 
      */
@@ -583,7 +583,7 @@ protected String getJavaVariableNameHook(QName typeQName, QName xmlName, boolean
 
     /**
      * Emit appropriate Java files for a WSDL at a given URL.
-     * <p/>
+     * <p>
      * This method will time out after the number of milliseconds specified
      * by our timeoutms member.
      * 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java
index 2eb2ff895..cc1871ca5 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/GeneratedFileInfo.java
@@ -145,8 +145,7 @@ public List findType(String type) {
     /**
      * Lookup an entry by file name
      * 
-     * @param file     name you want info about
-     * @param fileName 
+     * @param fileName name you want info about
      * @return The entry for the file name specified.  Null if not found
      */
     public Entry findName(String fileName) {
@@ -166,8 +165,7 @@ public Entry findName(String fileName) {
     /**
      * Lookup an entry by class name
      * 
-     * @param class     name you want info about
-     * @param className 
+     * @param className name you want info about
      * @return The entry for the class specified.  Null if not found
      */
     public Entry findClass(String className) {
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
index 04c102346..8548dbf33 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanFaultWriter.java
@@ -36,7 +36,7 @@ public class JavaBeanFaultWriter extends JavaBeanWriter {
      * that may potentially conflict with those that would be generated by
      * this class for an XSD complex type used as a fault. The following
      * immutable object contains all property names that must be excluded
-     * when generating a service specific exception. <i>Note:</t>
+     * when generating a service specific exception. <i>Note:</i>
      * {@link org.apache.axis.encoding.ser.BeanSerializer} always excludes
      * <code>Throwable</code>'s and  <code>AxisFault</code>'s properties
      * when marshalling a service Java exception.
@@ -95,7 +95,7 @@ protected JavaBeanFaultWriter(Emitter emitter, TypeEntry type,
     /**
      * Returns the appropriate extends text
      * 
-     * @return "" or " extends <class> "
+     * @return "" or " extends &lt;class&gt; "
      */
     protected String getExtendsText() {
 
@@ -114,7 +114,7 @@ protected String getExtendsText() {
 
     /**
      * Write the Exception serialization code
-     * <p/>
+     * <p>
      * NOTE: This function is written in JavaFaultWriter.java also.
      * 
      * @param pw 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
index 61343ecbb..368279557 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanHelperWriter.java
@@ -32,7 +32,7 @@
 import java.util.Set;
 
 /**
- * This is Wsdl2java's Helper Type Writer.  It writes the <typeName>.java file.
+ * This is Wsdl2java's Helper Type Writer.  It writes the &lt;typeName&gt;.java file.
  */
 public class JavaBeanHelperWriter extends JavaClassWriter {
 
@@ -143,7 +143,7 @@ protected void registerFile(String file) {
     }    // registerFile
 
     /**
-     * Return the string:  "Generating <file>".
+     * Return the string:  "Generating &lt;file&gt;".
      * only if we are going to generate a new file.
      * 
      * @param file 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
index fd931b4b9..26cf30e99 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBeanWriter.java
@@ -34,7 +34,7 @@
 import java.util.Vector;
 
 /**
- * This is Wsdl2java's Complex Type Writer.  It writes the <typeName>.java file.
+ * This is Wsdl2java's Complex Type Writer.  It writes the &lt;typeName&gt;.java file.
  */
 public class JavaBeanWriter extends JavaClassWriter {
 
@@ -535,7 +535,7 @@ protected String getClassModifiers() {
     /**
      * Returns the appropriate extends text
      * 
-     * @return "" or " extends <class> "
+     * @return "" or " extends &lt;class&gt; "
      */
     protected String getExtendsText() {
 
@@ -554,7 +554,7 @@ protected String getExtendsText() {
     /**
      * Returns the appropriate implements text
      * 
-     * @return " implements <classes> "
+     * @return " implements &lt;classes&gt; "
      */
     protected String getImplementsText() {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
index b80fe221e..7daca6c16 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaBindingWriter.java
@@ -26,7 +26,7 @@
 
 /**
  * This is Wsdl2java's Binding Writer.  It writes the following files, as appropriate:
- * <bindingName>Stub.java, <bindingName>Skeleton.java, <bindingName>Impl.java.
+ * &lt;bindingName&gt;Stub.java, &lt;bindingName&gt;Skeleton.java, &lt;bindingName&gt;Impl.java.
  */
 public class JavaBindingWriter implements Generator {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaClassWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaClassWriter.java
index 01a9606af..e789cf0f5 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaClassWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaClassWriter.java
@@ -29,16 +29,13 @@
  * JavaWriter.  So the Java WSDL writers (JavaPortTypeWriter, JavaBindingWriter,
  * etc.) each calls a file writer (JavaStubWriter, JavaSkelWriter, etc.) for
  * each file that that WSDL generates.
- * <p/>
  * <p>For example, when Emitter calls JavaWriterFactory for a Binding Writer, it
  * returns a JavaBindingWriter.  JavaBindingWriter, in turn, contains a
  * JavaStubWriter, JavaSkelWriter, and JavaImplWriter since a Binding may cause
  * a stub, skeleton, and impl template to be generated.
- * <p/>
  * <p>Note that the writers that are given to Emitter by JavaWriterFactory DO NOT
  * extend JavaWriter.  They simply implement Writer and delegate the actual
  * task of writing to extensions of JavaWriter.
- * <p/>
  * <p>All of Wsdl2java's Writer implementations follow a common behaviour.
  * JavaWriter is the abstract base class that dictates this common behaviour.
  * Many of the files generated are .java files, so this abstract class -
@@ -79,7 +76,7 @@
  * <dd> You should not need to override this method.  It simply closes the
  * PrintWriter.
  * </dl>
- * <p/>
+ * <p>
  * Additional behaviour that JavaClassWriter introduces beyond JavaWriter is
  * related to the class header and definition:
  * <dl>
@@ -136,7 +133,7 @@ protected JavaClassWriter(Emitter emitter, String fullClassName,
 
     /**
      * Return the file name as a string of the form:
-     * "<directory-ized fully-qualified classname>.java"
+     * "&lt;directory-ized fully-qualified classname&gt;.java"
      * 
      * @return 
      */
@@ -246,7 +243,7 @@ protected String getClassText() {
 
     /**
      * Returns the appropriate extends clause.  This default implementation
-     * simply returns "", but if you want "extends <class/interface list> "
+     * simply returns "", but if you want "extends &lt;class/interface list&gt; "
      * then you must override this method.
      * 
      * @return ""
@@ -257,7 +254,7 @@ protected String getExtendsText() {
 
     /**
      * Returns the appropriate implements clause.  This default implementation
-     * simply returns "", but if you want "implements <interface list> " then
+     * simply returns "", but if you want "implements &lt;interface list&gt; " then
      * you must override this method.
      * 
      * @return ""
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
index 2a2168753..5a8f1c269 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaDeployWriter.java
@@ -161,7 +161,7 @@ protected void writeFileBody(PrintWriter pw) throws IOException {
     /**
      * Write out deployment and undeployment instructions for each WSDL service
      *
-     * @param pw
+     * @param deployment
      * @throws IOException
      */
     protected void writeDeployServices(Deployment deployment) throws IOException {
@@ -192,7 +192,7 @@ protected void writeDeployServices(Deployment deployment) throws IOException {
     /**
      * Write out bean mappings for each type
      *
-     * @param pw
+     * @param service
      * @param binding
      * @param hasLiteral
      * @param hasMIME
@@ -301,7 +301,7 @@ protected void writeDeployTypes(
     /**
      * Write out deployment and undeployment instructions for given WSDL port
      *
-     * @param pw
+     * @param deployment
      * @param port
      * @param service
      * @param bEntry
@@ -375,7 +375,7 @@ protected void writeDeployPort(
     /**
      * Write out deployment instructions for given WSDL binding
      *
-     * @param pw
+     * @param service
      * @param bEntry
      * @throws IOException
      */
@@ -498,7 +498,7 @@ protected void writeDeployBinding(org.apache.axis.model.wsdd.Service service, Bi
     /**
      * Raw routine that writes out the operation and parameters.
      *
-     * @param pw
+     * @param service
      * @param javaOperName
      * @param elementQName
      * @param returnQName
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
index ba4cc3849..a3422a71c 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaEnumTypeWriter.java
@@ -24,7 +24,7 @@
 import java.util.Vector;
 
 /**
- * This is Wsdl2java's Complex Type Writer.  It writes the <typeName>.java file.
+ * This is Wsdl2java's Complex Type Writer.  It writes the &lt;typeName&gt;.java file.
  */
 public class JavaEnumTypeWriter extends JavaClassWriter {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaFaultWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaFaultWriter.java
index 1e06e31e6..6b7fe807f 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaFaultWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaFaultWriter.java
@@ -27,8 +27,8 @@
 import java.util.Vector;
 
 /**
- * This is Wsdl2java's Fault Writer.  It writes the <faultName>.java file.
- * <p/>
+ * This is Wsdl2java's Fault Writer.  It writes the &lt;faultName&gt;.java file.
+ * <p>
  * NOTE: This only writes simple type faults, the JavaTypeWriter emits
  * faults that are complex types.
  */
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
index 7676c7817..8b67fa6d0 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaGeneratorFactory.java
@@ -1624,20 +1624,20 @@ public String getBaseName(QName qNameIn) {
     /**
      * Determines whether the QName supplied should be generated by comparing
      * the namespace for the QName against the included and excluded names.
-     <p/>
-     <ul>
-     <li>if both the includes and excludes are both empty,
-             the element is generated</li>
-     <li>if the namespace is in the includes,
-             the element is generated</li>
-     <li>if the namespace is not in the excludes and the includes are empty,
-             the element will be generated.
-     <li>if the namespace is only in the excludes,
-             the element is not generated</li>
-     <li>if the namespace is not in the includes and the includes are not
-             empty, the element is not generated</li>
-        @param qName
-        @return
+     * <ul>
+     * <li>if both the includes and excludes are both empty,
+     *         the element is generated</li>
+     * <li>if the namespace is in the includes,
+     *         the element is generated</li>
+     * <li>if the namespace is not in the excludes and the includes are empty,
+     *         the element will be generated.
+     * <li>if the namespace is only in the excludes,
+     *         the element is not generated</li>
+     * <li>if the namespace is not in the includes and the includes are not
+     *         empty, the element is not generated</li>
+     * </ul>
+     * @param qName
+     * @return
      */
     protected boolean include(QName qName) {
         String namespace =
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
index 636b13b69..08e5e41a5 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaHolderWriter.java
@@ -23,7 +23,7 @@
 import java.io.PrintWriter;
 
 /**
- * This is Wsdl2java's Holder Writer.  It writes the <typeName>Holder.java file.
+ * This is Wsdl2java's Holder Writer.  It writes the &lt;typeName&gt;Holder.java file.
  */
 public class JavaHolderWriter extends JavaClassWriter {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaImplWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaImplWriter.java
index c93c3c48e..bb3854141 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaImplWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaImplWriter.java
@@ -33,8 +33,8 @@
 import java.util.List;
 
 /**
- * This is Wsdl2java's implementation template writer.  It writes the <BindingName>Impl.java
- * file which contains the <bindingName>Impl class.
+ * This is Wsdl2java's implementation template writer.  It writes the &lt;BindingName&gt;Impl.java
+ * file which contains the &lt;bindingName&gt;Impl class.
  */
 public class JavaImplWriter extends JavaClassWriter {
 
@@ -98,7 +98,7 @@ protected void writeFileBody(PrintWriter pw) throws IOException {
     /**
      * Returns the appropriate implements text
      * 
-     * @return " implements <classes>"
+     * @return " implements &lt;classes&gt;"
      */
     protected String getImplementsText() {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java
index 76000bb16..fda2a8af3 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaInterfaceWriter.java
@@ -27,8 +27,8 @@
 import java.util.Iterator;
 
 /**
- * This is Wsdl2java's PortType Writer.  It writes the <portTypeName>.java file
- * which contains the <portTypeName> interface.
+ * This is Wsdl2java's PortType Writer.  It writes the &lt;portTypeName&gt;.java file
+ * which contains the &lt;portTypeName&gt; interface.
  */
 public class JavaInterfaceWriter extends JavaClassWriter {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java
index 6b9acb014..89dca2de2 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java
@@ -31,7 +31,7 @@
 import java.util.Map;
 
 /**
- * This is Wsdl2java's service writer.  It writes the <serviceName>.java file.
+ * This is Wsdl2java's service writer.  It writes the &lt;serviceName&gt;.java file.
  */
 public class JavaServiceIfaceWriter extends JavaClassWriter {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
index 1bfaa7b6b..ad6008ed4 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
@@ -38,7 +38,7 @@
 
 /**
  * This is Wsdl2java's service implementation writer.
- * It writes the <serviceName>Locator.java file.
+ * It writes the &lt;serviceName&gt;Locator.java file.
  */
 public class JavaServiceImplWriter extends JavaClassWriter {
 
@@ -74,7 +74,7 @@ protected String getExtendsText() {
     }    // getExtendsText
 
     /**
-     * Returns "implements <serviceInterface>".
+     * Returns "implements &lt;serviceInterface&gt;".
      * 
      * @return 
      */
@@ -354,7 +354,7 @@ protected void writeWSDDServiceNameInfo(PrintWriter pw,
     }    // writeWSDDServiceNameInfo
 
     /**
-     * Write the get<portName>() method.
+     * Write the get&lt;portName&gt;() method.
      * 
      * @param pw          
      * @param bindingType 
@@ -380,7 +380,7 @@ protected void writeGetPortName(PrintWriter pw, String bindingType,
     }    // writeGetPortName
 
     /**
-     * Write the get<portName>(URL) method.
+     * Write the get&lt;portName&gt;(URL) method.
      * 
      * @param pw              
      * @param bindingType     
@@ -410,7 +410,7 @@ protected void writeGetPortNameURL(PrintWriter pw, String bindingType,
     }    // writeGetPortNameURL
 
     /**
-     * Write the set<portName>EndpointAddress(String) method.
+     * Write the set&lt;portName&gt;EndpointAddress(String) method.
      * 
      * @param pw       
      * @param portName 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceWriter.java
index f30f08e31..85d712e77 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaServiceWriter.java
@@ -24,7 +24,7 @@
 
 /**
  * This is Wsdl2java's Service Writer.  It writes the following files, as appropriate:
- * <serviceName>.java, <serviceName>TestCase.java.
+ * &lt;serviceName&gt;.java, &lt;serviceName&gt;TestCase.java.
  */
 public class JavaServiceWriter implements Generator {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
index 6ef64f727..b2a281aa9 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaSkelWriter.java
@@ -41,8 +41,8 @@
 import java.util.List;
 
 /**
- * This is Wsdl2java's skeleton writer.  It writes the <BindingName>Skeleton.java
- * file which contains the <bindingName>Skeleton class.
+ * This is Wsdl2java's skeleton writer.  It writes the &lt;BindingName&gt;Skeleton.java
+ * file which contains the &lt;bindingName&gt;Skeleton class.
  */
 public class JavaSkelWriter extends JavaClassWriter {
 
@@ -73,7 +73,7 @@ protected JavaSkelWriter(Emitter emitter, BindingEntry bEntry,
     }    // ctor
 
     /**
-     * Returns "implements <SEI>, org.apache.axis.wsdl.Skeleton ".
+     * Returns "implements &lt;SEI&gt;, org.apache.axis.wsdl.Skeleton ".
      * 
      * @return 
      */
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
index a93cd9864..b48c5bb1f 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaStubWriter.java
@@ -61,8 +61,8 @@
 import java.util.Collections;
 
 /**
- * This is Wsdl2java's stub writer.  It writes the <BindingName>Stub.java
- * file which contains the <bindingName>Stub class.
+ * This is Wsdl2java's stub writer.  It writes the &lt;BindingName&gt;Stub.java
+ * file which contains the &lt;bindingName&gt;Stub class.
  */
 public class JavaStubWriter extends JavaClassWriter {
 
@@ -137,7 +137,7 @@ protected String getExtendsText() {
     }    // getExtendsText
 
     /**
-     * Returns "implements <SEI> ".
+     * Returns "implements &lt;SEI&gt; ".
      * 
      * @return 
      */
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
index 98f4d628f..22ba7c9be 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
@@ -37,7 +37,7 @@
 import java.util.Map;
 
 /**
- * This is Wsdl2java's TestCase writer.  It writes the <serviceName>TestCase.java file.
+ * This is Wsdl2java's TestCase writer.  It writes the &lt;serviceName&gt;TestCase.java file.
  */
 public class JavaTestCaseWriter extends JavaClassWriter {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
index 775cf080c..c917362bc 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaTypeWriter.java
@@ -30,7 +30,7 @@
 
 /**
  * This is Wsdl2java's Type Writer.  It writes the following files, as appropriate:
- * <typeName>.java, <typeName>Holder.java.
+ * &lt;typeName&gt;.java, &lt;typeName&gt;Holder.java.
  */
 public class JavaTypeWriter implements Generator {
 
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
index 8d9d7b3e8..7cc1211a6 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/JavaWriter.java
@@ -32,16 +32,13 @@
  * JavaWriter.  So the Java WSDL writers (JavaPortTypeWriter, JavaBindingWriter,
  * etc.) each calls a file writer (JavaStubWriter, JavaSkelWriter, etc.) for
  * each file that that WSDL generates.
- * <p/>
  * <p>For example, when Emitter calls JavaWriterFactory for a Binding Writer, it
  * returns a JavaBindingWriter.  JavaBindingWriter, in turn, contains a
  * JavaStubWriter, JavaSkelWriter, and JavaImplWriter since a Binding may cause
  * a stub, skeleton, and impl template to be generated.
- * <p/>
  * <p>Note that the writers that are given to Emitter by JavaWriterFactory DO NOT
  * extend JavaWriter.  They simply implement Writer and delegate the actual
  * task of writing to extensions of JavaWriter.
- * <p/>
  * <p>All of Wsdl2java's Writer implementations follow a common behaviour.
  * JavaWriter is the abstract base class that dictates this common behaviour.
  * This behaviour is primarily placed within the generate method.  The generate
@@ -169,7 +166,7 @@ protected void registerFile(String file) {
     }    // registerFile
 
     /**
-     * Return the string:  "Generating <file>".  Override this
+     * Return the string:  "Generating &lt;file&gt;".  Override this
      * method if you want to provide more information.
      *
      * @param file
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Namespaces.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Namespaces.java
index bf5693114..042393b06 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Namespaces.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Namespaces.java
@@ -25,7 +25,7 @@
 import java.util.Vector;
 
 /**
- * This class is essentially a HashMap of <namespace, package name> pairs with
+ * This class is essentially a HashMap of &lt;namespace, package name&gt; pairs with
  * a few extra wizzbangs.
  */
 public class Namespaces extends HashMap {
diff --git a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
index ee66b107d..e1e94c710 100644
--- a/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
+++ b/axis-codegen/src/main/java/org/apache/axis/wsdl/toJava/Utils.java
@@ -913,13 +913,13 @@ public static String getParameterTypeName(Parameter parm) {
     /**
      * Return a constructor for the provided Parameter
      * This string will be suitable for assignment:
-     * <p/>
+     * <p>
      * Foo var = <i>string returned</i>
-     * <p/>
+     * <p>
      * Handles basic java types (int, float, etc), wrapper types (Integer, etc)
      * and certain java.math (BigDecimal, BigInteger) types.
      * Will also handle all Axis specific types (org.apache.axis.types.*)
-     * <p/>
+     * <p>
      * Caller should expect to wrap the construction in a try/catch block
      * if bThrow is set to <i>true</i>.
      *

From b7780e9b5704890f6b1fbe7edf4f07ffddde6533 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 9 May 2018 19:26:07 +0000
Subject: [PATCH 086/133] Fix Javadoc problems.

---
 axis-ant/pom.xml                                  | 11 +++++++++++
 .../axis/tools/ant/axis/AdminClientTask.java      |  4 ++--
 .../apache/axis/tools/ant/foreach/ParamItem.java  |  2 +-
 .../apache/axis/tools/ant/foreach/ParamSet.java   |  4 ++--
 .../axis/tools/ant/wsdl/Wsdl2javaAntTask.java     |  2 +-
 axis-model/pom.xml                                | 14 ++++++++++++++
 pom.xml                                           | 15 ---------------
 7 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/axis-ant/pom.xml b/axis-ant/pom.xml
index 6f99b869a..5f86fd6ea 100644
--- a/axis-ant/pom.xml
+++ b/axis-ant/pom.xml
@@ -287,6 +287,17 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <tags>
+                        <tag>
+                            <name>ant.task</name>
+                            <placement>X</placement>
+                        </tag>
+                    </tags>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/axis-ant/src/main/java/org/apache/axis/tools/ant/axis/AdminClientTask.java b/axis-ant/src/main/java/org/apache/axis/tools/ant/axis/AdminClientTask.java
index 3f6ced409..d2d008dbe 100644
--- a/axis-ant/src/main/java/org/apache/axis/tools/ant/axis/AdminClientTask.java
+++ b/axis-ant/src/main/java/org/apache/axis/tools/ant/axis/AdminClientTask.java
@@ -245,8 +245,8 @@ public void traceParams(int logLevel) {
      * </ul>
      * <p>If <code>-l</code> or <code>-h -p -s</code> are not set, the
      * AdminClient will invoke
-     * <code>http://localhost:8080/axis/servlet/AxisServlet</code>.</p>
-     * <p/>
+     * <code>http://localhost:8080/axis/servlet/AxisServlet</code>.
+     * <p>
      * outputs XML result or null in case of failure. In the case of multiple
      * commands, the XML results will be concatenated, separated by \n
      *
diff --git a/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java b/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java
index 35de41cfe..6051cac5b 100644
--- a/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java
+++ b/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamItem.java
@@ -16,7 +16,7 @@
 package org.apache.axis.tools.ant.foreach;
 
 /**
- * Inner class stores <item>s with <param> lists
+ * Inner class stores &lt;item&gt;s with &lt;param&gt; lists
  * 
  * @author <a href="mailto:tpv@spamcop.net">Tim Vernum</a>
  * @author Davanum Srinivas
diff --git a/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamSet.java b/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamSet.java
index 9bc7cb867..13c0e806b 100644
--- a/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamSet.java
+++ b/axis-ant/src/main/java/org/apache/axis/tools/ant/foreach/ParamSet.java
@@ -25,8 +25,8 @@
 import java.util.Vector;
 
 /**
- * Inner class stores sets of <param>s.
- * It can hold <fileset>s or <item>s or both.
+ * Inner class stores sets of &lt;param&gt;s.
+ * It can hold &lt;fileset&gt;s or &lt;item&gt;s or both.
  * 
  * @author <a href="mailto:tpv@spamcop.net">Tim Vernum</a>
  * @author Davanum Srinivas
diff --git a/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java b/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
index dac5dca09..efa0adeed 100644
--- a/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
+++ b/axis-ant/src/main/java/org/apache/axis/tools/ant/wsdl/Wsdl2javaAntTask.java
@@ -59,7 +59,7 @@
  * classes are generated overwriting anything that exists.
  * <p>
  * The safe way to use this task is to have it generate the java source in
- * a build directory, then have a &lt;copy&gt task selectively copy the
+ * a build directory, then have a &lt;copy&gt; task selectively copy the
  * files you need into a safe location. Again, copying into the source tree
  * is dangerous, but a separate build/src tree is safe. Then include this
  * separate tree in the &lt;javac&gt; task's src attribute to include it in the
diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index f0217351c..370d2fb51 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -131,6 +131,20 @@
             <plugin>
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
+                    <tags>
+                        <tag>
+                            <name>generated</name>
+                            <placement>X</placement>
+                        </tag>
+                        <tag>
+                            <name>model</name>
+                            <placement>X</placement>
+                        </tag>
+                        <tag>
+                            <name>ordered</name>
+                            <placement>X</placement>
+                        </tag>
+                    </tags>
                     <!-- TODO: check if a newer EMF version produces correct HTML -->
                     <doclint>all,-html</doclint>
                 </configuration>
diff --git a/pom.xml b/pom.xml
index 266776d7b..25abc43ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,21 +187,6 @@
                     <version>3.0.0</version>
                     <configuration>
                         <source>${javaVersion}</source>
-                        <tags>
-                            <!-- Custom tags used by EMF -->
-                            <tag>
-                                <name>generated</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>model</name>
-                                <placement>X</placement>
-                            </tag>
-                            <tag>
-                                <name>ordered</name>
-                                <placement>X</placement>
-                            </tag>
-                        </tags>
                     </configuration>
                 </plugin>
                 <plugin>

From 7f4edd1e18f358a91f78f13c371cc0c14b583b6b Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 9 May 2018 21:25:47 +0000
Subject: [PATCH 087/133] Set up notifications for Travis.

---
 .travis.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 9b8e48058..ac4ca71ae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,3 +8,6 @@ cache:
   directories:
     - $HOME/.m2
 script: mvn clean verify -Papache-release -Dgpg.skip=true
+notifications:
+  email:
+    - java-dev@axis.apache.org

From ce008b8c0129186e69375b39e9d4bc8bc1c721c3 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 9 May 2018 21:58:10 +0000
Subject: [PATCH 088/133] Fix Javadoc problems.

---
 .../DefaultSOAP12TypeMappingImpl.java         |  2 +-
 .../org/apache/axis/management/Registrar.java |  4 ++--
 .../servlet/AxisServerMBeanExporter.java      |  6 +++---
 .../axis/monitor/SOAPMonitorService.java      |  4 ----
 .../net/CommonsHTTPClientProperties.java      | 10 +++++-----
 .../DefaultCommonsHTTPClientProperties.java   |  6 +++---
 .../transport/http/CommonsHTTPSender.java     |  1 -
 .../tools/maven/server/StartServerMojo.java   |  2 +-
 maven/pom.xml                                 | 19 +++++++++++++++++++
 9 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/axis-rt-compat/src/main/java/org/apache/axis/encoding/DefaultSOAP12TypeMappingImpl.java b/axis-rt-compat/src/main/java/org/apache/axis/encoding/DefaultSOAP12TypeMappingImpl.java
index 3b2983cc9..060162cdc 100644
--- a/axis-rt-compat/src/main/java/org/apache/axis/encoding/DefaultSOAP12TypeMappingImpl.java
+++ b/axis-rt-compat/src/main/java/org/apache/axis/encoding/DefaultSOAP12TypeMappingImpl.java
@@ -1,7 +1,7 @@
 package org.apache.axis.encoding;
 
 /**
- * @author James M Snell <jasnell@us.ibm.com>
+ * @author James M Snell &lt;jasnell@us.ibm.com&gt;
  * @deprecated Please use DefaultSOAPEncodingTypeMappingImpl.java
  * @see org.apache.axis.encoding.DefaultSOAPEncodingTypeMappingImpl 
  */
diff --git a/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java b/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java
index 1fa23bea9..395b01708 100644
--- a/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java
+++ b/axis-rt-management/src/main/java/org/apache/axis/management/Registrar.java
@@ -22,8 +22,8 @@
 /**
  * class to act as a dynamic loading registrar to commons-modeler, so
  * as to autoregister stuff
- *
- * @link http://www.webweavertech.com/costin/archives/000168.html#000168
+ * <p>
+ * <a href="http://www.webweavertech.com/costin/archives/000168.html#000168">http://www.webweavertech.com/costin/archives/000168.html#000168</a>
  */
 public class Registrar {
     /**
diff --git a/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java b/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java
index 15373e6ff..fc5e169a8 100644
--- a/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java
+++ b/axis-rt-management/src/main/java/org/apache/axis/management/servlet/AxisServerMBeanExporter.java
@@ -31,9 +31,9 @@
  * <tt>web.xml</tt>:
  * 
  * <pre>
- * &lt;listener>
- *     &lt;listener-class>org.apache.axis.management.servlet.AxisServerMBeanExporter&lt;/listener-class>
- * &lt;/listener>
+ * &lt;listener&gt;
+ *     &lt;listener-class&gt;org.apache.axis.management.servlet.AxisServerMBeanExporter&lt;/listener-class&gt;
+ * &lt;/listener&gt;
  * </pre>
  * 
  * @author Andreas Veithen
diff --git a/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java b/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java
index ecd7cd299..29dd6cc67 100644
--- a/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java
+++ b/axis-rt-soapmonitor/src/main/java/org/apache/axis/monitor/SOAPMonitorService.java
@@ -54,10 +54,6 @@
  * display by the applet.
  *
  * @author Brian Price (pricebe@us.ibm.com)
- * xdoclet tags are not active yet; keep web.xml in sync
- * @web.servlet name="SOAPMonitorService"  display-name="SOAPMonitorService"  load-on-startup="100"
- * @web.servlet-mapping url-pattern="/SOAPMonitor"
- * @web.servlet-init-param name="SOAPMonitorPort" value="5001"
  */
 
 public class SOAPMonitorService extends HttpServlet {
diff --git a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java
index f8aa5ab2e..ff3f30094 100644
--- a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java
+++ b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/CommonsHTTPClientProperties.java
@@ -30,7 +30,7 @@ public interface CommonsHTTPClientProperties {
      * your system imposes on the number of open file descriptors a
      * single process may have.
      *
-     * @return an integer > 1
+     * @return an integer &gt; 1
      */
     public int getMaximumTotalConnections();
 
@@ -39,7 +39,7 @@ public interface CommonsHTTPClientProperties {
      * for a given host.  This setting is also constrained by 
      * the one returned from getMaximumTotalConnections.
      *
-     * @return an integer > 1
+     * @return an integer &gt; 1
      */
     public int getMaximumConnectionsPerHost();    
 
@@ -48,7 +48,7 @@ public interface CommonsHTTPClientProperties {
      * for an available connection from the pool.  An exception is raised
      * if the timeout is triggered.
      *
-     * @return an integer > 1 OR 0 for infinite timeout
+     * @return an integer &gt; 1 OR 0 for infinite timeout
      */
     public int getConnectionPoolTimeout();
 
@@ -56,7 +56,7 @@ public interface CommonsHTTPClientProperties {
      * Used to set the default amount of time, in milliseconds, spent waiting
      * for a connection. This can be overridden by the MessageContext
      *   
-     * @return an integer >= 0
+     * @return an integer &gt;= 0
      */
     public int getDefaultConnectionTimeout();
 
@@ -64,7 +64,7 @@ public interface CommonsHTTPClientProperties {
      * Used to set the default amount of time, in milliseconds, spent waiting
      * for a reponse. This can be overridden by the MessageContext
      *
-     * @return an integer >= 0
+     * @return an integer &gt;= 0
      */
     public int getDefaultSoTimeout();
 
diff --git a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java
index 76437fa2b..f68dc0745 100644
--- a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java
+++ b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/components/net/DefaultCommonsHTTPClientProperties.java
@@ -95,7 +95,7 @@ public int getMaximumConnectionsPerHost() {
      * Return the integer value associated with the property
      * axis.http.client.connection.pool.timeout or a default of 0.
      *
-     * @return an integer >= 0
+     * @return an integer &gt;= 0
      */
     public int getConnectionPoolTimeout() {
         int i = getIntegerProperty(CONNECTION_POOL_TIMEOUT_KEY, "0");
@@ -109,7 +109,7 @@ public int getConnectionPoolTimeout() {
      * Return the integer value associated with the property
      * axis.http.client.connection.default.connection.timeout or a default of 0.
      *
-     * @return an integer >= 0
+     * @return an integer &gt;= 0
      */
     public int getDefaultConnectionTimeout() {
         int i = getIntegerProperty(CONNECTION_DEFAULT_CONNECTION_TIMEOUT_KEY, "0");
@@ -123,7 +123,7 @@ public int getDefaultConnectionTimeout() {
      * Return the integer value associated with the property
      * axis.http.client.connection.default.so.timeout or a default of 0.
      *
-     * @return an integer >= 0
+     * @return an integer &gt;= 0
      */
     public int getDefaultSoTimeout() {
         int i = getIntegerProperty(CONNECTION_DEFAULT_SO_TIMEOUT_KEY, "0");
diff --git a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java
index 0694e1424..63127d6ec 100644
--- a/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java
+++ b/axis-rt-transport-http-hc3/src/main/java/org/apache/axis/transport/http/CommonsHTTPSender.java
@@ -312,7 +312,6 @@ public void invoke(MessageContext msgContext) throws AxisFault {
      * a string or an array of strings (if there are more than one Set-Cookie)
      *
      * @param cookieName
-     * @param setCookieName
      * @param cookie
      * @param msgContext
      */
diff --git a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
index 9f7fdf59a..35f8f1ab9 100644
--- a/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
+++ b/maven/axis-server-maven-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
@@ -37,7 +37,7 @@
 import org.xml.sax.InputSource;
 
 /**
- * Start a {@link org.apache.axis.server.standalone.StandaloneAxisServer} instance in a separate
+ * Start a <code>org.apache.axis.server.standalone.StandaloneAxisServer</code> instance in a separate
  * JVM.
  * 
  * @goal start-server
diff --git a/maven/pom.xml b/maven/pom.xml
index f3776c466..f853e5c86 100644
--- a/maven/pom.xml
+++ b/maven/pom.xml
@@ -75,6 +75,25 @@
     </modules>
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <configuration>
+                    <tags>
+                        <tag>
+                            <name>goal</name>
+                            <placement>X</placement>
+                        </tag>
+                        <tag>
+                            <name>phase</name>
+                            <placement>X</placement>
+                        </tag>
+                        <tag>
+                            <name>requiresDependencyResolution</name>
+                            <placement>X</placement>
+                        </tag>
+                    </tags>
+                </configuration>
+            </plugin>
             <plugin>
                 <!-- This overrides the set of reports (we don't want to generate the reports defined in the parent POM) -->
                 <artifactId>maven-site-plugin</artifactId>

From 44f69192da5cd2b547acf2d0519e2e2511b45e5e Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Wed, 9 May 2018 22:09:26 +0000
Subject: [PATCH 089/133] Update Travis notification settings.

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ac4ca71ae..b992411ec 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,4 +10,5 @@ cache:
 script: mvn clean verify -Papache-release -Dgpg.skip=true
 notifications:
   email:
-    - java-dev@axis.apache.org
+    # java-dev@axis.apache.org doesn't work here because it's not an address registered on GitHub.
+    - veithen@apache.org

From a4f2676f7385f3455423ad4b8f1f32e698d23670 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 10 May 2018 19:23:51 +0000
Subject: [PATCH 090/133] Remove SonicMQVendorAdapter. Classes from the
 progress.message.jclient package are not available in any public repository.

---
 axis-rt-transport-jms/pom.xml                 |  13 -
 .../components/jms/SonicMQVendorAdapter.java  | 392 ------------------
 2 files changed, 405 deletions(-)
 delete mode 100644 axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java

diff --git a/axis-rt-transport-jms/pom.xml b/axis-rt-transport-jms/pom.xml
index cfb3c78bd..1a4ed5bce 100644
--- a/axis-rt-transport-jms/pom.xml
+++ b/axis-rt-transport-jms/pom.xml
@@ -49,17 +49,4 @@
             <version>1.1.1</version>
         </dependency>
     </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <excludes>
-                        <!-- Classes from the progress.message.jclient package are not available in any public repository -->
-                        <exclude>org/apache/axis/components/jms/SonicMQVendorAdapter.java</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java
deleted file mode 100644
index 4240bae88..000000000
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/components/jms/SonicMQVendorAdapter.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*
- * Copyright 2001, 2002,2004 The Apache Software Foundation.
- * 
- * Licensed 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.axis.components.jms;
-
-import org.apache.axis.MessageContext;
-import org.apache.axis.client.Call;
-import org.apache.axis.transport.jms.JMSConnector;
-import org.apache.axis.transport.jms.JMSConnectorFactory;
-import org.apache.axis.transport.jms.JMSURLHelper;
-
-import progress.message.client.ENetworkFailure;
-import progress.message.client.EUserAlreadyConnected;
-import progress.message.jclient.ErrorCodes;
-
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.TopicConnectionFactory;
-import java.util.HashMap;
-import java.util.Iterator;
-
-/**
- * Defines SonicMQ specific constants for connnection factory creation.
- * Overrides methods in BeanVendorAdapter to fill in MQ classnames
- *
- * @author Jaime Meritt (jmeritt@sonicsoftware.com)
- * @author Ray Chun (rchun@sonicsoftware.com)
- */
-public class SonicMQVendorAdapter extends BeanVendorAdapter
-{
-    private final static String QCF_CLASS =
-        "progress.message.jclient.QueueConnectionFactory";
-
-    private final static String TCF_CLASS =
-        "progress.message.jclient.TopicConnectionFactory";
-
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>.
-     * This is a required property.
-     * The value must be a <code>java.lang.String</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String BROKER_URL              = "brokerURL";
-
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domains.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * This is a required property for secure brokers.
-     * The value must be a <code>java.lang.String</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String DEFAULT_USERNAME = "defaultUser";
-
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * This is a required property for secure brokers.
-     * The value must be a <code>java.lang.String</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String DEFAULT_PASSWORD        = "defaultPassword";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Long</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String PING_INTERVAL           = "pingIntervalLong";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Integer</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String RECONNECT_INTERVAL      = "reconnectIntervalInteger";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Integer</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String RECONNECT_TIMEOUT       = "reconnectTimeoutInteger";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.String</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String CONNECT_ID              = "connectID";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.String</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String CONNECTION_URLS         = "connectionURLs";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Boolean</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String LOAD_BALANCING          = "loadBalancingBoolean";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Long</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String MONITOR_INTERVAL        = "monitorInterval";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Boolean</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String PERSISTENT_DELIVERY     = "persistentDeliveryBoolean";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for either domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Boolean</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String SEQUENTIAL              = "sequentialBoolean";
-
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for the PTP domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Integer</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String PREFETCH_COUNT          = "prefetchCountInteger";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for the PTP domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Integer</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String PREFETCH_THRESHOLD      = "prefetchThresholdInteger";
-    /**
-     * <code>SonicConnectionFactory</code> parameter valid for the PubSub domain.  This should
-     * be used as a key in the environment map passed into calls to
-     * <code>createConnector</code> in <code>JMSConnectorFactory</code>
-     * The value must be a <code>java.lang.Boolean</code>
-     * See the SonicMQ documentation for information on this property
-     */
-    public final static String SELECTOR_AT_BROKER      = "selectorAtBroker";
-
-    public QueueConnectionFactory getQueueConnectionFactory(HashMap cfConfig)
-        throws Exception
-    {
-        cfConfig = (HashMap)cfConfig.clone();
-        cfConfig.put(CONNECTION_FACTORY_CLASS, QCF_CLASS);
-        return super.getQueueConnectionFactory(cfConfig);
-    }
-
-    public TopicConnectionFactory getTopicConnectionFactory(HashMap cfConfig)
-        throws Exception
-    {
-        cfConfig = (HashMap)cfConfig.clone();
-        cfConfig.put(CONNECTION_FACTORY_CLASS, TCF_CLASS);
-        return super.getTopicConnectionFactory(cfConfig);
-    }
-
-    /**
-     * Extract Sonic-specific properties from the JMS URL
-     *
-     * @param jmsurl The JMS URL representing the target endpoint address
-     * @param cfProps The set of connection factory configuration properties
-     */
-    public void addVendorConnectionFactoryProperties(JMSURLHelper jmsurl, HashMap cfProps)
-    {
-        if (jmsurl.getPropertyValue(BROKER_URL) != null)
-            cfProps.put(BROKER_URL, jmsurl.getPropertyValue(BROKER_URL));
-
-        if (jmsurl.getPropertyValue(DEFAULT_USERNAME) != null)
-            cfProps.put(DEFAULT_USERNAME, jmsurl.getPropertyValue(DEFAULT_USERNAME));
-
-        if (jmsurl.getPropertyValue(DEFAULT_PASSWORD) != null)
-            cfProps.put(DEFAULT_PASSWORD, jmsurl.getPropertyValue(DEFAULT_PASSWORD));
-
-        if (jmsurl.getPropertyValue(PING_INTERVAL) != null)
-            cfProps.put(PING_INTERVAL, jmsurl.getPropertyValue(PING_INTERVAL));
-
-        if (jmsurl.getPropertyValue(RECONNECT_INTERVAL) != null)
-            cfProps.put(RECONNECT_INTERVAL, jmsurl.getPropertyValue(RECONNECT_INTERVAL));
-
-        if (jmsurl.getPropertyValue(RECONNECT_TIMEOUT) != null)
-            cfProps.put(RECONNECT_TIMEOUT, jmsurl.getPropertyValue(RECONNECT_TIMEOUT));
-
-        if (jmsurl.getPropertyValue(CONNECT_ID) != null)
-            cfProps.put(CONNECT_ID, jmsurl.getPropertyValue(CONNECT_ID));
-
-        if (jmsurl.getPropertyValue(CONNECTION_URLS) != null)
-            cfProps.put(CONNECTION_URLS, jmsurl.getPropertyValue(CONNECTION_URLS));
-
-        if (jmsurl.getPropertyValue(LOAD_BALANCING) != null)
-            cfProps.put(LOAD_BALANCING, jmsurl.getPropertyValue(LOAD_BALANCING));
-
-        if (jmsurl.getPropertyValue(MONITOR_INTERVAL) != null)
-            cfProps.put(MONITOR_INTERVAL, jmsurl.getPropertyValue(MONITOR_INTERVAL));
-
-        if (jmsurl.getPropertyValue(PERSISTENT_DELIVERY) != null)
-            cfProps.put(PERSISTENT_DELIVERY, jmsurl.getPropertyValue(PERSISTENT_DELIVERY));
-
-        if (jmsurl.getPropertyValue(SEQUENTIAL) != null)
-            cfProps.put(SEQUENTIAL, jmsurl.getPropertyValue(SEQUENTIAL));
-
-        if (jmsurl.getPropertyValue(PREFETCH_COUNT) != null)
-            cfProps.put(PREFETCH_COUNT, jmsurl.getPropertyValue(PREFETCH_COUNT));
-
-        if (jmsurl.getPropertyValue(PREFETCH_THRESHOLD) != null)
-            cfProps.put(PREFETCH_THRESHOLD, jmsurl.getPropertyValue(PREFETCH_THRESHOLD));
-
-        if (jmsurl.getPropertyValue(SELECTOR_AT_BROKER) != null)
-            cfProps.put(SELECTOR_AT_BROKER, jmsurl.getPropertyValue(SELECTOR_AT_BROKER));
-    }
-
-    /**
-     * Check that the attributes of the candidate connection factory match the
-     * requested connection factory properties.
-     *
-     * @param cf the candidate connection factory
-     * @param jmsurl the JMS URL associated with the candidate connection factory
-     * @param cfProps the properties associated with the current request
-     * @return true or false
-     */
-    public boolean isMatchingConnectionFactory(javax.jms.ConnectionFactory cf,
-                                               JMSURLHelper jmsurl,
-                                               HashMap cfProps)
-    {
-        String brokerURL = null;
-        String connectionURLs = null;
-        boolean loadBalancing = false;
-        boolean sequential = false;
-
-        if (cf instanceof progress.message.jclient.QueueConnectionFactory)
-        {
-            progress.message.jclient.QueueConnectionFactory qcf =
-                (progress.message.jclient.QueueConnectionFactory)cf;
-
-            // get existing queue connection factory properties
-            brokerURL = qcf.getBrokerURL();
-            connectionURLs = qcf.getConnectionURLs();
-            loadBalancing = qcf.getLoadBalancing();
-            sequential = qcf.getSequential();
-        }
-        else if (cf instanceof progress.message.jclient.TopicConnectionFactory)
-        {
-            progress.message.jclient.TopicConnectionFactory tcf =
-                (progress.message.jclient.TopicConnectionFactory)cf;
-
-            // get existing topic connection factory properties
-            brokerURL = tcf.getBrokerURL();
-            connectionURLs = tcf.getConnectionURLs();
-            loadBalancing = tcf.getLoadBalancing();
-            sequential = tcf.getSequential();
-        }
-
-        // compare broker url
-        String propertyBrokerURL = (String)cfProps.get(BROKER_URL);
-        if (!brokerURL.equals(propertyBrokerURL))
-            return false;
-
-        // compare connection url list
-        String propertyConnectionURLs = (String)cfProps.get(CONNECTION_URLS);
-        if ((connectionURLs != null) && (propertyConnectionURLs != null))
-        {
-            if (!connectionURLs.equalsIgnoreCase(propertyConnectionURLs))
-                return false;
-
-            // check sequential if connection urls have been set
-            String tmpSequential = (String)cfProps.get(SEQUENTIAL);
-            boolean propertySequential = true;
-            if (tmpSequential != null)
-                propertySequential = Boolean.getBoolean(tmpSequential);
-            if (sequential != propertySequential)
-                return false;
-        }
-        else if ((connectionURLs != null) || (propertyConnectionURLs != null))
-            return false;
-
-        // compare load balancing flag
-        String tmpLoadBalancing = (String)cfProps.get(LOAD_BALANCING);
-        boolean propertyLoadBalancing = false;
-        if (tmpLoadBalancing != null)
-            propertyLoadBalancing = Boolean.getBoolean(tmpLoadBalancing);
-        if (loadBalancing != propertyLoadBalancing)
-            return false;
-
-        return true;
-    }
-
-    public boolean isRecoverable(Throwable thrown, int action)
-    {
-        //the super class cannot be trusted for on exception because it always
-        //returns false
-        if(action != ON_EXCEPTION_ACTION && !super.isRecoverable(thrown, action))
-            return false;
-
-        if(!(thrown instanceof JMSException))
-            return true;
-
-        JMSException jmse = (JMSException)thrown;
-        switch(action)
-        {
-            case CONNECT_ACTION:
-                if(isNetworkFailure(jmse))
-                    return false;
-                break;
-            case SUBSCRIBE_ACTION:
-
-                if(isQueueMissing(jmse) || isAnotherSubscriberConnected(jmse))
-                    return false;
-                break;
-
-            case ON_EXCEPTION_ACTION:
-                if(isConnectionDropped(jmse))
-                    return false;
-                break;
-
-        }
-
-        return true;
-    }
-
-    public boolean isConnectionDropped(JMSException jmse)
-    {
-        return ErrorCodes.testException(jmse, ErrorCodes.ERR_CONNECTION_DROPPED);
-    }
-
-    private boolean isQueueMissing(JMSException jmse)
-    {
-        String message = jmse.getMessage();
-        if(message != null && message.startsWith("Queue not found"))
-        {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isAnotherSubscriberConnected(JMSException jmse)
-    {
-        Exception linkedException = jmse.getLinkedException();
-        if(linkedException != null &&
-           linkedException instanceof EUserAlreadyConnected)
-        {
-            return true;
-        }
-        return false;
-    }
-
-    private boolean isNetworkFailure(JMSException jmse)
-    {
-        Exception linkedException = jmse.getLinkedException();
-        if(linkedException != null &&
-           linkedException instanceof ENetworkFailure)
-        {
-            return true;
-        }
-        return false;
-    }
-}
\ No newline at end of file

From 707a963f0c14cae527aa31d263026dba1ff91d0d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Thu, 10 May 2018 22:19:03 +0000
Subject: [PATCH 091/133] Fix Javadoc problems.

---
 .../java/org/apache/axis/transport/jms/Handler.java  |  2 +-
 .../org/apache/axis/transport/jms/JMSEndpoint.java   | 12 ++++++------
 .../org/apache/axis/transport/jms/JMSSender.java     |  2 +-
 .../org/apache/axis/transport/jms/JMSURLHelper.java  |  2 +-
 .../java/org/apache/axis/transport/mail/Handler.java |  2 +-
 .../org/apache/axis/transport/mail/MailServer.java   |  2 +-
 .../apache/axis/transport/mail/MailTransport.java    |  2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java
index 8f4bdadaf..9a4f2880d 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/Handler.java
@@ -33,7 +33,7 @@ public class Handler
     }
 
     /**
-     * Reassembles the URL string, in the form "jms:/<dest>?prop1=value1&prop2=value2&..."
+     * Reassembles the URL string, in the form "jms:/&lt;dest&gt;?prop1=value1&amp;prop2=value2&amp;..."
      */
     protected String toExternalForm(URL url) {
 
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java
index 944854213..109c83195 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSEndpoint.java
@@ -47,7 +47,7 @@ abstract Destination getDestination(Session session)
      * @param message
      * @param timeout
      * @return
-     * @throws JMSException
+     * @throws Exception
      */
     public byte[] call(byte[] message, long timeout)throws Exception
     {
@@ -61,7 +61,7 @@ public byte[] call(byte[] message, long timeout)throws Exception
      * @param timeout
      * @param properties
      * @return
-     * @throws JMSException
+     * @throws Exception
      */
     public byte[] call(byte[] message, long timeout, HashMap properties)
         throws Exception
@@ -75,7 +75,7 @@ public byte[] call(byte[] message, long timeout, HashMap properties)
      * Send a message w/o waiting for a response.
      *
      * @param message
-     * @throws JMSException
+     * @throws Exception
      */
     public void send(byte[] message)throws Exception
     {
@@ -87,7 +87,7 @@ public void send(byte[] message)throws Exception
      *
      * @param message
      * @param properties
-     * @throws JMSException
+     * @throws Exception
      */
     public void send(byte[] message, HashMap properties)
         throws Exception
@@ -101,7 +101,7 @@ public void send(byte[] message, HashMap properties)
      * Register a MessageListener.
      *
      * @param listener
-     * @throws JMSException
+     * @throws Exception
      */
     public void registerListener(MessageListener listener)
         throws Exception
@@ -114,7 +114,7 @@ public void registerListener(MessageListener listener)
      *
      * @param listener
      * @param properties
-     * @throws JMSException
+     * @throws Exception
      */
     public void registerListener(MessageListener listener, HashMap properties)
         throws Exception
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java
index 24621fd2b..b05149440 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSSender.java
@@ -44,7 +44,7 @@ public JMSSender()
      * invoke() creates an endpoint, sends the request SOAP message, and then
      *   either reads the response SOAP message or simply returns.
      *
-     * @todo hash on something much better than the connection factory
+     * TODO: hash on something much better than the connection factory
      *  something like domain:url:username:password would be adequate
      * @param msgContext
      * @throws AxisFault
diff --git a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java
index d157e2bff..8467247a3 100644
--- a/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java
+++ b/axis-rt-transport-jms/src/main/java/org/apache/axis/transport/jms/JMSURLHelper.java
@@ -25,7 +25,7 @@
 
 /**
  * JMSURLHelper provides access to properties in the URL.
- * The URL must be of the form: "jms:/<destination>?[<property>=<key>&]*"
+ * The URL must be of the form: "jms:/&lt;destination&gt;?[&lt;property&gt;=&lt;key&gt;&amp;]*"
  *
  * @author Ray Chun (rchun@sonicsoftware.com)
  */
diff --git a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java
index 75d84144e..663396c79 100644
--- a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java
+++ b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/Handler.java
@@ -24,7 +24,7 @@
  * A stub URLStreamHandler, so the system will recognize our
  * custom URLs as valid.
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas &lt;dims@yahoo.com&gt;
  */
 public class Handler extends URLStreamHandler {
     protected URLConnection openConnection(URL u) {
diff --git a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java
index 64c528fd3..f68c19de3 100644
--- a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java
+++ b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailServer.java
@@ -38,7 +38,7 @@
  * use.  Its intended uses are for demos, debugging, and performance
  * profiling.
  *
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas &lt;dims@yahoo.com&gt;
  * @author Rob Jellinghaus (robj@unrealities.com)
  */
 
diff --git a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java
index 9b04c7453..2f551a770 100644
--- a/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java
+++ b/axis-rt-transport-mail/src/main/java/org/apache/axis/transport/mail/MailTransport.java
@@ -24,7 +24,7 @@
 /**
  * A Transport which will cause an invocation via "mail" 
  * 
- * @author Davanum Srinivas <dims@yahoo.com>
+ * @author Davanum Srinivas &lt;dims@yahoo.com&gt;
  */
 public class MailTransport extends Transport {
     public MailTransport() {

From af4ba8107e067690e99618e3f26b4d0b1e58299a Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 12 May 2018 12:34:18 +0000
Subject: [PATCH 092/133] Enable Maven non-interactive mode in Travis builds.

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index b992411ec..f493b9c78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,7 +7,7 @@ install: echo NOOP Skipping pre-fetch of Maven dependencies
 cache:
   directories:
     - $HOME/.m2
-script: mvn clean verify -Papache-release -Dgpg.skip=true
+script: mvn -B clean verify -Papache-release -Dgpg.skip=true
 notifications:
   email:
     # java-dev@axis.apache.org doesn't work here because it's not an address registered on GitHub.

From 59c916bbafb14ad521d4981b1490e5ab7ec06531 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 12 May 2018 13:08:15 +0000
Subject: [PATCH 093/133] Reduce build verbosity.

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 25abc43ae..d54a8bd07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -187,6 +187,7 @@
                     <version>3.0.0</version>
                     <configuration>
                         <source>${javaVersion}</source>
+                        <quiet>true</quiet>
                     </configuration>
                 </plugin>
                 <plugin>

From 3c177184a1ce07550cb55c8516c10baf6cc7f0bb Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 20 May 2018 11:42:47 +0000
Subject: [PATCH 094/133] Use jar-no-fork to build the source JARs.

---
 pom.xml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d54a8bd07..fb84a0406 100644
--- a/pom.xml
+++ b/pom.xml
@@ -355,12 +355,9 @@
                 <artifactId>maven-source-plugin</artifactId>
                 <executions>
                     <execution>
-                        <!-- Use the same ID as in org.apache:apache; otherwise, the goal
-                             will be executed twice when the apache-release profile is
-                             activated -->
-                        <id>attach-sources</id>
+                        <id>source-jars</id>
                         <goals>
-                            <goal>jar</goal>
+                            <goal>jar-no-fork</goal>
                         </goals>
                     </execution>
                 </executions>
@@ -404,6 +401,26 @@
         </plugins>
     </build>
     <profiles>
+        <profile>
+            <id>apache-release</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-source-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <!-- Skip the execution configured in org.apache:apache. We use our own configuration. -->
+                                <id>attach-sources</id>
+                                <phase>none</phase>
+                                <goals>
+                                    <goal>jar</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <!-- Profile to generate Eclipse project metadata -->
             <id>eclipse</id>

From f49a906cdf81fdb4cbb1e7d162228ce37827cf18 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 20 May 2018 11:47:42 +0000
Subject: [PATCH 095/133] Disable detectOfflineLinks.

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index fb84a0406..e93eb5d6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -186,6 +186,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>3.0.0</version>
                     <configuration>
+                        <detectOfflineLinks>false</detectOfflineLinks>
                         <source>${javaVersion}</source>
                         <quiet>true</quiet>
                     </configuration>

From 558f82f34b88e99838a85ae7586ad0a9247dcb0d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 20 May 2018 11:57:28 +0000
Subject: [PATCH 096/133] Update surefire and failsafe configs.

---
 pom.xml | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index e93eb5d6f..24e7e9a2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -193,8 +193,12 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.11</version>
+                    <version>2.21.0</version>
                     <configuration>
+                        <!-- Make test execution deterministic -->
+                        <runOrder>alphabetical</runOrder>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <trimStackTrace>false</trimStackTrace>
                         <systemPropertyVariables>
                             <!-- Axis doesn't contain META-INF/services/* files for SAAJ. Instead, the SAAJ API
                                  library provided by Axis uses the Axis SAAJ implementation by default. That's an issue on Java 1.6
@@ -208,10 +212,13 @@
                 </plugin>
                 <plugin>
                     <artifactId>maven-failsafe-plugin</artifactId>
-                    <version>2.11</version>
+                    <version>2.21.0</version>
                     <configuration>
+                        <!-- See the corresponding surefire configuration for more information about this. -->
+                        <runOrder>alphabetical</runOrder>
+                        <redirectTestOutputToFile>true</redirectTestOutputToFile>
+                        <trimStackTrace>false</trimStackTrace>
                         <systemPropertyVariables>
-                            <!-- See the corresponding surefire configuration for more information about this. -->
                             <javax.xml.soap.MessageFactory>org.apache.axis.soap.MessageFactoryImpl</javax.xml.soap.MessageFactory>
                             <javax.xml.soap.SOAPFactory>org.apache.axis.soap.SOAPFactoryImpl</javax.xml.soap.SOAPFactory>
                             <javax.xml.soap.SOAPConnectionFactory>org.apache.axis.soap.SOAPConnectionFactoryImpl</javax.xml.soap.SOAPConnectionFactory>

From 65225ba40e059b4bd4f9cede2c81ef4c191da04e Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 20 May 2018 19:33:46 +0000
Subject: [PATCH 097/133] Upgrade JUnit.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 24e7e9a2e..7f34c11a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -107,7 +107,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>3.8.2</version>
+                <version>4.12</version>
             </dependency>
             <dependency>
                 <groupId>xmlunit</groupId>

From 2e0a5d6fe66b82ab5b89c8029247dc15e6e17d46 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 20 May 2018 20:10:32 +0000
Subject: [PATCH 098/133] Correctly escape namespace URIs in namespace
 declarations.

---
 .../axis/encoding/SerializationContext.java   | 11 ++--
 axis-war/pom.xml                              | 13 +++++
 .../test/java/org/apache/axis/war/Utils.java  | 33 +++++++++++
 .../java/org/apache/axis/war/XssTest.java     | 57 +++++++++++++++++++
 .../java/test/httpunit/HttpUnitTestBase.java  |  5 +-
 .../org/apache/axis/war/getVersion-xss.xml    |  9 +++
 pom.xml                                       |  5 ++
 7 files changed, 125 insertions(+), 8 deletions(-)
 create mode 100644 axis-war/src/test/java/org/apache/axis/war/Utils.java
 create mode 100644 axis-war/src/test/java/org/apache/axis/war/XssTest.java
 create mode 100644 axis-war/src/test/resources/org/apache/axis/war/getVersion-xss.xml

diff --git a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
index 0cf0ac907..f33ec28df 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/encoding/SerializationContext.java
@@ -1181,12 +1181,13 @@ public void startElement(QName qName, Attributes attributes)
                         sb.append(':');
                         sb.append(map.getPrefix());
                     }
-                    if ((vecQNames==null) || (vecQNames.indexOf(sb.toString())==-1)) {
+                    String qname = sb.toString();
+                    if ((vecQNames==null) || (vecQNames.indexOf(qname)==-1)) {
                         writer.write(' ');
-                        sb.append("=\"");
-                        sb.append(map.getNamespaceURI());
-                        sb.append('"');
-                        writer.write(sb.toString());
+                        writer.write(qname);
+                        writer.write("=\"");
+                        getEncoder().writeEncoded(writer, map.getNamespaceURI());
+                        writer.write('"');
                     }
                 }
             }
diff --git a/axis-war/pom.xml b/axis-war/pom.xml
index f2fed9c8c..09aa21e46 100644
--- a/axis-war/pom.xml
+++ b/axis-war/pom.xml
@@ -28,6 +28,9 @@
     <artifactId>axis-war</artifactId>
     <packaging>war</packaging>
     <name>Axis :: WAR</name>
+    <properties>
+        <javaVersion>1.5</javaVersion>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -63,12 +66,22 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.truth</groupId>
+            <artifactId>truth</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>httpunit</groupId>
             <artifactId>httpunit</artifactId>
             <version>1.6.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
diff --git a/axis-war/src/test/java/org/apache/axis/war/Utils.java b/axis-war/src/test/java/org/apache/axis/war/Utils.java
new file mode 100644
index 000000000..77d03ee25
--- /dev/null
+++ b/axis-war/src/test/java/org/apache/axis/war/Utils.java
@@ -0,0 +1,33 @@
+/*
+ * 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.axis.war;
+
+import static org.junit.Assert.assertNotNull;
+
+public final class Utils {
+    private static String URL_PROPERTY = "test.functional.webapp.url";
+
+    private Utils() {}
+
+    public static String getWebappUrl() {
+        String url = System.getProperty(URL_PROPERTY);
+        assertNotNull(URL_PROPERTY + " not set", url);
+        return url;
+    }
+}
diff --git a/axis-war/src/test/java/org/apache/axis/war/XssTest.java b/axis-war/src/test/java/org/apache/axis/war/XssTest.java
new file mode 100644
index 000000000..0504e1a8c
--- /dev/null
+++ b/axis-war/src/test/java/org/apache/axis/war/XssTest.java
@@ -0,0 +1,57 @@
+/*
+ * 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.axis.war;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+
+public class XssTest {
+    /**
+     * Tests for potential XSS vulnerability in the Version service.
+     * <p>
+     * The Version service returns a body with whatever namespace URI was used in the request. If
+     * the namespace URI is not properly encoded in the response, then this creates a potential
+     * XSS vulnerability.
+     * 
+     * @throws Exception
+     */
+    @Test
+    public void testGetVersion() throws Exception {
+        HttpURLConnection conn = (HttpURLConnection)new URL(Utils.getWebappUrl() + "/services/Version").openConnection();
+        conn.setDoInput(true);
+        conn.setDoOutput(true);
+        conn.setRequestProperty("SOAPAction", "");
+        conn.setRequestProperty("Content-Type", "text/xml;charset=UTF-8");
+        InputStream payload = XssTest.class.getResourceAsStream("getVersion-xss.xml");
+        OutputStream out = conn.getOutputStream();
+        IOUtils.copy(payload, out);
+        payload.close();
+        out.close();
+        assertThat(conn.getResponseCode()).isEqualTo(200);
+        InputStream in = conn.getInputStream();
+        assertThat(IOUtils.toString(in, "UTF-8")).doesNotContain("<script");
+    }
+}
diff --git a/axis-war/src/test/java/test/httpunit/HttpUnitTestBase.java b/axis-war/src/test/java/test/httpunit/HttpUnitTestBase.java
index 8ca191a8d..98a66b5c5 100644
--- a/axis-war/src/test/java/test/httpunit/HttpUnitTestBase.java
+++ b/axis-war/src/test/java/test/httpunit/HttpUnitTestBase.java
@@ -22,6 +22,7 @@
 import java.io.*;
 import java.net.MalformedURLException;
 
+import org.apache.axis.war.Utils;
 import org.xml.sax.SAXException;
 
 /**
@@ -38,14 +39,12 @@ public HttpUnitTestBase(String s) {
         super(s);
     }
 
-    private static String URL_PROPERTY="test.functional.webapp.url";
     /**
      *  The JUnit setup method
      *
      */
     public void setUp() throws Exception {
-        url=System.getProperty(URL_PROPERTY);
-        assertNotNull(URL_PROPERTY+" not set",url);
+        url = Utils.getWebappUrl();
         HttpUnitOptions.setExceptionsThrownOnErrorStatus(true);
         HttpUnitOptions.setMatchesIgnoreCase(true);
         HttpUnitOptions.setParserWarningsEnabled(true);
diff --git a/axis-war/src/test/resources/org/apache/axis/war/getVersion-xss.xml b/axis-war/src/test/resources/org/apache/axis/war/getVersion-xss.xml
new file mode 100644
index 000000000..380009e16
--- /dev/null
+++ b/axis-war/src/test/resources/org/apache/axis/war/getVersion-xss.xml
@@ -0,0 +1,9 @@
+<soapenv:Envelope
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:axis="http://axis.apache.org&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x22;&#x3e;&#x3c;&#x73;&#x63;&#x72;&#x69;&#x70;&#x74;&#x20;&#x78;&#x6d;&#x6c;&#x6e;&#x73;&#x3d;&#x22;&#x68;&#x74;&#x74;&#x70;&#x3a;&#x2f;&#x2f;&#x77;&#x77;&#x77;&#x2e;&#x77;&#x33;&#x2e;&#x6f;&#x72;&#x67;&#x2f;&#x31;&#x39;&#x39;&#x39;&#x2f;&#x78;&#x68;&#x74;&#x6d;&#x6c;&#x22;&#x3e;&#x0a;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x61;&#x6c;&#x65;&#x72;&#x74;&#x28;&#x27;&#x48;&#x65;&#x6c;&#x6c;&#x6f;&#x27;&#x29;&#x3b;&#x0a;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x20;&#x3c;&#x2f;&#x73;&#x63;&#x72;&#x69;&#x70;&#x74;&#x3e;">
+  <soapenv:Body>
+    <axis:getVersion soapenv:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+  </soapenv:Body>
+</soapenv:Envelope>
diff --git a/pom.xml b/pom.xml
index 7f34c11a2..022c64b63 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,11 @@
                 <artifactId>junit</artifactId>
                 <version>4.12</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.truth</groupId>
+                <artifactId>truth</artifactId>
+                <version>0.40</version>
+            </dependency>
             <dependency>
                 <groupId>xmlunit</groupId>
                 <artifactId>xmlunit</artifactId>

From 1c4fe8fcc12c7169a08a97eb704ea51b85da9a72 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 20 May 2018 21:34:16 +0000
Subject: [PATCH 099/133] Ensure that all tasks scheduled by
 LimitSessionManager have completed before proceeding with the stop operation.

---
 axis-standalone-server/pom.xml                |  3 +++
 .../standalone/LimitSessionManager.java       | 19 +++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/axis-standalone-server/pom.xml b/axis-standalone-server/pom.xml
index d77f4435d..63e0553e1 100644
--- a/axis-standalone-server/pom.xml
+++ b/axis-standalone-server/pom.xml
@@ -37,6 +37,9 @@
             <url>${baseSiteUrl}/standalone-server</url>
         </site>
     </distributionManagement>
+    <properties>
+        <javaVersion>1.5</javaVersion>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java
index aef1f3cd1..33493506a 100644
--- a/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java
+++ b/axis-standalone-server/src/main/java/org/apache/axis/server/standalone/LimitSessionManager.java
@@ -19,8 +19,9 @@
 package org.apache.axis.server.standalone;
 
 import java.util.Iterator;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -51,8 +52,7 @@ protected void timeout() {
     }
     
     private final int maxSessions;
-    private Timer timer;
-    private TimerTask task;
+    private ScheduledExecutorService executor;
 
     LimitSessionManager(int maxSessions) {
         this.maxSessions = maxSessions;
@@ -60,13 +60,12 @@ protected void timeout() {
 
     public void doStart() throws Exception {
         super.doStart();
-        timer = new Timer(true);
-        task = new TimerTask() {
+        executor = new ScheduledThreadPoolExecutor(1);
+        executor.scheduleWithFixedDelay(new Runnable() {
             public void run() {
                 scavenge();
             }
-        };
-        timer.schedule(task, 5000L, 5000L);
+        }, 5, 5, TimeUnit.SECONDS);
     }
     
     protected AbstractSessionManager.Session newSession(HttpServletRequest request) {
@@ -95,8 +94,8 @@ void scavenge() {
     }
     
     public void doStop() throws Exception {
-        task.cancel();
-        timer.cancel();
+        executor.shutdown();
+        executor.awaitTermination(60, TimeUnit.SECONDS);
         super.doStop();
     }
 }

From 7e52705c8d0c6c0f192f30c56e50911d25f4ec19 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 27 May 2018 18:51:13 +0000
Subject: [PATCH 100/133] Set up Travis for automatic snapshot deployment.

---
 .travis-settings.xml | 13 +++++++++++++
 .travis.yml          |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 .travis-settings.xml

diff --git a/.travis-settings.xml b/.travis-settings.xml
new file mode 100644
index 000000000..ab1e4a6d6
--- /dev/null
+++ b/.travis-settings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                        http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>apache.snapshots.https</id>
+            <username>${env.REPO_USERNAME}</username>
+            <password>${env.REPO_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/.travis.yml b/.travis.yml
index f493b9c78..7b899093a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,11 +3,15 @@ language: java
 # There are test cases that use ImageIO with JPEG and that only work on Oracle JDK.
 jdk:
   - oraclejdk8
-install: echo NOOP Skipping pre-fetch of Maven dependencies
+install: true
+script: '[ "$TRAVIS_REPO_SLUG" == apache/axis1-java ] && [ "$TRAVIS_BRANCH" == trunk ] && [ "$TRAVIS_PULL_REQUEST" == false ] && goal=deploy || goal=verify ; mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true $goal'
+env:
+  global:
+    - secure: "rd5q/f6mA88heUgXm88Aae8q6PTwKp9rEJtQZihJRPWgnguJp/yPNXCyp0sdtL6ucPW8AXMlcuEUqNv12Y1orxG9zyDkGQ3IWazGB6XQ+feOG1MqXpnUz2DMv0KCqCTbxGyI7Quk5E/ghjhGdfxLETazQJaq4w5ARIxb2r0dyts="
+    - secure: "QVsD6fyEdJDBMc8Czap41kkmYNMRQndDL+ZYnvZvrl9x7SPpiUScIW7H1PM3C9Gsd1OZFecVJz1pqplKa0d1/WEkeqlyNFrKNS+jCPbn1ys05Pdq5/85aPfJC9XJu5MOjKn2wjW0Xe2xNpK5V/r13T1qnVAjUJYMfJzM1rogKAM="
 cache:
   directories:
     - $HOME/.m2
-script: mvn -B clean verify -Papache-release -Dgpg.skip=true
 notifications:
   email:
     # java-dev@axis.apache.org doesn't work here because it's not an address registered on GitHub.

From fa77929306c20ad8abca6aa5f7b929c393af675f Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 27 May 2018 22:23:32 +0000
Subject: [PATCH 101/133] Make the site buildable again.

---
 .travis.yml     |  2 +-
 apidocs/pom.xml | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b899093a..ac50702f9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: java
 jdk:
   - oraclejdk8
 install: true
-script: '[ "$TRAVIS_REPO_SLUG" == apache/axis1-java ] && [ "$TRAVIS_BRANCH" == trunk ] && [ "$TRAVIS_PULL_REQUEST" == false ] && goal=deploy || goal=verify ; mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true $goal'
+script: '[ "$TRAVIS_REPO_SLUG" == apache/axis1-java ] && [ "$TRAVIS_BRANCH" == trunk ] && [ "$TRAVIS_PULL_REQUEST" == false ] && goal=deploy || goal=install ; mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true $goal site'
 env:
   global:
     - secure: "rd5q/f6mA88heUgXm88Aae8q6PTwKp9rEJtQZihJRPWgnguJp/yPNXCyp0sdtL6ucPW8AXMlcuEUqNv12Y1orxG9zyDkGQ3IWazGB6XQ+feOG1MqXpnUz2DMv0KCqCTbxGyI7Quk5E/ghjhGdfxLETazQJaq4w5ARIxb2r0dyts="
diff --git a/apidocs/pom.xml b/apidocs/pom.xml
index 3862ee5e2..d1fe3e621 100644
--- a/apidocs/pom.xml
+++ b/apidocs/pom.xml
@@ -35,6 +35,9 @@
             <url>${baseSiteUrl}/apiDocs</url>
         </site>
     </distributionManagement>
+    <properties>
+        <javaVersion>1.5</javaVersion>
+    </properties>
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -51,11 +54,6 @@
             <artifactId>axis-jaxrpc</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>axis-rt-compat</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>axis-rt-core</artifactId>
@@ -176,6 +174,12 @@
                     <bottom>Copyright &#169; {organizationName}. All Rights Reserved.</bottom>
                     <!-- doctitle only appears in the summary and we should include the version there -->
                     <doctitle>Apache Axis ${project.version}</doctitle>
+                    <tags>
+                        <tag>
+                            <name>ant.task</name>
+                            <placement>X</placement>
+                        </tag>
+                    </tags>
                 </configuration>
             </plugin>
             <plugin>

From 9c0767b1dbf2c4c1f616a928e61e7749967e7c77 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 28 May 2018 09:09:06 +0000
Subject: [PATCH 102/133] Update filecheck-maven-plugin to release version.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 022c64b63..80cde80a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -280,7 +280,7 @@
                 <plugin>
                     <groupId>com.github.veithen.filecheck</groupId>
                     <artifactId>filecheck-maven-plugin</artifactId>
-                    <version>0.1-SNAPSHOT</version>
+                    <version>0.1</version>
                 </plugin>
             </plugins>
         </pluginManagement>

From ac408f30ed7d6e644b63279d5d33cd5aeca82f1c Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 15 Dec 2018 00:36:40 +0000
Subject: [PATCH 103/133] Set up Codecov integration.

---
 pom.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pom.xml b/pom.xml
index 80cde80a6..3ef300aa0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,6 +312,30 @@
                     <target>${javaVersion}</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>0.8.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.veithen.maven</groupId>
+                <artifactId>jacoco-report-maven-plugin</artifactId>
+                <version>0.1.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.codehaus.gmaven</groupId>
                 <artifactId>gmaven-plugin</artifactId>

From 04fb18fac14f03ac6b09a7dd89c03c7f9f395f5e Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 15 Dec 2018 09:52:35 +0000
Subject: [PATCH 104/133] Enable JaCoCo in Maven integration tests.

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 3ef300aa0..2d8aedd04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -254,6 +254,10 @@
                 <plugin>
                     <artifactId>maven-invoker-plugin</artifactId>
                     <version>1.7</version>
+                    <configuration>
+                        <!-- Enable the JaCoCo agent. -->
+                        <mavenOpts>${argLine}</mavenOpts>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.mortbay.jetty</groupId>

From fc4fb4e558148f8b407eeadf2703caddae5da3da Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 15 Dec 2018 11:18:10 +0000
Subject: [PATCH 105/133] Enable JaCoCo for axis-server-maven-plugin.

---
 pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pom.xml b/pom.xml
index 2d8aedd04..f7f42c372 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,6 +259,15 @@
                         <mavenOpts>${argLine}</mavenOpts>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>${project.groupId}</groupId>
+                    <artifactId>axis-server-maven-plugin</artifactId>
+                    <version>${project.version}</version>
+                    <configuration>
+                        <!-- Enable the JaCoCo agent. -->
+                        <argLine>${argLine}</argLine>
+                    </configuration>
+                </plugin>
                 <plugin>
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>jetty-maven-plugin</artifactId>

From 98960a8714189d238b16618d5e5a3637b65427aa Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 15 Dec 2018 12:00:56 +0000
Subject: [PATCH 106/133] Revert r1848986; argLine=${argLine} is actually the
 default already.

---
 pom.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index f7f42c372..2d8aedd04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,15 +259,6 @@
                         <mavenOpts>${argLine}</mavenOpts>
                     </configuration>
                 </plugin>
-                <plugin>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>axis-server-maven-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <configuration>
-                        <!-- Enable the JaCoCo agent. -->
-                        <argLine>${argLine}</argLine>
-                    </configuration>
-                </plugin>
                 <plugin>
                     <groupId>org.mortbay.jetty</groupId>
                     <artifactId>jetty-maven-plugin</artifactId>

From d3ab1ff4858256adb020b17561472d6a13f953a4 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sat, 15 Dec 2018 13:03:54 +0000
Subject: [PATCH 107/133] Enable JaCoCo in some Ant driven tests.

---
 samples/integrationguide-sample/pom.xml | 2 ++
 samples/jms-sample/pom.xml              | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/samples/integrationguide-sample/pom.xml b/samples/integrationguide-sample/pom.xml
index ad93742ad..95955e7c0 100644
--- a/samples/integrationguide-sample/pom.xml
+++ b/samples/integrationguide-sample/pom.xml
@@ -64,6 +64,7 @@
                                 <mkdir dir="${project.build.directory}/work/example1" />
                                 <!-- Need fork="true" here because WSDL2Java calls System.exit -->
                                 <java classname="samples.integrationGuide.example1.MyWSDL2Java" fork="true" classpathref="maven.test.classpath">
+                                    <jvmarg line="${argLine}"/>
                                     <arg value="src/test/wsdl/hello.wsdl" />
                                     <arg value="-o" />
                                     <arg value="${project.build.directory}/work/example1" />
@@ -71,6 +72,7 @@
                                 
                                 <mkdir dir="${project.build.directory}/work/example2" />
                                 <java classname="samples.integrationGuide.example2.WSDL2Useless" fork="true" classpathref="maven.test.classpath">
+                                    <jvmarg line="${argLine}"/>
                                     <arg value="src/test/wsdl/hello.wsdl" />
                                     <arg value="-o" />
                                     <arg value="${project.build.directory}/work/example2" />
diff --git a/samples/jms-sample/pom.xml b/samples/jms-sample/pom.xml
index 976ca6e1c..a113aee5a 100644
--- a/samples/jms-sample/pom.xml
+++ b/samples/jms-sample/pom.xml
@@ -165,6 +165,7 @@
                                 <echo message="Executing samples.jms.JMSTest ..."/>
                                 <java classname="samples.jms.JMSTest" fork="true" failonerror="true">
                                     <classpath refid="maven.test.classpath"/>
+                                    <jvmarg line="${argLine}"/>
                                     <sysproperty key="axis.ServerConfigFile" file="src/main/wsdd/server-config.wsdd"/>
                                     <arg value="-c"/>
                                     <arg value="${project.build.directory}/conf/activemq-connection-factory.properties"/>
@@ -175,6 +176,7 @@
                                 <echo message="Executing samples.jms.dii.JMSURLTest ..."/>
                                 <java classname="samples.jms.dii.JMSURLTest" fork="true" failonerror="true">
                                     <classpath refid="maven.test.classpath"/>
+                                    <jvmarg line="${argLine}"/>
                                     <sysproperty key="axis.ServerConfigFile" file="src/main/wsdd/server-config.wsdd"/>
                                     <arg value="-c"/>
                                     <arg value="${project.build.directory}/conf/activemq-connection-factory.properties"/>
@@ -187,6 +189,7 @@
                                 <echo message="Executing samples.jms.stub.JMSURLStubTest ..."/>
                                 <java classname="samples.jms.stub.JMSURLStubTest" fork="true" failonerror="true">
                                     <classpath refid="maven.test.classpath"/>
+                                    <jvmarg line="${argLine}"/>
                                     <sysproperty key="axis.ServerConfigFile" file="src/main/wsdd/server-config.wsdd"/>
                                     <sysproperty key="axis.ClientConfigFile" file="src/main/wsdd/client-config.wsdd"/>
                                     <arg value="-c"/>

From 99f8296ea2551d33c115304025884f44a138e10d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 6 Jan 2019 19:46:25 +0000
Subject: [PATCH 108/133] Remove unnecessary bootclasspath for tests in
 axis-rt-core.

---
 axis-rt-core/pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index acb215023..8d310d46e 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -189,8 +189,6 @@
                         <!-- Was commented out in the original PackageTests.java -->
                         <exclude>test/wsdd/TestXSD.java</exclude>
                     </excludes>
-                    <!-- TODO: this is bad; it could mean that Axis is not working properly on modern JREs -->
-                    <argLine>-Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar</argLine>
                 </configuration>
             </plugin>
             <plugin>

From 139fe931b0b00cb889db27b0be8aedf306ea2d42 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 6 Jan 2019 19:47:27 +0000
Subject: [PATCH 109/133] Upgrade jacoco-report-maven-plugin.

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2d8aedd04..d7ef021be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -331,7 +331,7 @@
             <plugin>
                 <groupId>com.github.veithen.maven</groupId>
                 <artifactId>jacoco-report-maven-plugin</artifactId>
-                <version>0.1.0</version>
+                <version>0.1.1</version>
                 <executions>
                     <execution>
                         <goals>

From 2d336b4161c162b861dc3e68507cf70052155de1 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Sun, 6 Jan 2019 23:04:22 +0000
Subject: [PATCH 110/133] Use alta-maven-plugin to build the boot classpath for
 axis-rt-core.

---
 axis-rt-core/pom.xml | 28 ++++++++++++++--------------
 pom.xml              |  5 +++++
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index 8d310d46e..759aeff49 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -127,28 +127,28 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>com.github.veithen.alta</groupId>
+                <artifactId>alta-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <phase>generate-resources</phase>
                         <goals>
-                            <goal>copy</goal>
+                            <goal>generate-properties</goal>
                         </goals>
                         <configuration>
-                            <artifactItems>
-                                <artifactItem>
+                            <name>compile.bootclasspath</name>
+                            <value>%file%</value>
+                            <separator>${path.separator}</separator>
+                            <artifacts>
+                                <artifact>
                                     <groupId>xerces</groupId>
                                     <artifactId>xmlParserAPIs</artifactId>
-                                </artifactItem>
-                                <artifactItem>
-                                    <groupId>${project.groupId}</groupId>
+                                </artifact>
+                                <artifact>
+                                    <groupId>org.apache.axis</groupId>
                                     <artifactId>axis-saaj</artifactId>
                                     <version>${project.version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWrite>true</overWrite>
-                            <outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <stripVersion>true</stripVersion>
+                                </artifact>
+                            </artifacts>
                         </configuration>
                     </execution>
                 </executions>
@@ -158,7 +158,7 @@
                 <configuration>
                     <compilerArgument>
                         <!-- Necessary because we only support DOM 2 and SAAJ 1.2 -->
-                        -Xbootclasspath/p:${project.build.directory}/endorsed/xmlParserAPIs.jar${path.separator}${project.build.directory}/endorsed/axis-saaj.jar
+                        -Xbootclasspath/p:${compile.bootclasspath}
                     </compilerArgument>
                 </configuration>
             </plugin>
diff --git a/pom.xml b/pom.xml
index d7ef021be..65724fd93 100644
--- a/pom.xml
+++ b/pom.xml
@@ -286,6 +286,11 @@
                     <artifactId>filecheck-maven-plugin</artifactId>
                     <version>0.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>com.github.veithen.alta</groupId>
+                    <artifactId>alta-maven-plugin</artifactId>
+                    <version>0.6.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>

From aa37259bc63f3f464e87bece74f54e91db2dd84a Mon Sep 17 00:00:00 2001
From: Andreas Veithen <veithen@apache.org>
Date: Mon, 7 Jan 2019 20:17:39 +0000
Subject: [PATCH 111/133] Use alta-maven-plugin instead of
 maven-dependency-plugin to supply WAR files to jetty-maven-plugin.

---
 axis-rt-transport-http-javanet/pom.xml | 18 ++++++++++++------
 samples/jaxm-sample/pom.xml            | 18 ++++++++++++------
 tests/interop-tests/pom.xml            | 18 ++++++++++++------
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/axis-rt-transport-http-javanet/pom.xml b/axis-rt-transport-http-javanet/pom.xml
index fc784c12c..c22538bbd 100644
--- a/axis-rt-transport-http-javanet/pom.xml
+++ b/axis-rt-transport-http-javanet/pom.xml
@@ -152,17 +152,23 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>com.github.veithen.alta</groupId>
+                <artifactId>alta-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>generate-properties</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <includeTypes>war</includeTypes>
-                            <stripVersion>true</stripVersion>
+                            <name>%artifactId%.location</name>
+                            <value>%file%</value>
+                            <dependencySet>
+                                <scope>test</scope>
+                                <includes>
+                                    <include>*:*:war:*</include>
+                                </includes>
+                            </dependencySet>
                         </configuration>
                     </execution>
                 </executions>
@@ -171,7 +177,7 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
-                    <war>${project.build.directory}/interop-mock.war</war>
+                    <war>${interop-mock.location}</war>
                     <stopKey>foo</stopKey>
                     <stopPort>${jetty.stopPort}</stopPort>
                     <connectors>
diff --git a/samples/jaxm-sample/pom.xml b/samples/jaxm-sample/pom.xml
index 525c7871e..1044245b5 100644
--- a/samples/jaxm-sample/pom.xml
+++ b/samples/jaxm-sample/pom.xml
@@ -85,17 +85,23 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>com.github.veithen.alta</groupId>
+                <artifactId>alta-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>generate-properties</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <includeTypes>war</includeTypes>
-                            <stripVersion>true</stripVersion>
+                            <name>%artifactId%.location</name>
+                            <value>%file%</value>
+                            <dependencySet>
+                                <scope>test</scope>
+                                <includes>
+                                    <include>*:*:war:*</include>
+                                </includes>
+                            </dependencySet>
                         </configuration>
                     </execution>
                 </executions>
@@ -104,7 +110,7 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
-                    <war>${project.build.directory}/interop-mock.war</war>
+                    <war>${interop-mock.location}</war>
                     <stopKey>foo</stopKey>
                     <stopPort>${jetty.stopPort}</stopPort>
                     <connectors>
diff --git a/tests/interop-tests/pom.xml b/tests/interop-tests/pom.xml
index 27b870599..f007484eb 100644
--- a/tests/interop-tests/pom.xml
+++ b/tests/interop-tests/pom.xml
@@ -151,17 +151,23 @@
                 </executions>
             </plugin>
             <plugin>
-                <artifactId>maven-dependency-plugin</artifactId>
+                <groupId>com.github.veithen.alta</groupId>
+                <artifactId>alta-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>pre-integration-test</phase>
                         <goals>
-                            <goal>copy-dependencies</goal>
+                            <goal>generate-properties</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}</outputDirectory>
-                            <includeTypes>war</includeTypes>
-                            <stripVersion>true</stripVersion>
+                            <name>%artifactId%.location</name>
+                            <value>%file%</value>
+                            <dependencySet>
+                                <scope>test</scope>
+                                <includes>
+                                    <include>*:*:war:*</include>
+                                </includes>
+                            </dependencySet>
                         </configuration>
                     </execution>
                 </executions>
@@ -170,7 +176,7 @@
                 <groupId>org.mortbay.jetty</groupId>
                 <artifactId>jetty-maven-plugin</artifactId>
                 <configuration>
-                    <war>${project.build.directory}/interop-mock.war</war>
+                    <war>${interop-mock.location}</war>
                     <stopKey>foo</stopKey>
                     <stopPort>${jetty.stopPort}</stopPort>
                     <connectors>

From 3fcac2ce6f5c6f6c68c42dc8d76564a3ef0575e9 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@apache.org>
Date: Sun, 24 Feb 2019 17:16:32 +0000
Subject: [PATCH 112/133] in XMLUtils set
 uconn.setInstanceFollowRedirects(false)

---
 axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java b/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
index 62bd88818..027935443 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/XMLUtils.java
@@ -819,7 +819,7 @@ private static InputSource getInputSourceFromURI(String uri,
         uconn.setDefaultUseCaches(false);
         uconn.setDoInput(true);
         uconn.setDoOutput(false);
-        uconn.setInstanceFollowRedirects(true);
+        uconn.setInstanceFollowRedirects(false);
         uconn.setUseCaches(false);
 
         // username/password info in the URL overrides passed in values

From 85994040c64b2cfb4ddd121cb297924ca1d65e1b Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@apache.org>
Date: Mon, 11 Mar 2019 00:27:44 +0000
Subject: [PATCH 113/133] remove sample jws files from the WAR distribution

---
 axis-war/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/axis-war/pom.xml b/axis-war/pom.xml
index 09aa21e46..2a2cd05a1 100644
--- a/axis-war/pom.xml
+++ b/axis-war/pom.xml
@@ -89,6 +89,7 @@
                 <artifactId>maven-war-plugin</artifactId>
                 <configuration>
                     <packagingExcludes>WEB-INF/lib/soapmonitor-applet-*.jar</packagingExcludes>
+                    <packagingExcludes>*.jws</packagingExcludes>
                     <overlays>
                         <overlay>
                             <groupId>${project.groupId}</groupId>

From af9c7ce8a5b0136b0f31d5571d69173f41bc4b7f Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@apache.org>
Date: Mon, 9 Sep 2019 17:44:23 +0000
Subject: [PATCH 114/133] Apply patch for AXIS-2905, remove animal sniffer API
 check plugin from the pom.xml because patch requires JDK classes marked with
 'Since 1.5' and internal the internal Apache build on Travis runs JDK 8

---
 .../components/net/JSSESocketFactory.java     | 309 +++++++++++++++++-
 pom.xml                                       |  22 --
 2 files changed, 303 insertions(+), 28 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
index dd3f991fb..abffcdd06 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/JSSESocketFactory.java
@@ -15,12 +15,6 @@
  */
 package org.apache.axis.components.net;
 
-import org.apache.axis.utils.Messages;
-import org.apache.axis.utils.XMLUtils;
-import org.apache.axis.utils.StringUtils;
-
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,7 +22,33 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
 import java.net.Socket;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateParsingException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
 import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import javax.naming.InvalidNameException;
+import javax.naming.NamingException;
+import javax.naming.directory.Attribute;
+import javax.naming.directory.Attributes;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.apache.axis.utils.Messages;
+import org.apache.axis.utils.StringUtils;
+import org.apache.axis.utils.XMLUtils;
 
 
 /**
@@ -41,6 +61,10 @@
  */
 public class JSSESocketFactory extends DefaultSocketFactory implements SecureSocketFactory {
 
+    // This is a a sorted list, if you insert new elements do it orderdered.
+    private final static String[] BAD_COUNTRY_2LDS =
+        {"ac", "co", "com", "ed", "edu", "go", "gouv", "gov", "info",
+            "lg", "ne", "net", "or", "org"};
     /** Field sslFactory           */
     protected SSLSocketFactory sslFactory = null;
 
@@ -187,6 +211,279 @@ public Socket create(
         if (log.isDebugEnabled()) {
             log.debug(Messages.getMessage("createdSSL00"));
         }
+        verifyHostName(host, (SSLSocket) sslSocket);
         return sslSocket;
     }
+    /**
+     * Verifies that the given hostname in certicifate is the hostname we are trying to connect to.
+     * This resolves CVE-2012-5784 and CVE-2014-3596
+     * @param host
+     * @param ssl
+     * @throws IOException
+     */
+    
+	private static void verifyHostName(String host, SSLSocket ssl)
+			throws IOException {
+		if (host == null) {
+			throw new IllegalArgumentException("host to verify was null");
+		}
+
+		SSLSession session = ssl.getSession();
+		if (session == null) {
+            // In our experience this only happens under IBM 1.4.x when
+            // spurious (unrelated) certificates show up in the server's chain.
+            // Hopefully this will unearth the real problem:
+			InputStream in = ssl.getInputStream();
+			in.available();
+            /*
+                 If you're looking at the 2 lines of code above because you're
+                 running into a problem, you probably have two options:
+
+                    #1.  Clean up the certificate chain that your server
+                         is presenting (e.g. edit "/etc/apache2/server.crt" or
+                         wherever it is your server's certificate chain is
+                         defined).
+
+                                             OR
+
+                    #2.   Upgrade to an IBM 1.5.x or greater JVM, or switch to a
+                          non-IBM JVM.
+              */
+
+            // If ssl.getInputStream().available() didn't cause an exception,
+            // maybe at least now the session is available?
+			session = ssl.getSession();
+			if (session == null) {
+                // If it's still null, probably a startHandshake() will
+                // unearth the real problem.
+				ssl.startHandshake();
+
+                // Okay, if we still haven't managed to cause an exception,
+                // might as well go for the NPE.  Or maybe we're okay now?
+				session = ssl.getSession();
+			}
+		}
+
+		Certificate[] certs = session.getPeerCertificates();
+		verifyHostName(host.trim().toLowerCase(Locale.US),  (X509Certificate) certs[0]);
+	}
+	/**
+	 * Extract the names from the certificate and tests host matches one of them
+	 * @param host
+	 * @param cert
+	 * @throws SSLException
+	 */
+
+	private static void verifyHostName(final String host, X509Certificate cert)
+			throws SSLException {
+        // I'm okay with being case-insensitive when comparing the host we used
+        // to establish the socket to the hostname in the certificate.
+        // Don't trim the CN, though.
+        
+		String[] cns = getCNs(cert);
+		String[] subjectAlts = getDNSSubjectAlts(cert);
+		verifyHostName(host, cns, subjectAlts);
+
+	}
+
+	/**
+	 * Extract all alternative names from a certificate.
+	 * @param cert
+	 * @return
+	 */
+	private static String[] getDNSSubjectAlts(X509Certificate cert) {
+		LinkedList subjectAltList = new LinkedList();
+		Collection c = null;
+		try {
+			c = cert.getSubjectAlternativeNames();
+		} catch (CertificateParsingException cpe) {
+			// Should probably log.debug() this?
+			cpe.printStackTrace();
+		}
+		if (c != null) {
+			Iterator it = c.iterator();
+			while (it.hasNext()) {
+				List list = (List) it.next();
+				int type = ((Integer) list.get(0)).intValue();
+				// If type is 2, then we've got a dNSName
+				if (type == 2) {
+					String s = (String) list.get(1);
+					subjectAltList.add(s);
+				}
+			}
+		}
+		if (!subjectAltList.isEmpty()) {
+			String[] subjectAlts = new String[subjectAltList.size()];
+			subjectAltList.toArray(subjectAlts);
+			return subjectAlts;
+		} else {
+			return new String[0];
+		}
+	        
+	}
+	/**
+	 * Verifies
+	 * @param host
+	 * @param cn
+	 * @param subjectAlts
+	 * @throws SSLException
+	 */
+
+	private static void verifyHostName(final String host, String[] cns, String[] subjectAlts)throws SSLException{
+		StringBuffer cnTested = new StringBuffer();
+
+		for (int i = 0; i < subjectAlts.length; i++){
+			String name = subjectAlts[i];
+			if (name != null) {
+				name = name.toLowerCase(Locale.US);
+				if (verifyHostName(host, name)){
+					return;
+				}
+				cnTested.append("/").append(name);
+			}				
+		}
+        for (int i = 0; i < cns.length; i++) {
+            String cn = cns[i];
+            if (cn != null) {
+                cn = cn.toLowerCase(Locale.US);
+                if (verifyHostName(host, cn)) {
+                    return;
+                }
+                cnTested.append("/").append(cn);
+            }
+        }
+		throw new SSLException("hostname in certificate didn't match: <"
+					+ host + "> != <" + cnTested + ">");
+	}		
+	
+	private static boolean verifyHostName(final String host, final String cn){
+		if (doWildCard(cn) && !isIPAddress(host)) {
+			return matchesWildCard(cn, host);
+		} 
+		return host.equalsIgnoreCase(cn);
+	}
+    private static boolean doWildCard(String cn) {
+		// Contains a wildcard
+		// wildcard in the first block
+    	// not an ipaddress (ip addres must explicitily be equal)
+    	// not using 2nd level common tld : ex: not for *.co.uk
+    	String parts[] = cn.split("\\.");
+    	return parts.length >= 3 &&
+    			parts[0].endsWith("*") &&
+    			acceptableCountryWildcard(cn) &&
+    			!isIPAddress(cn);
+    }
+
+	private static final Pattern IPV4_PATTERN =
+			Pattern.compile("^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}$");
+
+	private static final Pattern IPV6_STD_PATTERN = 
+			Pattern.compile("^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
+
+	private static final Pattern IPV6_HEX_COMPRESSED_PATTERN = 
+			Pattern.compile("^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
+
+
+	private static boolean isIPAddress(final String hostname) {
+		return hostname != null
+				&& (
+						IPV4_PATTERN.matcher(hostname).matches()
+						|| IPV6_STD_PATTERN.matcher(hostname).matches() 
+						|| IPV6_HEX_COMPRESSED_PATTERN.matcher(hostname).matches()
+		);
+
+	}
+
+	private static boolean acceptableCountryWildcard(final String cn) {
+		// The CN better have at least two dots if it wants wildcard action,
+		// but can't be [*.co.uk] or [*.co.jp] or [*.org.uk], etc...
+		// The [*.co.uk] problem is an interesting one. Should we just
+		// hope that CA's would never foolishly allow such a
+		// certificate to happen?
+    	
+		String[] parts = cn.split("\\.");
+		// Only checks for 3 levels, with country code of 2 letters.
+		if (parts.length > 3 || parts[parts.length - 1].length() != 2) {
+			return true;
+		}
+		String countryCode = parts[parts.length - 2];
+		return Arrays.binarySearch(BAD_COUNTRY_2LDS, countryCode) < 0;
+	}
+
+	private static boolean matchesWildCard(final String cn,
+			final String hostName) {
+		String parts[] = cn.split("\\.");
+		boolean match = false;
+		String firstpart = parts[0];
+		if (firstpart.length() > 1) {
+			// server∗
+			// e.g. server
+			String prefix =  firstpart.substring(0, firstpart.length() - 1);
+			// skipwildcard part from cn
+			String suffix = cn.substring(firstpart.length()); 
+			// skip wildcard part from host
+			String hostSuffix = hostName.substring(prefix.length());			
+			match = hostName.startsWith(prefix) && hostSuffix.endsWith(suffix);
+		} else {
+			match = hostName.endsWith(cn.substring(1));
+		}
+		if (match) {
+			// I f we ’ r e i n s t r i c t mode ,
+			// [ ∗.foo.com] is not allowed to match [a.b.foo.com]
+			match = countDots(hostName) == countDots(cn);
+		}
+		return match;
+	}
+
+	private static int countDots(final String data) {
+		int dots = 0;
+		for (int i = 0; i < data.length(); i++) {
+			if (data.charAt(i) == '.') {
+				dots += 1;
+			}
+		}
+		return dots;
+	}
+
+
+	private static String[] getCNs(X509Certificate cert) {
+          // Note:  toString() seems to do a better job than getName()
+          //
+          // For example, getName() gives me this:
+          // 1.2.840.113549.1.9.1=#16166a756c6975736461766965734063756362632e636f6d
+          //
+          // whereas toString() gives me this:
+          // EMAILADDRESS=juliusdavies@cucbc.com        
+		String subjectPrincipal = cert.getSubjectX500Principal().toString();
+		
+		return getCNs(subjectPrincipal);
+
+	}
+	private static String[] getCNs(String subjectPrincipal) {
+        if (subjectPrincipal == null) {
+            return null;
+        }
+        final List cns = new ArrayList();
+        try {
+            final LdapName subjectDN = new LdapName(subjectPrincipal);
+            final List rdns = subjectDN.getRdns();
+            for (int i = rdns.size() - 1; i >= 0; i--) {
+                final Rdn rds = (Rdn) rdns.get(i);
+                final Attributes attributes = rds.toAttributes();
+                final Attribute cn = attributes.get("cn");
+                if (cn != null) {
+                    try {
+                        final Object value = cn.get();
+                        if (value != null) {
+                            cns.add(value.toString());
+                        }
+                    }
+                    catch (NamingException ignore) {}
+                }
+            }
+        }
+        catch (InvalidNameException ignore) { }
+        return cns.isEmpty() ? null : (String[]) cns.toArray(new String[ cns.size() ]);
+	}
+
 }
diff --git a/pom.xml b/pom.xml
index 65724fd93..08849ebbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -372,28 +372,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>animal-sniffer-maven-plugin</artifactId>
-                <!-- Note: 1.9 contains a call to a Java 7 specific method (java.nio.CharBuffer.subSequence(II)Ljava/nio/CharBuffer;)
-                           that is triggered when an undefined reference is found. This breaks error reporting on Java 5/6. -->
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>check</goal>
-                        </goals>
-                        <configuration>
-                            <signature>
-                                <groupId>org.codehaus.mojo.signature</groupId>
-                                <artifactId>${signatureArtifactId}</artifactId>
-                                <version>${signatureVersion}</version>
-                            </signature>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <!-- This serves two purposes:
                       (1) we want to generate source JARs for all builds, not just release builds;

From fc446a148622375b775e80c53eb65f7440ce9fe5 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@apache.org>
Date: Mon, 9 Sep 2019 18:38:03 +0000
Subject: [PATCH 115/133] Apply patch for AXIS-2929, JDK 8,9,10,11 support

---
 .../axis/utils/bytecode/ClassReader.java      | 33 +++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java b/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
index 73c218dca..2cc0a1d99 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/utils/bytecode/ClassReader.java
@@ -59,6 +59,16 @@ public class ClassReader extends ByteArrayInputStream {
     private static final int CONSTANT_Double = 6;
     private static final int CONSTANT_NameAndType = 12;
     private static final int CONSTANT_Utf8 = 1;
+	
+    /*java 8 9 10 11 new tokens https://docs.oracle.com/javase/specs/jvms/se11/html/jvms-4.html*/
+    private static final int CONSTANT_MethodHandle = 15;
+    private static final int CONSTANT_MethodType = 16;
+    private static final int CONSTANT_Dynamic = 17;
+    private static final int CONSTANT_InvokeDynamic	= 18;
+    private static final int CONSTANT_Module = 19;
+    private static final int CONSTANT_Package = 20;
+    /*end of ava 8 9 10 11 new tokens*/	
+	
     /**
      * the constant pool.  constant pool indices in the class file
      * directly index into this array.  The value stored in this array
@@ -346,12 +356,31 @@ protected final void readCpool() throws IOException {
 
                     int len = readShort();
                     skipFully(len);
+                    break;
+				 case CONSTANT_MethodHandle:
+
+                    read(); // reference kind
+                    readShort(); // reference index
+                    break;
+
+                case CONSTANT_MethodType:
+
+                    readShort(); // descriptor index
+                    break;
+
+                case CONSTANT_Dynamic:
+                    readShort(); // bootstrap method attr index
+                    readShort(); // name and type index
+                    break;
+                case CONSTANT_InvokeDynamic:
+
+                    readShort(); // bootstrap method attr index
+                    readShort(); // name and type index
                     break;
 
                 default:
                     // corrupt class file
-                    throw new IllegalStateException(
-                            Messages.getMessage("unexpectedBytes00"));
+                    throw new IllegalStateException("Error looking for paramter names in bytecode: unexpected bytes in file, tag:"+c);
             }
         }
     }

From 026d7febb34f9f0d9ed34182ec88aadcfbb02725 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@apache.org>
Date: Sun, 8 Dec 2019 01:16:07 +0000
Subject: [PATCH 116/133] AXIS-2935 apply fix for IOException in multi-threaded
 end user code

---
 .../org/apache/axis/configuration/FileProvider.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java b/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
index 41dcf8297..7d4559491 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/configuration/FileProvider.java
@@ -152,19 +152,20 @@ public void setSearchClasspath(boolean searchClasspath) {
     public void configureEngine(AxisEngine engine)
         throws ConfigurationException {
         try {
-            if (getInputStream() == null) {
+            InputStream configFileInputStream = getInputStream();
+            if (configFileInputStream == null) {
                 try {
-                    setInputStream(new FileInputStream(configFile));
+                    configFileInputStream = new FileInputStream(configFile);
                 } catch (Exception e) {
                     // Ignore and continue
                 }
             }
-            if (getInputStream() == null && searchClasspath) {
+            if (configFileInputStream == null && searchClasspath) {
                 // Attempt to load the file from the classpath
-                setInputStream(ClassUtils.getResourceAsStream(filename, engine.getClass().getClassLoader()));
+                configFileInputStream = ClassUtils.getResourceAsStream(filename, engine.getClass().getClassLoader());
             }
 
-            if (getInputStream() == null) {
+            if (configFileInputStream == null) {
                 // Load the default configuration. This piece of code provides compatibility with Axis 1.4,
                 // which ends up loading org/apache/axis/(client|server)/(client|server)-config.wsdd if
                 // (1) filename is (client|server)-config.wsdd;
@@ -184,7 +185,7 @@ public void configureEngine(AxisEngine engine)
                 deployment = defaultConfig.getDeployment();
             } else {
                 WSDDDocument doc = new WSDDDocument(XMLUtils.
-                                                    newDocument(getInputStream()));
+                                                    newDocument(configFileInputStream));
                 deployment = doc.getDeployment();
     
                 deployment.configureEngine(engine);

From a596f2cd4672bfb0c7ce02762c55c6c3eb21e440 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@apache.org>
Date: Thu, 19 Mar 2020 14:46:35 +0000
Subject: [PATCH 117/133] AXIS-2295 Apply community suggested fixes to http
 proxy parameters caching mechanism

---
 .../DefaultHTTPTransportClientProperties.java | 40 +++++++------------
 .../net/TransportClientPropertiesFactory.java |  2 +-
 2 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
index 44784bd1b..6cd5519df 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
@@ -37,11 +37,9 @@ public class DefaultHTTPTransportClientProperties
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyHost()
      */
     public String getProxyHost() {
-        if (proxyHost == null) {
-            proxyHost = AxisProperties.getProperty("http.proxyHost");
-            if (proxyHost == null)
-                proxyHost = emptyString;
-        }
+        proxyHost = AxisProperties.getProperty("http.proxyHost");
+        if (proxyHost == null)
+            proxyHost = emptyString;
         return proxyHost;
     }
 
@@ -49,11 +47,9 @@ public String getProxyHost() {
      * @see org.apache.axis.components.net.TransportClientProperties#getNonProxyHosts()
      */
     public String getNonProxyHosts() {
-        if (nonProxyHosts == null) {
-            nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
-            if (nonProxyHosts == null)
-                nonProxyHosts = emptyString;
-        }
+        nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
+        if (nonProxyHosts == null)
+            nonProxyHosts = emptyString;
         return nonProxyHosts;
     }
 
@@ -61,11 +57,9 @@ public String getNonProxyHosts() {
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
      */
     public String getProxyPort() {
-        if (proxyPort == null) {
-            proxyPort = AxisProperties.getProperty("http.proxyPort");
-            if (proxyPort == null)
-                proxyPort = emptyString;
-        }
+        proxyPort = AxisProperties.getProperty("http.proxyPort");
+        if (proxyPort == null)
+            proxyPort = emptyString;
         return proxyPort;
     }
 
@@ -73,11 +67,9 @@ public String getProxyPort() {
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyUser()
      */
     public String getProxyUser() {
-        if (proxyUser == null) {
-            proxyUser = AxisProperties.getProperty("http.proxyUser");
-            if (proxyUser == null)
-                proxyUser = emptyString;
-        }
+        proxyUser = AxisProperties.getProperty("http.proxyUser");
+        if (proxyUser == null)
+            proxyUser = emptyString;
         return proxyUser;
     }
 
@@ -85,11 +77,9 @@ public String getProxyUser() {
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
      */
     public String getProxyPassword() {
-        if (proxyPassword == null) {
-            proxyPassword = AxisProperties.getProperty("http.proxyPassword");
-            if (proxyPassword == null)
-                proxyPassword = emptyString;
-        }
+        proxyPassword = AxisProperties.getProperty("http.proxyPassword");
+        if (proxyPassword == null)
+            proxyPassword = emptyString;
         return proxyPassword;
     }
 }
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
index 7a8ad637d..7aed0ba47 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
@@ -27,7 +27,7 @@
  */
 public class TransportClientPropertiesFactory {
     protected static Log log =
-            LogFactory.getLog(SocketFactoryFactory.class.getName());
+            LogFactory.getLog(TransportClientPropertiesFactory.class.getName());
     
     private static HashMap cache = new HashMap();
     private static HashMap defaults = new HashMap();

From 1ab0004dfd1d7ef3aacf6042e4a1f870c60051e8 Mon Sep 17 00:00:00 2001
From: robert lazarski <robertlazarski@apache.org>
Date: Mon, 1 Jun 2020 05:40:30 -1000
Subject: [PATCH 118/133] github testing, add space to README.txt

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 7e3245af7..8e4d11f56 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
              Axis (Apache eXtensible Interaction System)
-             -------------------------------------------
+             ------------------------------------------- 
 
 Welcome to Axis!  You'll find documentation in the docs/ directory.
 

From 2e2682ada20c04654b19a8a9f494979259343946 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sat, 19 Dec 2020 14:24:58 +0000
Subject: [PATCH 119/133] Update emf-maven-plugin

---
 axis-model/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index 370d2fb51..373fcb7a6 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -76,9 +76,9 @@
         </extensions>
         <plugins>
             <plugin>
-                <groupId>com.github.veithen.cosmos</groupId>
+                <groupId>com.github.veithen.maven</groupId>
                 <artifactId>emf-maven-plugin</artifactId>
-                <version>0.1-SNAPSHOT</version>
+                <version>0.1.0-SNAPSHOT</version>
                 <executions>
                     <execution>
                         <goals>

From dadc701203ddbbb91761110f139c8a17f34017c1 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sat, 19 Dec 2020 21:51:00 +0000
Subject: [PATCH 120/133] Don't use a parent POM for plugin integration tests

For integration test projects executed using maven-invoker-plugin, using
the same parent POM as the main project results in unintended plugin
executions during test runs.
---
 .../src/it/writeStubToTestSources/pom.xml                    | 5 -----
 maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml             | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
index eee18bb6c..df7d53813 100644
--- a/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
+++ b/maven/wsdl2java-maven-plugin/src/it/writeStubToTestSources/pom.xml
@@ -19,11 +19,6 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>axis-project</artifactId>
-        <version>@project.version@</version>
-    </parent>
     <groupId>test</groupId>
     <artifactId>writeStubToTestSources</artifactId>
     <version>1</version>
diff --git a/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml b/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
index 6630ce5c0..ce36d3211 100644
--- a/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
+++ b/maven/wsdl2java-maven-plugin/src/it/wsrf/pom.xml
@@ -19,11 +19,6 @@
   -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>@project.groupId@</groupId>
-        <artifactId>axis-project</artifactId>
-        <version>@project.version@</version>
-    </parent>
     <groupId>test</groupId>
     <artifactId>wsrf</artifactId>
     <version>1</version>

From e91f3e3682e00e36df6a7f67a1bbf4f1048e8bff Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 20 Dec 2020 11:22:03 +0000
Subject: [PATCH 121/133] Make test execution more robust

- Execute tests hermetically where possible. This shields the tests from
weird interactions with the local network configuration.
- Run the integration tests in a fixed time zone. For some reason they
fail in Europe/London.
---
 integration/pom.xml              |  4 ++++
 pom.xml                          | 15 +++++++++++++++
 samples/transport-sample/pom.xml |  8 ++++++++
 3 files changed, 27 insertions(+)

diff --git a/integration/pom.xml b/integration/pom.xml
index 07d55cadb..7d7ce7e99 100644
--- a/integration/pom.xml
+++ b/integration/pom.xml
@@ -1543,6 +1543,10 @@
                                 <java.awt.headless>true</java.awt.headless>
                                 <test.functional.ServicePort>${test.functional.ServicePort}</test.functional.ServicePort>
                             </systemPropertyVariables>
+                            <environmentVariables>
+                                <!-- TODO: some tests fail in specific time zones (e.g. Europe/London) -->
+                                <TZ>PST8PDT</TZ>
+                            </environmentVariables>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/pom.xml b/pom.xml
index 08849ebbc..8b1e9df86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -422,6 +422,21 @@
                 <artifactId>maven-scm-publish-plugin</artifactId>
                 <version>1.0-beta-2</version>
             </plugin>
+            <plugin>
+                <groupId>com.github.veithen.maven</groupId>
+                <artifactId>hermetic-maven-plugin</artifactId>
+                <version>0.5.0</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate-policy</goal>
+                        </goals>
+                        <configuration>
+                            <allowCrossProjectAccess>true</allowCrossProjectAccess>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <profiles>
diff --git a/samples/transport-sample/pom.xml b/samples/transport-sample/pom.xml
index 2f9160719..acb4de809 100644
--- a/samples/transport-sample/pom.xml
+++ b/samples/transport-sample/pom.xml
@@ -52,6 +52,14 @@
     </dependencies>
     <build>
         <plugins>
+            <plugin>
+                <groupId>com.github.veithen.maven</groupId>
+                <artifactId>hermetic-maven-plugin</artifactId>
+                <configuration>
+                    <!-- TODO: the sample transport writes files to the project root directory -->
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <executions>

From 1227217b7eaccd0840dcc958c5dd364e21a45d4d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 20 Dec 2020 12:00:18 +0000
Subject: [PATCH 122/133] Make the wsdl2java-maven-plugin tests succeed with an
 empty local repo

---
 maven/wsdl2java-maven-plugin/pom.xml          | 16 ++++--
 .../src/it/settings.xml                       | 53 -------------------
 2 files changed, 13 insertions(+), 56 deletions(-)
 delete mode 100644 maven/wsdl2java-maven-plugin/src/it/settings.xml

diff --git a/maven/wsdl2java-maven-plugin/pom.xml b/maven/wsdl2java-maven-plugin/pom.xml
index b5acf2495..1e463f3be 100644
--- a/maven/wsdl2java-maven-plugin/pom.xml
+++ b/maven/wsdl2java-maven-plugin/pom.xml
@@ -82,13 +82,25 @@
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>com.github.veithen.maven</groupId>
+                        <artifactId>resolver-proxy-maven-plugin</artifactId>
+                        <version>0.2.0</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>start</goal>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <artifactId>maven-invoker-plugin</artifactId>
                         <executions>
                             <execution>
                                 <id>integration-test</id>
                                 <goals>
-                                    <goal>install</goal>
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
@@ -100,8 +112,6 @@
                                     </pomIncludes>
                                     <preBuildHookScript>setup</preBuildHookScript>
                                     <postBuildHookScript>verify</postBuildHookScript>
-                                    <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
-                                    <settingsFile>src/it/settings.xml</settingsFile>
                                     <goals>
                                         <goal>clean</goal>
                                         <goal>install</goal>
diff --git a/maven/wsdl2java-maven-plugin/src/it/settings.xml b/maven/wsdl2java-maven-plugin/src/it/settings.xml
deleted file mode 100644
index 8737d31ab..000000000
--- a/maven/wsdl2java-maven-plugin/src/it/settings.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<!--
-  ~ 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.
-  -->
-<settings>
-  <profiles>
-    <profile>
-      <id>it-repo</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <repositories>
-        <repository>
-          <id>local.central</id>
-          <url>@localRepositoryUrl@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </repository>
-      </repositories>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>local.central</id>
-          <url>@localRepositoryUrl@</url>
-          <releases>
-            <enabled>true</enabled>
-          </releases>
-          <snapshots>
-            <enabled>true</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
-  </profiles>
-</settings>

From 1cd08d453ebb17ab6fc0fde05cecbdf24c296bc0 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 20 Dec 2020 12:09:00 +0000
Subject: [PATCH 123/133] Revert "AXIS-2295 Apply community suggested fixes to
 http proxy parameters caching mechanism"

That change causes a test failure in test.wsdl.multithread.MultithreadTestCase.

This reverts commit a596f2cd4672bfb0c7ce02762c55c6c3eb21e440.
---
 .../DefaultHTTPTransportClientProperties.java | 40 ++++++++++++-------
 .../net/TransportClientPropertiesFactory.java |  2 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
index 6cd5519df..44784bd1b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/DefaultHTTPTransportClientProperties.java
@@ -37,9 +37,11 @@ public class DefaultHTTPTransportClientProperties
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyHost()
      */
     public String getProxyHost() {
-        proxyHost = AxisProperties.getProperty("http.proxyHost");
-        if (proxyHost == null)
-            proxyHost = emptyString;
+        if (proxyHost == null) {
+            proxyHost = AxisProperties.getProperty("http.proxyHost");
+            if (proxyHost == null)
+                proxyHost = emptyString;
+        }
         return proxyHost;
     }
 
@@ -47,9 +49,11 @@ public String getProxyHost() {
      * @see org.apache.axis.components.net.TransportClientProperties#getNonProxyHosts()
      */
     public String getNonProxyHosts() {
-        nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
-        if (nonProxyHosts == null)
-            nonProxyHosts = emptyString;
+        if (nonProxyHosts == null) {
+            nonProxyHosts = AxisProperties.getProperty("http.nonProxyHosts");
+            if (nonProxyHosts == null)
+                nonProxyHosts = emptyString;
+        }
         return nonProxyHosts;
     }
 
@@ -57,9 +61,11 @@ public String getNonProxyHosts() {
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyPort()
      */
     public String getProxyPort() {
-        proxyPort = AxisProperties.getProperty("http.proxyPort");
-        if (proxyPort == null)
-            proxyPort = emptyString;
+        if (proxyPort == null) {
+            proxyPort = AxisProperties.getProperty("http.proxyPort");
+            if (proxyPort == null)
+                proxyPort = emptyString;
+        }
         return proxyPort;
     }
 
@@ -67,9 +73,11 @@ public String getProxyPort() {
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyUser()
      */
     public String getProxyUser() {
-        proxyUser = AxisProperties.getProperty("http.proxyUser");
-        if (proxyUser == null)
-            proxyUser = emptyString;
+        if (proxyUser == null) {
+            proxyUser = AxisProperties.getProperty("http.proxyUser");
+            if (proxyUser == null)
+                proxyUser = emptyString;
+        }
         return proxyUser;
     }
 
@@ -77,9 +85,11 @@ public String getProxyUser() {
      * @see org.apache.axis.components.net.TransportClientProperties#getProxyPassword()
      */
     public String getProxyPassword() {
-        proxyPassword = AxisProperties.getProperty("http.proxyPassword");
-        if (proxyPassword == null)
-            proxyPassword = emptyString;
+        if (proxyPassword == null) {
+            proxyPassword = AxisProperties.getProperty("http.proxyPassword");
+            if (proxyPassword == null)
+                proxyPassword = emptyString;
+        }
         return proxyPassword;
     }
 }
diff --git a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
index 7aed0ba47..7a8ad637d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/components/net/TransportClientPropertiesFactory.java
@@ -27,7 +27,7 @@
  */
 public class TransportClientPropertiesFactory {
     protected static Log log =
-            LogFactory.getLog(TransportClientPropertiesFactory.class.getName());
+            LogFactory.getLog(SocketFactoryFactory.class.getName());
     
     private static HashMap cache = new HashMap();
     private static HashMap defaults = new HashMap();

From 9811a93521302be583d714ce3f9cf8975d4fd4ab Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 20 Dec 2020 12:43:28 +0000
Subject: [PATCH 124/133] Prevent spring-compat-tests from writing to the
 source directory

---
 tests/spring-compat-tests/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/spring-compat-tests/pom.xml b/tests/spring-compat-tests/pom.xml
index 67906b81b..3fee5e4b0 100644
--- a/tests/spring-compat-tests/pom.xml
+++ b/tests/spring-compat-tests/pom.xml
@@ -127,6 +127,7 @@
                                 <resourceBase>src/main/webapp</resourceBase>
                                 <resourceBase>${project.build.directory}/webapp</resourceBase>
                             </resourceBases>
+                            <argLine>${argLine} -Daxis.attachments.Directory=${project.build.directory}/tmp/attachments</argLine>
                         </configuration>
                     </execution>
                     <execution>

From 75e8c723c489761388e48c6df6f00d6061928cea Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Mon, 21 Dec 2020 17:34:26 +0000
Subject: [PATCH 125/133] Update emf-maven-plugin

---
 axis-model/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/axis-model/pom.xml b/axis-model/pom.xml
index 373fcb7a6..71cff40e4 100644
--- a/axis-model/pom.xml
+++ b/axis-model/pom.xml
@@ -78,7 +78,7 @@
             <plugin>
                 <groupId>com.github.veithen.maven</groupId>
                 <artifactId>emf-maven-plugin</artifactId>
-                <version>0.1.0-SNAPSHOT</version>
+                <version>0.1.0</version>
                 <executions>
                     <execution>
                         <goals>

From 41f8ad9833cde461710cc566ff6bc967dffe40a0 Mon Sep 17 00:00:00 2001
From: Anu Shibin Joseph Raj <ajosephr@opentext.com>
Date: Thu, 27 Jul 2023 15:05:42 +0530
Subject: [PATCH 126/133] Fix for java.nio.charset.IllegalCharsetNameException:
 utf-8"

---
 .../src/main/java/org/apache/axis/attachments/MimeUtils.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java
index 3028d6efe..e7061537d 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/MimeUtils.java
@@ -249,7 +249,7 @@ public static javax.mail.internet.MimeMultipart createMP(
 
             if(sendType == Attachments.SEND_TYPE_MTOM) {
                 multipart = new javax.mail.internet.MimeMultipart(
-                        "related;type=\"application/xop+xml\"; start=\"<" + rootCID + ">\"; start-info=\"text/xml; charset=utf-8\"");
+                        "related;type=\"application/xop+xml\"; start=\"<" + rootCID + ">\"; start-info=\"text/xml\"; charset=\"utf-8\"");
             } else {
                 multipart = new javax.mail.internet.MimeMultipart(
                         "related; type=\"text/xml\"; start=\"<" + rootCID + ">\"");

From 7e66753427466590d6def0125e448d2791723210 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <robertlazarski@gmail.com>
Date: Tue, 1 Aug 2023 15:40:18 -0400
Subject: [PATCH 127/133] Filter out unsupported protocols in the client class
 ServiceFactory

---
 .../src/main/java/org/apache/axis/client/ServiceFactory.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
index 33054a557..73e89ee1b 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
@@ -106,6 +106,10 @@ public static Service getService(Map environment)
         
         if (context != null) {
             String name = (String)environment.get("jndiName");
+
+	    if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1) || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1)  {
+	        return null;
+            }
             if (name == null) {
                 name = "axisServiceName";
             }
@@ -120,6 +124,7 @@ public static Service getService(Map environment)
                     context.bind(name, service);
                 } catch (NamingException e1) {
                     // !!! Couldn't do it, what should we do here?
+	            return null;
                 }
             }
         } else {

From 2d3e769a64128f407ba201240f9d83669e587973 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 13 Aug 2023 20:09:55 +0000
Subject: [PATCH 128/133] Make ImageDataSource use PNG

This makes the code compatible with OpenJDK 8 (while currently it will
only work on Oracle JDK 8). PNG is probably the better choice anyway
because it is lossless.
---
 .travis.yml                                                     | 1 -
 .../main/java/org/apache/axis/attachments/ImageDataSource.java  | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ac50702f9..741531b8c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,5 @@
 dist: trusty
 language: java
-# There are test cases that use ImageIO with JPEG and that only work on Oracle JDK.
 jdk:
   - oraclejdk8
 install: true
diff --git a/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java b/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java
index 0fe4fe621..c07958e82 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/attachments/ImageDataSource.java
@@ -37,7 +37,7 @@ public class ImageDataSource implements DataSource {
     protected static Log log =
         LogFactory.getLog(ImageDataSource.class.getName());
     
-    public static final String CONTENT_TYPE = "image/jpeg";
+    public static final String CONTENT_TYPE = "image/png";
 
     private final String name;
     private final String contentType;

From 994b7b17fdbf00d5c9845671be0f1978b61f5d7b Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 13 Aug 2023 20:11:45 +0000
Subject: [PATCH 129/133] Add Codespaces configuration

---
 .devcontainer/devcontainer.json | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 000000000..9af12cbdd
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,13 @@
+{
+	"image": "mcr.microsoft.com/devcontainers/base:ubuntu-22.04",
+	"features": {
+		"ghcr.io/devcontainers/features/java:1": {
+			"version": "8",
+			"installMaven": "true",
+			"mavenVersion": "3.9.1"
+		}
+	},
+	"hostRequirements": {
+		"memory": "8gb"
+	}
+}

From dbee40de9651ee4f0db8e67c151d626e40984bc5 Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 13 Aug 2023 20:26:46 +0000
Subject: [PATCH 130/133] Migrate to Github Actions

---
 .github/workflows/ci.yml | 53 ++++++++++++++++++++++++++++++++++++++++
 .travis-settings.xml     | 13 ----------
 .travis.yml              | 17 -------------
 3 files changed, 53 insertions(+), 30 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis-settings.xml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..a751db802
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,53 @@
+# 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.
+name: Continuous Integration
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+env:
+  MAVEN_OPTS: -Dmaven.wagon.httpconnectionManager.ttlSeconds=25 -Dmaven.wagon.http.retryHandler.count=3
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8 ]
+    name: "Java ${{ matrix.java }}"
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+    - name: Cache Maven Repository
+      uses: actions/cache@v3
+      with:
+        path: ~/.m2/repository
+        key: maven-java-${{ matrix.java }}-${{ hashFiles('**/pom.xml') }}
+        restore-keys: |
+          maven-java-${{ matrix.java }}-
+          maven-
+    - name: Set up Java
+      uses: actions/setup-java@v3
+      with:
+        distribution: 'zulu'
+        java-version: ${{ matrix.java }}
+    - name: Build
+      run: mvn -B -e -Papache-release -Dgpg.skip=true install site
+    - name: Remove Snapshots
+      run: find ~/.m2/repository -name '*-SNAPSHOT' -a -type d -print0 | xargs -0 rm -rf
diff --git a/.travis-settings.xml b/.travis-settings.xml
deleted file mode 100644
index ab1e4a6d6..000000000
--- a/.travis-settings.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
-                        http://maven.apache.org/xsd/settings-1.0.0.xsd">
-    <servers>
-        <server>
-            <id>apache.snapshots.https</id>
-            <username>${env.REPO_USERNAME}</username>
-            <password>${env.REPO_PASSWORD}</password>
-        </server>
-    </servers>
-</settings>
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 741531b8c..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-dist: trusty
-language: java
-jdk:
-  - oraclejdk8
-install: true
-script: '[ "$TRAVIS_REPO_SLUG" == apache/axis1-java ] && [ "$TRAVIS_BRANCH" == trunk ] && [ "$TRAVIS_PULL_REQUEST" == false ] && goal=deploy || goal=install ; mvn -B -s .travis-settings.xml -Papache-release -Dgpg.skip=true $goal site'
-env:
-  global:
-    - secure: "rd5q/f6mA88heUgXm88Aae8q6PTwKp9rEJtQZihJRPWgnguJp/yPNXCyp0sdtL6ucPW8AXMlcuEUqNv12Y1orxG9zyDkGQ3IWazGB6XQ+feOG1MqXpnUz2DMv0KCqCTbxGyI7Quk5E/ghjhGdfxLETazQJaq4w5ARIxb2r0dyts="
-    - secure: "QVsD6fyEdJDBMc8Czap41kkmYNMRQndDL+ZYnvZvrl9x7SPpiUScIW7H1PM3C9Gsd1OZFecVJz1pqplKa0d1/WEkeqlyNFrKNS+jCPbn1ys05Pdq5/85aPfJC9XJu5MOjKn2wjW0Xe2xNpK5V/r13T1qnVAjUJYMfJzM1rogKAM="
-cache:
-  directories:
-    - $HOME/.m2
-notifications:
-  email:
-    # java-dev@axis.apache.org doesn't work here because it's not an address registered on GitHub.
-    - veithen@apache.org

From 22c25b730f8fc10780117167fd11d1153126b04d Mon Sep 17 00:00:00 2001
From: Andreas Veithen <andreas.veithen@gmail.com>
Date: Sun, 13 Aug 2023 20:46:19 +0000
Subject: [PATCH 131/133] Remove unnecessary dependency

---
 axis-rt-core/pom.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/axis-rt-core/pom.xml b/axis-rt-core/pom.xml
index 759aeff49..254cdf0b0 100644
--- a/axis-rt-core/pom.xml
+++ b/axis-rt-core/pom.xml
@@ -80,12 +80,6 @@
             <artifactId>xmlunit</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>xalan</groupId>
-            <artifactId>xalan</artifactId>
-            <version>2.6.0</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>oro</groupId>
             <artifactId>oro</artifactId>

From 685c309febc64aa393b2d64a05f90e7eb9f73e06 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <rlazarski@alphatheory.com>
Date: Sun, 17 Dec 2023 16:00:56 -1000
Subject: [PATCH 132/133] Filter out more unsupported protocols in the client
 class ServiceFactory

---
 .../main/java/org/apache/axis/client/ServiceFactory.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
index 73e89ee1b..85b89a9c5 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
@@ -17,9 +17,11 @@
 package org.apache.axis.client;
 
 import org.apache.axis.EngineConfiguration;
+import org.apache.axis.components.logger.LogFactory;
 import org.apache.axis.configuration.EngineConfigurationFactoryFinder;
 import org.apache.axis.utils.ClassUtils;
 import org.apache.axis.utils.Messages;
+import org.apache.commons.logging.Log;
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -47,6 +49,9 @@
 public class ServiceFactory extends javax.xml.rpc.ServiceFactory
         implements ObjectFactory
 {
+    protected static Log log =
+        LogFactory.getLog(ServiceFactory.class.getName());
+
     // Constants for RefAddrs in the Reference.
     public static final String SERVICE_CLASSNAME  = "service classname";
     public static final String WSDL_LOCATION      = "WSDL location";
@@ -107,7 +112,8 @@ public static Service getService(Map environment)
         if (context != null) {
             String name = (String)environment.get("jndiName");
 
-	    if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1) || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1)  {
+	    if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1) || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1 || name.toUpperCase().indexOf("IIOP")!=-1 || name.toUpperCase().indexOf("CORBANAME")!=-1) {
+                log.warn("returning null, jndiName received by ServiceFactory.getService() is not supported by this method: " + name);
 	        return null;
             }
             if (name == null) {

From 2c0d66018480e0cb73d5005c99c68ef55558d2a3 Mon Sep 17 00:00:00 2001
From: Robert Lazarski <alphatheory-rlazarski@github.com>
Date: Sun, 9 Feb 2025 13:54:28 -1000
Subject: [PATCH 133/133] Fix closing parenthesis in the latest fix in the
 client class ServiceFactory

---
 .../src/main/java/org/apache/axis/client/ServiceFactory.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
index 85b89a9c5..57d7694d8 100644
--- a/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
+++ b/axis-rt-core/src/main/java/org/apache/axis/client/ServiceFactory.java
@@ -112,7 +112,7 @@ public static Service getService(Map environment)
         if (context != null) {
             String name = (String)environment.get("jndiName");
 
-	    if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1) || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1 || name.toUpperCase().indexOf("IIOP")!=-1 || name.toUpperCase().indexOf("CORBANAME")!=-1) {
+	    if(name!=null && (name.toUpperCase().indexOf("LDAP")!=-1 || name.toUpperCase().indexOf("RMI")!=-1 || name.toUpperCase().indexOf("JMS")!=-1 || name.toUpperCase().indexOf("JMX")!=-1 || name.toUpperCase().indexOf("JRMP")!=-1 || name.toUpperCase().indexOf("JAVA")!=-1 || name.toUpperCase().indexOf("DNS")!=-1 || name.toUpperCase().indexOf("IIOP")!=-1 || name.toUpperCase().indexOf("CORBANAME")!=-1)) {
                 log.warn("returning null, jndiName received by ServiceFactory.getService() is not supported by this method: " + name);
 	        return null;
             }