Modified: 
axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/pom.xml?rev=1818518&r1=1818517&r2=1818518&view=diff
==============================================================================
--- axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/pom.xml 
(original)
+++ axis/axis2/java/core/branches/AXIS2-4091/modules/jaxws-integration/pom.xml 
Sun Dec 17 22:34:08 2017
@@ -23,9 +23,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.axis2</groupId>
-        <artifactId>axis2-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
+        <artifactId>axis2</artifactId>
+        <version>1.8.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>axis2-jaxws-integration</artifactId>
     <name>Apache Axis2 - JAXWS Integration Tests</name>
@@ -87,6 +87,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>xml-truth</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
             <scope>test</scope>
@@ -134,34 +139,27 @@
         </testResources>
         <plugins>
             <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>
+                            <artifacts>
+                                <artifact>
                                     <groupId>javax.xml.bind</groupId>
                                     <artifactId>jaxb-api</artifactId>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
-                                    
<groupId>org.apache.geronimo.specs</groupId>
-                                    
<artifactId>geronimo-saaj_1.3_spec</artifactId>
-                                    <type>jar</type>
-                                </artifactItem>
-                                <artifactItem>
+                                </artifact>
+                                <artifact>
                                     
<groupId>org.apache.geronimo.specs</groupId>
                                     
<artifactId>geronimo-jaxws_2.2_spec</artifactId>
-                                    <type>jar</type>
-                                </artifactItem>
-                            </artifactItems>
-                            <overWrite>true</overWrite>
-                            
<outputDirectory>${project.build.directory}/endorsed</outputDirectory>
-                            <stripVersion>true</stripVersion>
+                                </artifact>
+                            </artifacts>
+                            <name>jaxws.bootclasspath</name>
+                            <value>%file%</value>
+                            <separator>${path.separator}</separator>
                         </configuration>
                     </execution>
                 </executions>
@@ -171,11 +169,8 @@
                 <inherited>true</inherited>
                 <configuration>
                     <compilerArgument>
-                        
-Xbootclasspath/p:${basedir}/../jaxws-api/target/classes${path.separator}${basedir}/../jws-api/target/classes
+                        -Xbootclasspath/p:${jaxws.bootclasspath}
                     </compilerArgument>
-                    <compilerVersion>1.5</compilerVersion>
-                    <source>1.5</source>
-                    <target>1.5</target>
                 </configuration>
             </plugin>
             <plugin>
@@ -184,281 +179,567 @@
                 <version>${project.version}</version>
                 <executions>
                     <execution>
-                        <phase>generate-test-sources</phase>
                         <goals>
-                            <goal>wsdl2code</goal>
+                            <goal>generate-test-sources</goal>
                         </goals>
                         <configuration>
                             <packageName>server</packageName>
                             <wsdlFile>test-resources/wsdl/echo.wsdl</wsdlFile>
                             <databindingName>adb</databindingName>
                             <generateServerSide>true</generateServerSide>
-                            <namespaceURIs>
-                                <namespaceURI>
+                            <namespaceMappings>
+                                <namespaceMapping>
                                     <uri>http://test</uri>
                                     <packageName>server</packageName>
-                                </namespaceURI>
-                            </namespaceURIs>
+                                </namespaceMapping>
+                            </namespaceMappings>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-repo-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>gen-ts</id>
-                        <phase>generate-test-sources</phase>
+                        <id>build-repo</id>
+                        <goals>
+                            <goal>create-test-repository</goal>
+                        </goals>
                         <configuration>
-                            <tasks unless="maven.test.skip">
-                                <!-- Theres got to be a better way to do this 
-->
-                                <property name="schema.source.dir" 
value="test-resources/xsd" />
-                                <property name="wsdl.source.dir" 
value="test-resources/wsdl" />
-                                <property name="schema.output.base.dir" 
value="target/schema" />
-                                <property name="schema.generated.src.dir" 
value="${schema.output.base.dir}/src" />
-                                <property name="schema.generated.classes.dir" 
value="${schema.output.base.dir}/classes" />
-                                <!-- make the dirs -->
-                                <mkdir dir="${schema.output.base.dir}" />
-                                <mkdir dir="${schema.generated.src.dir}" />
-                                <mkdir dir="${schema.generated.classes.dir}" />
-                                <!-- Run JAXB schema compiler with designated 
schemas -->
-                                <echo>Generating JAX-B classes from XSDs</echo>
-                                <echo>Generating java from soap 11</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet ${schema.source.dir}/soap11.xsd" />
-                                </java>
-                                <echo>Generating java from echo.xsd</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet ${schema.source.dir}/echo.xsd" />
-                                </java>
-                                <echo>Generating java from stock1.xsd</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet ${schema.source.dir}/stock1.xsd" />
-                                </java>
-                                <echo>Generating java from stock2.xsd</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet ${schema.source.dir}/stock2.xsd" />
-                                </java>
-                                <echo>Generating java from 
samplemtom.xsd</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet ${schema.source.dir}/samplemtom.xsd" />
-                                </java>
-                                <echo>Generating java from 
greeterTypes.xsd</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet ${schema.source.dir}/greeterTypes.xsd" />
-                                </java>
-                                <echo>Generating java from 
ProxyDocLitWrapped.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -p org.test.proxy.doclitwrapped -quiet -wsdl 
${wsdl.source.dir}/ProxyDocLitWrapped.wsdl" />
-                                </java>
-                                <echo>Generating java from 
AddNumbers.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/AddNumbers.wsdl" />
-                                </java>
-                                <echo>Generating java from 
ProxyDocLitnonWrapped.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/ProxyDocLitnonWrapped.wsdl" />
-                                </java>
-                                <echo>Generating java from 
samplemtomjpeg.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/samplemtomjpeg.wsdl" />
-                                </java>
-                                <echo>Generating java from RPCLit.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-p org.test.proxy.rpclit -quiet -wsdl ${wsdl.source.dir}/RPCLit.wsdl" />
-                                </java>
-                                <echo>Generating java from 
RPCLitSWA.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-p org.test.proxy.rpclitswa -quiet -wsdl ${wsdl.source.dir}/RPCLitSWA.wsdl" />
-                                </java>
-                                <echo>Generating java from 
gorilla_dlw.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/gorilla_dlw.wsdl" />
-                                </java>
-                                <echo>Generating java from 
SOAP12Echo.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/SOAP12Echo.wsdl" />
-                                </java>
-                                <echo>Generating java from 
AddNumbersHandler.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/AddNumbersHandler.wsdl" />
-                                </java>
-                                <echo>Generating java from 
HeadersHandler.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/HeadersHandler.wsdl" />
-                                </java>
-                                <echo>Generating java from 
async_doclitwr.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/async_doclitwr.wsdl" />
-                                </java>
-                                <echo>Generating java from 
async_doclitwr2.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/async_doclitwr2.wsdl" />
-                                </java>
-                                <echo>Generating java from 
FaultyWebService.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/FaultyWebService.wsdl" />
-                                </java>
-                                <echo>Generating java from 
FaultsService.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/FaultsService.wsdl" />
-                                </java>
-                                <echo>Generating java from jaxbsource</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -p org.test.dispatch.jaxbsource ${schema.source.dir}/jaxbsource.xsd" />
-                                </java>
-                                <echo>Generating java from doclit_nonwrap.wsdl 
for javabean endpoint
-                                    support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/doclit_nonwrap.wsdl" />
-                                </java>
-                                <echo>Generating java from doclitwrap.wsdl for 
javabean endpoint
-                                    support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/doclitwrap.wsdl" />
-                                </java>
-                                <echo>Generating java from doclitbare.wsdl for 
javabean endpoint
-                                    support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/doclitbare.wsdl" />
-                                </java>
-                                
-                                <echo>Generating java from EchoMessage.wsdl 
for javabean endpoint
-                                    support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/EchoMessage.wsdl" />
-                                </java>
-                                
-                                <echo>Generating java from 
resourceinjection.wsdl for javabean
-                                    endpoint Resource Injection support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/resourceinjection.wsdl" />
-                                </java>
-                                <echo>Generating java from AnyType.wsdl for 
javabean endpoint
-                                    AnyType support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/AnyType.wsdl" />
-                                </java>
-                                <echo>Generating java from MessageContext.wsdl 
for message context
-                                    properties support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/MessageContext.wsdl" />
-                                </java>
-                                <echo>Generating java from 
WSDLMultiTests.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/WSDLMultiTests.wsdl" />
-                                </java>
-                                <echo>Generating java from Polymorphic 
shapes.wsdl for javabean
-                                    endpoint support
-                                </echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/shapes.wsdl" />
-                                </java>
-                                <echo>Generating java from 
SOAPActionTest.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/SOAPActionTest.wsdl" />
-                                </java>
-                                <echo>Generating java from 
rpclitenum.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/rpclitenum.wsdl" />
-                                </java>
-                                <echo>Generating java from 
rpclitstringarray.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/rpclitstringarray.wsdl" />
-                                </java>
-                                <echo>Generating java from 
swamtomservice.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/swamtomservice.wsdl" />
-                                </java>
-                                <echo>Generating java from 
ProcessDocumentService.wsdl</echo>
-                                <java classname="com.sun.tools.xjc.Driver" 
fork="true">
-                                    <classpath refid="maven.runtime.classpath" 
/>
-                                    <classpath 
location="${compiled.classes.dir}" />
-                                    <arg line="-d ${schema.generated.src.dir} 
-quiet -wsdl ${wsdl.source.dir}/ProcessDocumentService.wsdl" />
-                                </java>
-                            </tasks>
+                            
<outputDirectory>${project.build.directory}/repo</outputDirectory>
+                            <modules>addressing</modules>
+                            <axis2xml>test-resources/axis2.xml</axis2xml>
+                            <jaxwsServices>
+                                <jaxwsService>
+                                    <name>XPayloadStringProvider</name>
+                                    <packages>
+                                        
<package>org.apache.axis2.jaxws.xmlhttp.provider.payload.string</package>
+                                    </packages>
+                                </jaxwsService>
+                                <jaxwsService>
+                                    <name>XMessageStringProvider</name>
+                                    <packages>
+                                        
<package>org.apache.axis2.jaxws.xmlhttp.provider.message.string</package>
+                                    </packages>
+                                </jaxwsService>
+                                <jaxwsService>
+                                    <name>XPayloadSourceProvider</name>
+                                    <packages>
+                                        
<package>org.apache.axis2.jaxws.xmlhttp.provider.payload.source</package>
+                                    </packages>
+                                </jaxwsService>
+                                <jaxwsService>
+                                    <name>XMessageSourceProvider</name>
+                                    <packages>
+                                        
<package>org.apache.axis2.jaxws.xmlhttp.provider.message.source</package>
+                                    </packages>
+                                </jaxwsService>
+                                <jaxwsService>
+                                    <name>XMessageDataSourceProvider</name>
+                                    <packages>
+                                        
<package>org.apache.axis2.jaxws.xmlhttp.provider.message.datasource</package>
+                                    </packages>
+                                </jaxwsService>
+                            </jaxwsServices>
                         </configuration>
+                    </execution>
+                    <execution>
+                        <id>build-client-repo</id>
+                        <phase>generate-test-resources</phase>
                         <goals>
-                            <goal>run</goal>
+                            <goal>create-test-repository</goal>
+                        </goals>
+                        <configuration>
+                            
<outputDirectory>${project.build.directory}/client-repo</outputDirectory>
+                            <modules>addressing</modules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxb2-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>xjc-soap11</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/soap11.xsd</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/soap11</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-echo</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/echo.xsd</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/echo</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-stock1</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/stock1.xsd</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock1</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-stock2</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/stock2.xsd</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/stock2</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-samplemtom</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/samplemtom.xsd</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/samplemtom</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-greeterTypes</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/greeterTypes.xsd</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/greeterTypes</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-ProxyDocLitWrapped</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/ProxyDocLitWrapped.wsdl</testSource>
+                            </testSources>
+                            
<packageName>org.test.proxy.doclitwrapped</packageName>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProxyDocLitWrapped</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-AddNumbers</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/AddNumbers.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AddNumbers</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-samplemtomjpeg</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/samplemtomjpeg.wsdl</testSource>
+                            </testSources>
+                            
<packageName>org.apache.axis2.jaxws.sample.mtom1</packageName>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/samplemtomjpeg</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-RPCLit</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/RPCLit.wsdl</testSource>
+                            </testSources>
+                            <packageName>org.test.proxy.rpclit</packageName>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/RPCLit</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-RPCLitSWA</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/RPCLitSWA.wsdl</testSource>
+                            </testSources>
+                            <packageName>org.test.proxy.rpclitswa</packageName>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/RPCLitSWA</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-gorilla_dlw</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test/org/apache/axis2/jaxws/proxy/gorilla_dlw/META-INF/gorilla_dlw.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/gorilla_dlw</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-SOAP12Echo</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/SOAP12Echo.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/SOAP12Echo</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-AddNumbersHandler</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/AddNumbersHandler.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/AddNumbersHandler</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-HeadersHandler</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/HeadersHandler.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/HeadersHandler</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-async_doclitwr</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/async_doclitwr.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/async_doclitwr</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-async_doclitwr2</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/async_doclitwr2.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/async_doclitwr2</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-FaultyWebService</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/FaultyWebService.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/FaultyWebService</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-FaultsService</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/FaultsService.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/FaultsService</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-jaxbsource</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>XmlSchema</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/xsd/jaxbsource.xsd</testSource>
+                            </testSources>
+                            
<packageName>org.test.dispatch.jaxbsource</packageName>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/jaxbsource</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-doclit_nonwrap</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/doclit_nonwrap.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/doclit_nonwrap</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-doclitwrap</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/doclitwrap.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/doclitwrap</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-doclitbare</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/doclitbare.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/doclitbare</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-resourceinjection</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/resourceinjection.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/resourceinjection</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-MessageContext</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/MessageContext.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/MessageContext</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-WSDLMultiTests</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/WSDLMultiTests.wsdl</testSource>
+                            </testSources>
+                            <packageName>multi</packageName>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/WSDLMultiTests</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-rpclitenum</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/rpclitenum.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/rpclitenum</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-rpclitstringarray</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/rpclitstringarray.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/rpclitstringarray</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-swamtomservice</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/swamtomservice.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/swamtomservice</outputDirectory>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>xjc-ProcessDocumentService</id>
+                        <goals>
+                            <goal>testXjc</goal>
+                        </goals>
+                        <configuration>
+                            <sourceType>WSDL</sourceType>
+                            <testSources>
+                                
<testSource>test-resources/wsdl/ProcessDocumentService.wsdl</testSource>
+                            </testSources>
+                            
<outputDirectory>${project.build.directory}/generated-test-sources/jaxb/ProcessDocumentService</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jaxws-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>wsimport-SOAPActionTest</id>
+                        <goals>
+                            <goal>wsimport-test</goal>
+                        </goals>
+                        <configuration>
+                            <wsdlFiles>
+                                
<wsdlFile>${basedir}/src/test/repository/services/BookStoreService/META-INF/SOAPActionTest.wsdl</wsdlFile>
+                            </wsdlFiles>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>wsimport-AnyType</id>
+                        <goals>
+                            <goal>wsimport-test</goal>
+                        </goals>
+                        <configuration>
+                            <wsdlFiles>
+                                
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/anytype/META-INF/AnyType.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            
<packageName>org.apache.axis2.jaxws.anytype</packageName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>wsimport-shapes</id>
+                        <goals>
+                            <goal>wsimport-test</goal>
+                        </goals>
+                        <configuration>
+                            <wsdlFiles>
+                                
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/polymorphic/shape/META-INF/shapes.wsdl</wsdlFile>
+                            </wsdlFiles>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>wsimport-EchoMessage</id>
+                        <goals>
+                            <goal>wsimport-test</goal>
                         </goals>
+                        <configuration>
+                            <wsdlFiles>
+                                
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/nonanonymous/complextype/META-INF/EchoMessage.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            
<packageName>org.apache.axis2.jaxws.nonanonymous.complextype</packageName>
+                        </configuration>
                     </execution>
                     <execution>
+                        <id>wsimport-proxy_doclit_unwr</id>
+                        <goals>
+                            <goal>wsimport-test</goal>
+                        </goals>
+                        <configuration>
+                            <wsdlFiles>
+                                
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/proxy/doclitnonwrapped/META-INF/proxy_doclit_unwr.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            
<packageName>org.apache.axis2.jaxws.proxy.doclitnonwrapped</packageName>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>wsimport-ProxyDocLitWrapped</id>
+                        <goals>
+                            <goal>wsimport-test</goal>
+                        </goals>
+                        <configuration>
+                            <wsdlFiles>
+                                
<wsdlFile>${basedir}/test/org/apache/axis2/jaxws/proxy/doclitwrapped/META-INF/ProxyDocLitWrapped.wsdl</wsdlFile>
+                            </wsdlFiles>
+                            
<packageName>org.apache.axis2.jaxws.proxy.doclitwrapped</packageName>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
                         <id>build-repo</id>
                         <phase>test-compile</phase>
                         <configuration>
@@ -467,35 +748,6 @@
                                 <property name="services.dir" 
value="${repo.dir}/services" />
                                 <property name="servicejars.dir" 
value="${repo.dir}/servicejars" />
 
-                                <!-- Enable Addressing on the client side -->
-                                <mkdir dir="./target/client-repo/modules/" />
-                                <copy 
file="../addressing/target/addressing-${project.version}.mar" 
tofile="./target/client-repo/modules/addressing-${project.version}.mar" />
-
-                                <!-- Enable Addressing on the server side -->
-                                <mkdir dir="${repo.dir}/modules/" />
-                                <copy 
file="../addressing/target/addressing-${project.version}.mar" 
tofile="${repo.dir}/modules/addressing-${project.version}.mar" />
-
-                                <!-- 
================================================================ -->
-                                <!-- Non-JAXWS services -->
-                                <!-- 
================================================================ -->
-
-                                <copy toDir="${services.dir}/EchoService/">
-                                    <fileset dir="target/test-classes">
-                                        <include name="server/**" />
-                                    </fileset>
-                                    <fileset dir="test/server">
-                                        <exclude name="**/*.java" />
-                                    </fileset>
-                                </copy>
-                                <copy 
toDir="${services.dir}/BookStoreService/">
-                                    <fileset dir="target/test-classes">
-                                        <include 
name="org/apache/axis2/jaxws/client/soapaction/**" />
-                                    </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/client/soapaction/server">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-                                </copy>
-
                                 <mkdir dir="${servicejars.dir}" />
                                 <!-- 
================================================================ -->
                                 <!-- JAXWS services -->
@@ -514,7 +766,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/WSGenService.jar" 
basedir="${servicejars.dir}/WSGenService" />
+                                <jar 
destfile="${servicejars.dir}/WSGenService.jar" 
basedir="${servicejars.dir}/WSGenService" />
                                 <delete dir="${servicejars.dir}/WSGenService" 
/>
 
                                 <copy 
toDir="${servicejars.dir}/BasicAuthSecurityService/">
@@ -526,7 +778,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/BasicAuthSecurityService.jar" 
basedir="${servicejars.dir}/BasicAuthSecurityService" />
+                                <jar 
destfile="${servicejars.dir}/BasicAuthSecurityService.jar" 
basedir="${servicejars.dir}/BasicAuthSecurityService" />
                                 <delete 
dir="${servicejars.dir}/BasicAuthSecurityService" />
 
                                 <copy 
toDir="${servicejars.dir}/StringProviderService/">
@@ -538,7 +790,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/StringProviderService.jar" 
basedir="${servicejars.dir}/StringProviderService" />
+                                <jar 
destfile="${servicejars.dir}/StringProviderService.jar" 
basedir="${servicejars.dir}/StringProviderService" />
                                 <delete 
dir="${servicejars.dir}/StringProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/StringMessageProviderService/">
@@ -550,7 +802,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/StringMessageProviderService.jar" 
basedir="${servicejars.dir}/StringMessageProviderService" />
+                                <jar 
destfile="${servicejars.dir}/StringMessageProviderService.jar" 
basedir="${servicejars.dir}/StringMessageProviderService" />
                                 <delete 
dir="${servicejars.dir}/StringMessageProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/SourceProviderService/">
@@ -562,7 +814,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SourceProviderService.jar" 
basedir="${servicejars.dir}/SourceProviderService" />
+                                <jar 
destfile="${servicejars.dir}/SourceProviderService.jar" 
basedir="${servicejars.dir}/SourceProviderService" />
                                 <delete 
dir="${servicejars.dir}/SourceProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/SourceMessageProviderService/">
@@ -574,7 +826,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SourceMessageProviderService.jar" 
basedir="${servicejars.dir}/SourceMessageProviderService" />
+                                <jar 
destfile="${servicejars.dir}/SourceMessageProviderService.jar" 
basedir="${servicejars.dir}/SourceMessageProviderService" />
                                 <delete 
dir="${servicejars.dir}/SourceMessageProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/SoapMessageProviderService/">
@@ -586,7 +838,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SoapMessageProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageProviderService" />
+                                <jar 
destfile="${servicejars.dir}/SoapMessageProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageProviderService" />
                                 <delete 
dir="${servicejars.dir}/SoapMessageProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/SoapMessageCheckMTOMProviderService/">
@@ -598,7 +850,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SoapMessageCheckMTOMProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageCheckMTOMProviderService" />
+                                <jar 
destfile="${servicejars.dir}/SoapMessageCheckMTOMProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageCheckMTOMProviderService" />
                                 <delete 
dir="${servicejars.dir}/SoapMessageCheckMTOMProviderService" />
                                 
                                 <copy 
toDir="${servicejars.dir}/SoapMessageMUProviderService/">
@@ -610,7 +862,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SoapMessageMUProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageMUProviderService" />
+                                <jar 
destfile="${servicejars.dir}/SoapMessageMUProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageMUProviderService" />
                                 <delete 
dir="${servicejars.dir}/SoapMessageMUProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/SoapMessageNullProviderService/">
@@ -622,7 +874,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SoapMessageNullProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageNullProviderService" />
+                                <jar 
destfile="${servicejars.dir}/SoapMessageNullProviderService.jar" 
basedir="${servicejars.dir}/SoapMessageNullProviderService" />
                                 <delete 
dir="${servicejars.dir}/SoapMessageNullProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/JAXBProviderService/">
@@ -632,12 +884,12 @@
                                     <fileset 
dir="test/org/apache/axis2/jaxws/provider/jaxb">
                                         <include name="META-INF/**" />
                                     </fileset>
-                                    <fileset dir="target/schema/classes">
+                                    <fileset dir="target/test-classes">
                                         <include name="org/test/mtom/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/JAXBProviderService.jar" 
basedir="${servicejars.dir}/JAXBProviderService" />
+                                <jar 
destfile="${servicejars.dir}/JAXBProviderService.jar" 
basedir="${servicejars.dir}/JAXBProviderService" />
                                 <delete 
dir="${servicejars.dir}/JAXBProviderService" />
 
                                 <copy 
toDir="${servicejars.dir}/SendImageService/">
@@ -647,12 +899,12 @@
                                     <fileset 
dir="test/org/apache/axis2/jaxws/sample/mtom1">
                                         <include name="META-INF/**" />
                                     </fileset>
-                                    <fileset dir="target/schema/classes">
+                                    <fileset dir="target/test-classes">
                                         <include 
name="org/apache/axis2/jaxws/sample/mtom1/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SendImageService.jar" 
basedir="${servicejars.dir}/SendImageService" />
+                                <jar 
destfile="${servicejars.dir}/SendImageService.jar" 
basedir="${servicejars.dir}/SendImageService" />
                                 <delete 
dir="${servicejars.dir}/SendImageService" />
 
                                 <copy 
toDir="${servicejars.dir}/SOAP12Service/">
@@ -664,7 +916,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SOAP12Service.jar" 
basedir="${servicejars.dir}/SOAP12Service" />
+                                <jar 
destfile="${servicejars.dir}/SOAP12Service.jar" 
basedir="${servicejars.dir}/SOAP12Service" />
                                 <delete dir="${servicejars.dir}/SOAP12Service" 
/>
 
 
@@ -677,7 +929,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SWAMTOMService.jar" 
basedir="${servicejars.dir}/SWAMTOMService" />
+                                <jar 
destfile="${servicejars.dir}/SWAMTOMService.jar" 
basedir="${servicejars.dir}/SWAMTOMService" />
                                 <delete 
dir="${servicejars.dir}/SWAMTOMService" />
                                 <!-- 
================================================================ -->
                                 <!-- Proxy endpoint Service Samples -->
@@ -691,7 +943,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/ProxyDocLitWrapped.jar" 
basedir="${servicejars.dir}/ProxyDocLitWrapped" />
+                                <jar 
destfile="${servicejars.dir}/ProxyDocLitWrapped.jar" 
basedir="${servicejars.dir}/ProxyDocLitWrapped" />
                                 <delete 
dir="${servicejars.dir}/ProxyDocLitWrapped" />
 
                                 <copy 
toDir="${servicejars.dir}/ProxyDocLitnonWrapped/">
@@ -703,7 +955,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/ProxyDocLitnonWrapped.jar" 
basedir="${servicejars.dir}/ProxyDocLitnonWrapped" />
+                                <jar 
destfile="${servicejars.dir}/ProxyDocLitnonWrapped.jar" 
basedir="${servicejars.dir}/ProxyDocLitnonWrapped" />
                                 <delete 
dir="${servicejars.dir}/ProxyDocLitnonWrapped" />
 
                                 <copy toDir="${servicejars.dir}/RPCLit/">
@@ -715,7 +967,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/RPCLit.jar" 
basedir="${servicejars.dir}/RPCLit" />
+                                <jar destfile="${servicejars.dir}/RPCLit.jar" 
basedir="${servicejars.dir}/RPCLit" />
                                 <delete dir="${servicejars.dir}/RPCLit" />
 
                                 <copy toDir="${servicejars.dir}/RPCLitSWA/">
@@ -727,7 +979,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/RPCLitSWA.jar" 
basedir="${servicejars.dir}/RPCLitSWA" />
+                                <jar 
destfile="${servicejars.dir}/RPCLitSWA.jar" 
basedir="${servicejars.dir}/RPCLitSWA" />
                                 <delete dir="${servicejars.dir}/RPCLitSWA" />
 
                                 <copy 
toDir="${servicejars.dir}/AddressingProvider/">
@@ -739,7 +991,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/AddressingProvider.jar" 
basedir="${servicejars.dir}/AddressingProvider" />
+                                <jar 
destfile="${servicejars.dir}/AddressingProvider.jar" 
basedir="${servicejars.dir}/AddressingProvider" />
                                 <delete 
dir="${servicejars.dir}/AddressingProvider" />
 
                                 <copy 
toDir="${servicejars.dir}/SOAP12EchoService/">
@@ -751,7 +1003,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/SOAP12EchoService.jar" 
basedir="${servicejars.dir}/SOAP12EchoService" />
+                                <jar 
destfile="${servicejars.dir}/SOAP12EchoService.jar" 
basedir="${servicejars.dir}/SOAP12EchoService" />
                                 <delete 
dir="${servicejars.dir}/SOAP12EchoService" />
 
                                 <copy toDir="${servicejars.dir}/gorilla_dlw/">
@@ -763,73 +1015,10 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/gorilla_dlw.jar" 
basedir="${servicejars.dir}/gorilla_dlw" />
+                                <jar 
destfile="${servicejars.dir}/gorilla_dlw.jar" 
basedir="${servicejars.dir}/gorilla_dlw" />
                                 <delete dir="${servicejars.dir}/gorilla_dlw" />
 
                                 <!-- 
================================================================ -->
-                                <!-- XML HTTP Tests -->
-                                <!-- 
================================================================ -->
-                                <copy 
toDir="${servicejars.dir}/XPayloadStringProvider/">
-                                    <fileset dir="target/test-classes">
-                                        <include 
name="org/apache/axis2/jaxws/xmlhttp/provider/payload/string/*.class" />
-                                    </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/xmlhttp/provider/payload/string">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-                                </copy>
-
-                                <zip 
destfile="${servicejars.dir}/XPayloadStringProvider.jar" 
basedir="${servicejars.dir}/XPayloadStringProvider" />
-                                <delete 
dir="${servicejars.dir}/XPayloadStringProvider" />
-
-                                <copy 
toDir="${servicejars.dir}/XMessageStringProvider/">
-                                    <fileset dir="target/test-classes">
-                                        <include 
name="org/apache/axis2/jaxws/xmlhttp/provider/message/string/*.class" />
-                                    </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/xmlhttp/provider/message/string">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-                                </copy>
-
-                                <zip 
destfile="${servicejars.dir}/XMessageStringProvider.jar" 
basedir="${servicejars.dir}/XMessageStringProvider" />
-                                <delete 
dir="${servicejars.dir}/XMessageStringProvider" />
-
-                                <copy 
toDir="${servicejars.dir}/XPayloadSourceProvider/">
-                                    <fileset dir="target/test-classes">
-                                        <include 
name="org/apache/axis2/jaxws/xmlhttp/provider/payload/source/*.class" />
-                                    </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/xmlhttp/provider/payload/source">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-                                </copy>
-
-                                <zip 
destfile="${servicejars.dir}/XPayloadSourceProvider.jar" 
basedir="${servicejars.dir}/XPayloadSourceProvider" />
-                                <delete 
dir="${servicejars.dir}/XPayloadSourceProvider" />
-
-                                <copy 
toDir="${servicejars.dir}/XMessageSourceProvider/">
-                                    <fileset dir="target/test-classes">
-                                        <include 
name="org/apache/axis2/jaxws/xmlhttp/provider/message/source/*.class" />
-                                    </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/xmlhttp/provider/message/source">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-                                </copy>
-
-                                <zip 
destfile="${servicejars.dir}/XMessageSourceProvider.jar" 
basedir="${servicejars.dir}/XMessageSourceProvider" />
-                                <delete 
dir="${servicejars.dir}/XMessageSourceProvider" />
-
-                                <copy 
toDir="${servicejars.dir}/XMessageDataSourceProvider/">
-                                    <fileset dir="target/test-classes">
-                                        <include 
name="org/apache/axis2/jaxws/xmlhttp/provider/message/datasource/*.class" />
-                                    </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/xmlhttp/provider/message/datasource">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-                                </copy>
-
-                                <zip 
destfile="${servicejars.dir}/XMessageDataSourceProvider.jar" 
basedir="${servicejars.dir}/XMessageDataSourceProvider" />
-                                <delete 
dir="${servicejars.dir}/XMessageDataSourceProvider" />
-
-                                <!-- 
================================================================ -->
                                 <!-- Java Bean Endpoint Samples -->
                                 <!-- 
================================================================ -->
                                 <copy 
toDir="${servicejars.dir}/AddressBookService/">
@@ -840,7 +1029,7 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/AddressBookService.jar" 
basedir="${servicejars.dir}/AddressBookService" />
+                                <jar 
destfile="${servicejars.dir}/AddressBookService.jar" 
basedir="${servicejars.dir}/AddressBookService" />
                                 <delete 
dir="${servicejars.dir}/AddressBookService" />
 
 
@@ -850,20 +1039,15 @@
                                         <include 
name="org/apache/axis2/jaxws/type_substitution/jaxws/*" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/AppleFinderService.jar" 
basedir="${servicejars.dir}/AppleFinderService" />
+                                <jar 
destfile="${servicejars.dir}/AppleFinderService.jar" 
basedir="${servicejars.dir}/AppleFinderService" />
                                 <delete 
dir="${servicejars.dir}/AppleFinderService" />
 
                                 <copy 
toDir="${servicejars.dir}/MtomSampleService/">
                                     <fileset dir="target/test-classes">
                                         <include 
name="org/apache/axis2/jaxws/sample/mtom/**" />
                                     </fileset>
-
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/sample/mtom">
-                                        <include name="META-INF/**" />
-                                    </fileset>
-
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/MtomSampleService.jar" 
basedir="${servicejars.dir}/MtomSampleService" />
+                                <jar 
destfile="${servicejars.dir}/MtomSampleService.jar" 
basedir="${servicejars.dir}/MtomSampleService" />
                                 <delete 
dir="${servicejars.dir}/MtomSampleService" />
                                 <copy 
toDir="${servicejars.dir}/DocLitNonWrapService/">
                                     <fileset dir="target/test-classes">
@@ -873,7 +1057,7 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/DocLitNonWrapService.jar" 
basedir="${servicejars.dir}/DocLitNonWrapService" />
+                                <jar 
destfile="${servicejars.dir}/DocLitNonWrapService.jar" 
basedir="${servicejars.dir}/DocLitNonWrapService" />
                                 <delete 
dir="${servicejars.dir}/DocLitNonWrapService" />
                                 <copy 
toDir="${servicejars.dir}/DocLitWrapService/">
                                     <fileset dir="target/test-classes">
@@ -883,7 +1067,7 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/DocLitWrapService.jar" 
basedir="${servicejars.dir}/DocLitWrapService" />
+                                <jar 
destfile="${servicejars.dir}/DocLitWrapService.jar" 
basedir="${servicejars.dir}/DocLitWrapService" />
                                 <delete 
dir="${servicejars.dir}/DocLitWrapService" />
                                 <copy 
toDir="${servicejars.dir}/AddNumbersService/">
                                     <fileset dir="target/test-classes">
@@ -893,7 +1077,7 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/AddNumbersService.jar" 
basedir="${servicejars.dir}/AddNumbersService" />
+                                <jar 
destfile="${servicejars.dir}/AddNumbersService.jar" 
basedir="${servicejars.dir}/AddNumbersService" />
                                 <delete 
dir="${servicejars.dir}/AddNumbersService" />
                                 <copy 
toDir="${servicejars.dir}/AddNumbersHandlerService/">
                                     <fileset dir="target/test-classes">
@@ -903,7 +1087,7 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/AddNumbersHandlerService.jar" 
basedir="${servicejars.dir}/AddNumbersHandlerService" />
+                                <jar 
destfile="${servicejars.dir}/AddNumbersHandlerService.jar" 
basedir="${servicejars.dir}/AddNumbersHandlerService" />
                                 <delete 
dir="${servicejars.dir}/AddNumbersHandlerService" />
                                 <copy 
toDir="${servicejars.dir}/HeadersHandlerService/">
                                     <fileset dir="target/test-classes">
@@ -913,7 +1097,7 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip 
destfile="${servicejars.dir}/HeadersHandlerService.jar" 
basedir="${servicejars.dir}/HeadersHandlerService" />
+                                <jar 
destfile="${servicejars.dir}/HeadersHandlerService.jar" 
basedir="${servicejars.dir}/HeadersHandlerService" />
                                 <delete 
dir="${servicejars.dir}/HeadersHandlerService" />
                                 <copy 
toDir="${servicejars.dir}/GreeterService/">
                                     <fileset dir="target/test-classes">
@@ -924,19 +1108,16 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/GreeterService.jar" 
basedir="${servicejars.dir}/GreeterService" />
+                                <jar 
destfile="${servicejars.dir}/GreeterService.jar" 
basedir="${servicejars.dir}/GreeterService" />
                                 <delete 
dir="${servicejars.dir}/GreeterService" />
                                 
                                 <copy 
toDir="${servicejars.dir}/GenericService/">
                                     <fileset dir="target/test-classes">
                                         <include 
name="org/apache/axis2/jaxws/sample/dlwminArrays/**" />
                                     </fileset>
-                                    <fileset 
dir="test/org/apache/axis2/jaxws/sample/dlwminArrays">
-                                        <include name="META-INF/**" />
-                                    </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/GenericService.jar" 
basedir="${servicejars.dir}/GenericService" />
+                                <jar 
destfile="${servicejars.dir}/GenericService.jar" 
basedir="${servicejars.dir}/GenericService" />
                                 <delete 
dir="${servicejars.dir}/GenericService" />
 
                                 <copy toDir="${servicejars.dir}/AsyncService/">
@@ -948,7 +1129,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/AsyncService.jar" 
basedir="${servicejars.dir}/AsyncService" />
+                                <jar 
destfile="${servicejars.dir}/AsyncService.jar" 
basedir="${servicejars.dir}/AsyncService" />
                                 <delete dir="${servicejars.dir}/AsyncService" 
/>
 
                                 <copy 
toDir="${servicejars.dir}/AsyncService2/">
@@ -960,7 +1141,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/AsyncService2.jar" 
basedir="${servicejars.dir}/AsyncService2" />
+                                <jar 
destfile="${servicejars.dir}/AsyncService2.jar" 
basedir="${servicejars.dir}/AsyncService2" />
                                 <delete dir="${servicejars.dir}/AsyncService2" 
/>
 
                                 <copy 
toDir="${servicejars.dir}/FaultyWebServiceService/">
@@ -972,7 +1153,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/FaultyWebServiceService.jar" 
basedir="${servicejars.dir}/FaultyWebServiceService" />
+                                <jar 
destfile="${servicejars.dir}/FaultyWebServiceService.jar" 
basedir="${servicejars.dir}/FaultyWebServiceService" />
                                 <delete 
dir="${servicejars.dir}/FaultyWebServiceService" />
 
                                 <copy 
toDir="${servicejars.dir}/FaultsService/">
@@ -984,7 +1165,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/FaultsService.jar" 
basedir="${servicejars.dir}/FaultsService" />
+                                <jar 
destfile="${servicejars.dir}/FaultsService.jar" 
basedir="${servicejars.dir}/FaultsService" />
                                 <delete dir="${servicejars.dir}/FaultsService" 
/>
 
                                 <copy 
toDir="${servicejars.dir}/BareDocLitService/">
@@ -996,7 +1177,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/BareDocLitService.jar" 
basedir="${servicejars.dir}/BareDocLitService" />
+                                <jar 
destfile="${servicejars.dir}/BareDocLitService.jar" 
basedir="${servicejars.dir}/BareDocLitService" />
                                 <delete 
dir="${servicejars.dir}/BareDocLitService" />
 
                                 <copy 
toDir="${servicejars.dir}/BareDocLitNoArgService/">
@@ -1008,7 +1189,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/BareDocLitNoArgService.jar" 
basedir="${servicejars.dir}/BareDocLitNoArgService" />
+                                <jar 
destfile="${servicejars.dir}/BareDocLitNoArgService.jar" 
basedir="${servicejars.dir}/BareDocLitNoArgService" />
                                 <delete 
dir="${servicejars.dir}/BareDocLitNoArgService" />
 
                                 <copy 
toDir="${servicejars.dir}/EchoMessageService/">
@@ -1020,7 +1201,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/EchoMessageService.jar" 
basedir="${servicejars.dir}/EchoMessageService" />
+                                <jar 
destfile="${servicejars.dir}/EchoMessageService.jar" 
basedir="${servicejars.dir}/EchoMessageService" />
                                 <delete 
dir="${servicejars.dir}/EchoMessageService" />
 
                                 <copy 
toDir="${servicejars.dir}/ResourceInjectionService/">
@@ -1032,7 +1213,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/ResourceInjectionService.jar" 
basedir="${servicejars.dir}/ResourceInjectionService" />
+                                <jar 
destfile="${servicejars.dir}/ResourceInjectionService.jar" 
basedir="${servicejars.dir}/ResourceInjectionService" />
                                 <delete 
dir="${servicejars.dir}/ResourceInjectionService" />
 
                                 <copy 
toDir="${servicejars.dir}/AnyTypeMessageService/">
@@ -1044,7 +1225,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/AnyTypeMessageService.jar" 
basedir="${servicejars.dir}/AnyTypeMessageService" />
+                                <jar 
destfile="${servicejars.dir}/AnyTypeMessageService.jar" 
basedir="${servicejars.dir}/AnyTypeMessageService" />
                                 <delete 
dir="${servicejars.dir}/AnyTypeMessageService" />
 
                                 <copy 
toDir="${servicejars.dir}/MessageContextService/">
@@ -1056,7 +1237,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/MessageContextService.jar" 
basedir="${servicejars.dir}/MessageContextService" />
+                                <jar 
destfile="${servicejars.dir}/MessageContextService.jar" 
basedir="${servicejars.dir}/MessageContextService" />
                                 <delete 
dir="${servicejars.dir}/MessageContextService" />
 
                                 <copy 
toDir="${servicejars.dir}/PolymorphicShapeService/">
@@ -1068,7 +1249,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/PolymorphicShapeService.jar" 
basedir="${servicejars.dir}/PolymorphicShapeService" />
+                                <jar 
destfile="${servicejars.dir}/PolymorphicShapeService.jar" 
basedir="${servicejars.dir}/PolymorphicShapeService" />
                                 <delete 
dir="${servicejars.dir}/PolymorphicShapeService" />
 
                                 <copy 
toDir="${servicejars.dir}/RPCLitEnumService/">
@@ -1080,7 +1261,7 @@
                                     </fileset>
                                 </copy>
 
-                                <zip 
destfile="${servicejars.dir}/RPCLitEnumService.jar" 
basedir="${servicejars.dir}/RPCLitEnumService" />

[... 362 lines stripped ...]

Reply via email to