You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2010/09/26 19:58:15 UTC

svn commit: r1001486 [1/2] - in /axis/axis2/java/core/trunk/modules: codegen/ distribution/ integration/ java2wsdl/ jaxws-integration/ jaxws/ jibx/ kernel/ soapmonitor/module/ tool/axis2-ant-plugin/

Author: veithen
Date: Sun Sep 26 17:58:15 2010
New Revision: 1001486

URL: http://svn.apache.org/viewvc?rev=1001486&view=rev
Log:
Normalized the formatting of the POM files in order to avoid spurious changes when using maven-release-plugin.

Modified:
    axis/axis2/java/core/trunk/modules/codegen/pom.xml
    axis/axis2/java/core/trunk/modules/distribution/pom.xml
    axis/axis2/java/core/trunk/modules/integration/pom.xml
    axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
    axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
    axis/axis2/java/core/trunk/modules/jaxws/pom.xml
    axis/axis2/java/core/trunk/modules/jibx/pom.xml
    axis/axis2/java/core/trunk/modules/kernel/pom.xml
    axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
    axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Sep 26 17:58:15 2010
@@ -125,15 +125,14 @@
                         <configuration>
                             <tasks unless="maven.test.skip">
                                 <!-- Set a property that can be picked up from the ant build.xml's -->
-                                <property name="maven.class.path" refid="maven.test.classpath"/>
+                                <property name="maven.class.path" refid="maven.test.classpath" />
                                 <echo>Building WSDLs...</echo>
-                                <property name="axis2.home" value="${basedir}/../target"/>
-                                <property name="maven.junit.jvmargs" value=""/>
+                                <property name="axis2.home" value="${basedir}/../target" />
+                                <property name="maven.junit.jvmargs" value="" />
                                 <path id="maven.dependency.classpath">
-                                    <path refid="maven.compile.classpath"/>
+                                    <path refid="maven.compile.classpath" />
                                 </path>
-                                <ant antfile="build-wsdls.xml" inheritall="true" inheritrefs="true"
-                                     dir="." target="wsdl-codegen"/>
+                                <ant antfile="build-wsdls.xml" inheritall="true" inheritrefs="true" dir="." target="wsdl-codegen" />
                             </tasks>
                         </configuration>
                         <goals>
@@ -146,13 +145,13 @@
                         <configuration>
                             <tasks>
                                 <tstamp>
-                                    <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en"/>
+                                    <format property="build.time" pattern="MMM dd, yyyy (hh:mm:ss z)" locale="en" />
                                 </tstamp>
                                 <copy toDir="${basedir}/target/classes/" overwrite="true" filtering="on">
-                                    <fileset dir="${basedir}/src/" includes="**/*.xsl"/>
+                                    <fileset dir="${basedir}/src/" includes="**/*.xsl" />
                                     <filterset begintoken="#" endtoken="#">
-                                        <filter token="axisVersion" value="${project.version}"/>
-                                        <filter token="today" value=" Built on : ${build.time}"/>
+                                        <filter token="axisVersion" value="${project.version}" />
+                                        <filter token="today" value=" Built on : ${build.time}" />
                                     </filterset>
                                 </copy>
                             </tasks>

Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Sun Sep 26 17:58:15 2010
@@ -17,10 +17,7 @@
   ~ 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">
+<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.axis2</groupId>

Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Sep 26 17:58:15 2010
@@ -585,7 +585,7 @@
                                 <property name="addressing_version" value="${project.version}" />
                                 <property name="groovy.all.version" value="${groovy.all.version}" />
                                 <property name="maven.repo.local" value="${settings.localRepository}" />
-                                <property name="maven.class.path" refid="maven.runtime.classpath"/>
+                                <property name="maven.class.path" refid="maven.runtime.classpath" />
 
                                 <path id="maven.dependency.classpath">
                                     <path refid="maven.compile.classpath" />

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Sun Sep 26 17:58:15 2010
@@ -139,19 +139,19 @@
                         <phase>test</phase>
                         <configuration>
                             <tasks unless="maven.test.skip">
-                                <echo message="Generating p2n.wsdl"/>
+                                <echo message="Generating p2n.wsdl" />
                                 
                                 <java classname="org.apache.ws.java2wsdl.Java2WSDL" classpathref="maven.test.classpath" fork="true" failonerror="true">
-                                    <arg value="-o"/>
-                                    <arg value="${project.build.directory}/java2wsdl"/>
-                                    <arg value="-of"/>
-                                    <arg value="p2n.wsdl"/>
-                                    <arg value="-cn"/>
-                                    <arg value="org.apache.axis2.description.CalculatorService"/>
-                                    <arg value="-p2n"/>
-                                    <arg value="[org.apache.axis2.description,http://www.example.org/calculator]"/>
-                                    <arg value="-stn"/>
-                                    <arg value="http://www.example.org/calculator-service"/>
+                                    <arg value="-o" />
+                                    <arg value="${project.build.directory}/java2wsdl" />
+                                    <arg value="-of" />
+                                    <arg value="p2n.wsdl" />
+                                    <arg value="-cn" />
+                                    <arg value="org.apache.axis2.description.CalculatorService" />
+                                    <arg value="-p2n" />
+                                    <arg value="[org.apache.axis2.description,http://www.example.org/calculator]" />
+                                    <arg value="-stn" />
+                                    <arg value="http://www.example.org/calculator-service" />
                                 </java>
                             </tasks>
                         </configuration>

Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Sun Sep 26 17:58:15 2010
@@ -284,9 +284,9 @@
                                 </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"/>
+                                    <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">
@@ -416,9 +416,9 @@
                                 </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"/>
+                                    <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>
                         </configuration>
@@ -431,18 +431,17 @@
                         <phase>test-compile</phase>
                         <configuration>
                             <tasks unless="maven.test.skip">
-                                <property name="repo.dir" value="${project.build.directory}/repo"/>
-                                <property name="services.dir" value="${repo.dir}/services"/>
-                                <property name="servicejars.dir" value="${repo.dir}/servicejars"/>
+                                <property name="repo.dir" value="${project.build.directory}/repo" />
+                                <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"/>
+                                <mkdir dir="${repo.dir}/modules/" />
+                                <copy file="../addressing/target/addressing-${project.version}.mar" tofile="${repo.dir}/modules/addressing-${project.version}.mar" />
 
                                 <!-- ================================================================ -->
                                 <!-- Non-JAXWS services -->
@@ -465,7 +464,7 @@
                                     </fileset>
                                 </copy>
 
-                                <mkdir dir="${servicejars.dir}"/>
+                                <mkdir dir="${servicejars.dir}" />
                                 <!-- ================================================================ -->
                                 <!-- JAXWS services -->
                                 <!-- ================================================================ -->
@@ -479,260 +478,225 @@
                                         <include name="org/apache/axis2/jaxws/sample/wsgen/jaxws/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/wsgen">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/WSGenService.jar"
-                                     basedir="${servicejars.dir}/WSGenService"
-                                        />
-                                <delete dir="${servicejars.dir}/WSGenService"/>
+                                <zip destfile="${servicejars.dir}/WSGenService.jar" basedir="${servicejars.dir}/WSGenService" />
+                                <delete dir="${servicejars.dir}/WSGenService" />
 
                                 <copy toDir="${servicejars.dir}/BasicAuthSecurityService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/security/server/**"/>
+                                        <include name="org/apache/axis2/jaxws/security/server/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/security/server">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/BasicAuthSecurityService.jar"
-                                     basedir="${servicejars.dir}/BasicAuthSecurityService"
-                                        />
-                                <delete dir="${servicejars.dir}/BasicAuthSecurityService"/>
+                                <zip destfile="${servicejars.dir}/BasicAuthSecurityService.jar" basedir="${servicejars.dir}/BasicAuthSecurityService" />
+                                <delete dir="${servicejars.dir}/BasicAuthSecurityService" />
 
                                 <copy toDir="${servicejars.dir}/StringProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/string/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/string/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/string">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/StringProviderService.jar"
-                                     basedir="${servicejars.dir}/StringProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/StringProviderService"/>
+                                <zip destfile="${servicejars.dir}/StringProviderService.jar" basedir="${servicejars.dir}/StringProviderService" />
+                                <delete dir="${servicejars.dir}/StringProviderService" />
 
                                 <copy toDir="${servicejars.dir}/StringMessageProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/stringmsg/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/stringmsg/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/stringmsg">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/StringMessageProviderService.jar"
-                                     basedir="${servicejars.dir}/StringMessageProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/StringMessageProviderService"/>
+                                <zip destfile="${servicejars.dir}/StringMessageProviderService.jar" basedir="${servicejars.dir}/StringMessageProviderService" />
+                                <delete dir="${servicejars.dir}/StringMessageProviderService" />
 
                                 <copy toDir="${servicejars.dir}/SourceProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/source/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/source/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/source">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SourceProviderService.jar"
-                                     basedir="${servicejars.dir}/SourceProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/SourceProviderService"/>
+                                <zip destfile="${servicejars.dir}/SourceProviderService.jar" basedir="${servicejars.dir}/SourceProviderService" />
+                                <delete dir="${servicejars.dir}/SourceProviderService" />
 
                                 <copy toDir="${servicejars.dir}/SourceMessageProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/sourcemsg/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/sourcemsg/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/sourcemsg">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SourceMessageProviderService.jar"
-                                     basedir="${servicejars.dir}/SourceMessageProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/SourceMessageProviderService"/>
+                                <zip destfile="${servicejars.dir}/SourceMessageProviderService.jar" basedir="${servicejars.dir}/SourceMessageProviderService" />
+                                <delete dir="${servicejars.dir}/SourceMessageProviderService" />
 
                                 <copy toDir="${servicejars.dir}/SoapMessageProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/soapmsg/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/soapmsg/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsg">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SoapMessageProviderService.jar"
-                                     basedir="${servicejars.dir}/SoapMessageProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/SoapMessageProviderService"/>
+                                <zip destfile="${servicejars.dir}/SoapMessageProviderService.jar" basedir="${servicejars.dir}/SoapMessageProviderService" />
+                                <delete dir="${servicejars.dir}/SoapMessageProviderService" />
 
                                 <copy toDir="${servicejars.dir}/SoapMessageCheckMTOMProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/soapmsgcheckmtom/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/soapmsgcheckmtom/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgcheckmtom">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SoapMessageCheckMTOMProviderService.jar"
-                                     basedir="${servicejars.dir}/SoapMessageCheckMTOMProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/SoapMessageCheckMTOMProviderService"/>
+                                <zip destfile="${servicejars.dir}/SoapMessageCheckMTOMProviderService.jar" basedir="${servicejars.dir}/SoapMessageCheckMTOMProviderService" />
+                                <delete dir="${servicejars.dir}/SoapMessageCheckMTOMProviderService" />
                                 
                                 <copy toDir="${servicejars.dir}/SoapMessageMUProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/soapmsgmu/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/soapmsgmu/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgmu">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SoapMessageMUProviderService.jar"
-                                     basedir="${servicejars.dir}/SoapMessageMUProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/SoapMessageMUProviderService"/>
+                                <zip destfile="${servicejars.dir}/SoapMessageMUProviderService.jar" basedir="${servicejars.dir}/SoapMessageMUProviderService" />
+                                <delete dir="${servicejars.dir}/SoapMessageMUProviderService" />
 
                                 <copy toDir="${servicejars.dir}/SoapMessageNullProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/soapmsgreturnnull/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/soapmsgreturnnull/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/soapmsgreturnnull">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SoapMessageNullProviderService.jar"
-                                     basedir="${servicejars.dir}/SoapMessageNullProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/SoapMessageNullProviderService"/>
+                                <zip destfile="${servicejars.dir}/SoapMessageNullProviderService.jar" basedir="${servicejars.dir}/SoapMessageNullProviderService" />
+                                <delete dir="${servicejars.dir}/SoapMessageNullProviderService" />
 
                                 <copy toDir="${servicejars.dir}/JAXBProviderService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/provider/jaxb/**"/>
+                                        <include name="org/apache/axis2/jaxws/provider/jaxb/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/provider/jaxb">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                     <fileset dir="target/schema/classes">
                                         <include name="org/test/mtom/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/JAXBProviderService.jar"
-                                     basedir="${servicejars.dir}/JAXBProviderService"
-                                        />
-                                <delete dir="${servicejars.dir}/JAXBProviderService"/>
+                                <zip destfile="${servicejars.dir}/JAXBProviderService.jar" basedir="${servicejars.dir}/JAXBProviderService" />
+                                <delete dir="${servicejars.dir}/JAXBProviderService" />
 
                                 <copy toDir="${servicejars.dir}/SendImageService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/mtom1/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/mtom1/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/mtom1">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                     <fileset dir="target/schema/classes">
                                         <include name="org/apache/axis2/jaxws/sample/mtom1/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SendImageService.jar"
-                                     basedir="${servicejars.dir}/SendImageService"
-                                        />
-                                <delete dir="${servicejars.dir}/SendImageService"/>
+                                <zip destfile="${servicejars.dir}/SendImageService.jar" basedir="${servicejars.dir}/SendImageService" />
+                                <delete dir="${servicejars.dir}/SendImageService" />
 
                                 <copy toDir="${servicejars.dir}/SOAP12Service/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/dispatch/server/**"/>
+                                        <include name="org/apache/axis2/jaxws/dispatch/server/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/dispatch/server">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SOAP12Service.jar"
-                                     basedir="${servicejars.dir}/SOAP12Service"
-                                        />
-                                <delete dir="${servicejars.dir}/SOAP12Service"/>
+                                <zip destfile="${servicejars.dir}/SOAP12Service.jar" basedir="${servicejars.dir}/SOAP12Service" />
+                                <delete dir="${servicejars.dir}/SOAP12Service" />
 
 
-                               <copy toDir="${servicejars.dir}/SWAMTOMService/">
+                                <copy toDir="${servicejars.dir}/SWAMTOMService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/swamtom/server/**"/>
+                                        <include name="org/apache/axis2/jaxws/swamtom/server/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/swamtom/server">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SWAMTOMService.jar"
-                                     basedir="${servicejars.dir}/SWAMTOMService"/>
-                                <delete dir="${servicejars.dir}/SWAMTOMService"/>
+                                <zip destfile="${servicejars.dir}/SWAMTOMService.jar" basedir="${servicejars.dir}/SWAMTOMService" />
+                                <delete dir="${servicejars.dir}/SWAMTOMService" />
                                 <!-- ================================================================ -->
                                 <!-- Proxy endpoint Service Samples -->
                                 <!-- ================================================================ -->
                                 <copy toDir="${servicejars.dir}/ProxyDocLitWrapped/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/proxy/doclitwrapped/**"/>
+                                        <include name="org/apache/axis2/jaxws/proxy/doclitwrapped/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/proxy/doclitwrapped">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/ProxyDocLitWrapped.jar"
-                                     basedir="${servicejars.dir}/ProxyDocLitWrapped"
-                                        />
-                                <delete dir="${servicejars.dir}/ProxyDocLitWrapped"/>
+                                <zip destfile="${servicejars.dir}/ProxyDocLitWrapped.jar" basedir="${servicejars.dir}/ProxyDocLitWrapped" />
+                                <delete dir="${servicejars.dir}/ProxyDocLitWrapped" />
 
                                 <copy toDir="${servicejars.dir}/ProxyDocLitnonWrapped/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/proxy/doclitnonwrapped/**"/>
+                                        <include name="org/apache/axis2/jaxws/proxy/doclitnonwrapped/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/proxy/doclitnonwrapped">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/ProxyDocLitnonWrapped.jar"
-                                     basedir="${servicejars.dir}/ProxyDocLitnonWrapped"
-                                        />
-                                <delete dir="${servicejars.dir}/ProxyDocLitnonWrapped"/>
+                                <zip destfile="${servicejars.dir}/ProxyDocLitnonWrapped.jar" basedir="${servicejars.dir}/ProxyDocLitnonWrapped" />
+                                <delete dir="${servicejars.dir}/ProxyDocLitnonWrapped" />
 
                                 <copy toDir="${servicejars.dir}/RPCLit/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/proxy/rpclit/**"/>
+                                        <include name="org/apache/axis2/jaxws/proxy/rpclit/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/proxy/rpclit">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/RPCLit.jar"
-                                     basedir="${servicejars.dir}/RPCLit"
-                                        />
-                                <delete dir="${servicejars.dir}/RPCLit"/>
+                                <zip destfile="${servicejars.dir}/RPCLit.jar" basedir="${servicejars.dir}/RPCLit" />
+                                <delete dir="${servicejars.dir}/RPCLit" />
 
                                 <copy toDir="${servicejars.dir}/RPCLitSWA/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/proxy/rpclitswa/**"/>
+                                        <include name="org/apache/axis2/jaxws/proxy/rpclitswa/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/proxy/rpclitswa">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/RPCLitSWA.jar"
-                                     basedir="${servicejars.dir}/RPCLitSWA"
-                                        />
-                                <delete dir="${servicejars.dir}/RPCLitSWA"/>
+                                <zip destfile="${servicejars.dir}/RPCLitSWA.jar" basedir="${servicejars.dir}/RPCLitSWA" />
+                                <delete dir="${servicejars.dir}/RPCLitSWA" />
 
                                 <copy toDir="${servicejars.dir}/AddressingProvider/">
                                     <fileset dir="target/test-classes">
@@ -743,38 +707,32 @@
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/AddressingProvider.jar"
-                                     basedir="${servicejars.dir}/AddressingProvider"
-                                        />
-                                <delete dir="${servicejars.dir}/AddressingProvider"/>
+                                <zip destfile="${servicejars.dir}/AddressingProvider.jar" basedir="${servicejars.dir}/AddressingProvider" />
+                                <delete dir="${servicejars.dir}/AddressingProvider" />
 
                                 <copy toDir="${servicejars.dir}/SOAP12EchoService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/proxy/soap12/**"/>
+                                        <include name="org/apache/axis2/jaxws/proxy/soap12/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/proxy/soap12/server">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/SOAP12EchoService.jar"
-                                     basedir="${servicejars.dir}/SOAP12EchoService"
-                                        />
-                                <delete dir="${servicejars.dir}/SOAP12EchoService"/>
+                                <zip destfile="${servicejars.dir}/SOAP12EchoService.jar" basedir="${servicejars.dir}/SOAP12EchoService" />
+                                <delete dir="${servicejars.dir}/SOAP12EchoService" />
 
                                 <copy toDir="${servicejars.dir}/gorilla_dlw/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/proxy/gorilla_dlw/**"/>
+                                        <include name="org/apache/axis2/jaxws/proxy/gorilla_dlw/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/proxy/gorilla_dlw">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/gorilla_dlw.jar"
-                                     basedir="${servicejars.dir}/gorilla_dlw"
-                                        />
-                                <delete dir="${servicejars.dir}/gorilla_dlw"/>
+                                <zip destfile="${servicejars.dir}/gorilla_dlw.jar" basedir="${servicejars.dir}/gorilla_dlw" />
+                                <delete dir="${servicejars.dir}/gorilla_dlw" />
 
                                 <!-- ================================================================ -->
                                 <!-- XML HTTP Tests -->
@@ -784,86 +742,74 @@
                                         <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/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/XPayloadStringProvider.jar"
-                                     basedir="${servicejars.dir}/XPayloadStringProvider"
-                                        />
-                                <delete dir="${servicejars.dir}/XPayloadStringProvider"/>
+                                <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/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/XMessageStringProvider.jar"
-                                     basedir="${servicejars.dir}/XMessageStringProvider"
-                                        />
-                                <delete dir="${servicejars.dir}/XMessageStringProvider"/>
+                                <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/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/XPayloadSourceProvider.jar"
-                                     basedir="${servicejars.dir}/XPayloadSourceProvider"
-                                        />
-                                <delete dir="${servicejars.dir}/XPayloadSourceProvider"/>
+                                <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/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/XMessageSourceProvider.jar"
-                                     basedir="${servicejars.dir}/XMessageSourceProvider"
-                                        />
-                                <delete dir="${servicejars.dir}/XMessageSourceProvider"/>
+                                <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/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/XMessageDataSourceProvider.jar"
-                                     basedir="${servicejars.dir}/XMessageDataSourceProvider"
-                                        />
-                                <delete dir="${servicejars.dir}/XMessageDataSourceProvider"/>
+                                <zip destfile="${servicejars.dir}/XMessageDataSourceProvider.jar" basedir="${servicejars.dir}/XMessageDataSourceProvider" />
+                                <delete dir="${servicejars.dir}/XMessageDataSourceProvider" />
 
                                 <!-- ================================================================ -->
                                 <!-- Java Bean Endpoint Samples -->
                                 <!-- ================================================================ -->
                                 <copy toDir="${servicejars.dir}/AddressBookService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/addressbook/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/addressbook/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/addressbook">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/AddressBookService.jar"
-                                     basedir="${servicejars.dir}/AddressBookService"
-                                        />
-                                <delete dir="${servicejars.dir}/AddressBookService"/>
+                                <zip destfile="${servicejars.dir}/AddressBookService.jar" basedir="${servicejars.dir}/AddressBookService" />
+                                <delete dir="${servicejars.dir}/AddressBookService" />
 
 
                                 <copy toDir="${servicejars.dir}/AppleFinderService/">
@@ -872,295 +818,252 @@
                                         <include name="org/apache/axis2/jaxws/type_substitution/jaxws/*" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/AppleFinderService.jar"
-                                     basedir="${servicejars.dir}/AppleFinderService"/>
-                                <delete dir="${servicejars.dir}/AppleFinderService"/>
+                                <zip 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/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/mtom/**" />
                                     </fileset>
 
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/mtom">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
 
                                 </copy>
-                                <zip destfile="${servicejars.dir}/MtomSampleService.jar"
-                                     basedir="${servicejars.dir}/MtomSampleService"
-                                        />
-                                <delete dir="${servicejars.dir}/MtomSampleService"/>
+                                <zip destfile="${servicejars.dir}/MtomSampleService.jar" basedir="${servicejars.dir}/MtomSampleService" />
+                                <delete dir="${servicejars.dir}/MtomSampleService" />
                                 <copy toDir="${servicejars.dir}/DocLitNonWrapService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/nonwrap/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/nonwrap/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/nonwrap">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/DocLitNonWrapService.jar"
-                                     basedir="${servicejars.dir}/DocLitNonWrapService"
-                                        />
-                                <delete dir="${servicejars.dir}/DocLitNonWrapService"/>
+                                <zip destfile="${servicejars.dir}/DocLitNonWrapService.jar" basedir="${servicejars.dir}/DocLitNonWrapService" />
+                                <delete dir="${servicejars.dir}/DocLitNonWrapService" />
                                 <copy toDir="${servicejars.dir}/DocLitWrapService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/wrap/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/wrap/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/wrap">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/DocLitWrapService.jar"
-                                     basedir="${servicejars.dir}/DocLitWrapService"
-                                        />
-                                <delete dir="${servicejars.dir}/DocLitWrapService"/>
+                                <zip destfile="${servicejars.dir}/DocLitWrapService.jar" basedir="${servicejars.dir}/DocLitWrapService" />
+                                <delete dir="${servicejars.dir}/DocLitWrapService" />
                                 <copy toDir="${servicejars.dir}/AddNumbersService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/addnumbers/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/addnumbers/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/addnumbers">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/AddNumbersService.jar"
-                                     basedir="${servicejars.dir}/AddNumbersService"
-                                        />
-                                <delete dir="${servicejars.dir}/AddNumbersService"/>
+                                <zip destfile="${servicejars.dir}/AddNumbersService.jar" basedir="${servicejars.dir}/AddNumbersService" />
+                                <delete dir="${servicejars.dir}/AddNumbersService" />
                                 <copy toDir="${servicejars.dir}/AddNumbersHandlerService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/addnumbershandler/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/addnumbershandler/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/addnumbershandler">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/AddNumbersHandlerService.jar"
-                                     basedir="${servicejars.dir}/AddNumbersHandlerService"
-                                        />
-                                <delete dir="${servicejars.dir}/AddNumbersHandlerService"/>
+                                <zip destfile="${servicejars.dir}/AddNumbersHandlerService.jar" basedir="${servicejars.dir}/AddNumbersHandlerService" />
+                                <delete dir="${servicejars.dir}/AddNumbersHandlerService" />
                                 <copy toDir="${servicejars.dir}/HeadersHandlerService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/headershandler/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/headershandler/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/headershandler">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/HeadersHandlerService.jar"
-                                     basedir="${servicejars.dir}/HeadersHandlerService"
-                                        />
-                                <delete dir="${servicejars.dir}/HeadersHandlerService"/>
+                                <zip destfile="${servicejars.dir}/HeadersHandlerService.jar" basedir="${servicejars.dir}/HeadersHandlerService" />
+                                <delete dir="${servicejars.dir}/HeadersHandlerService" />
                                 <copy toDir="${servicejars.dir}/GreeterService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/dlwmin/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/dlwmin/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/dlwmin">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/GreeterService.jar"
-                                     basedir="${servicejars.dir}/GreeterService"
-                                        />
-                                <delete dir="${servicejars.dir}/GreeterService"/>
+                                <zip 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/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/dlwminArrays/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/dlwminArrays">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/GenericService.jar"
-                                     basedir="${servicejars.dir}/GenericService"
-                                        />
-                                <delete dir="${servicejars.dir}/GenericService"/>
+                                <zip destfile="${servicejars.dir}/GenericService.jar" basedir="${servicejars.dir}/GenericService" />
+                                <delete dir="${servicejars.dir}/GenericService" />
 
                                 <copy toDir="${servicejars.dir}/AsyncService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/parallelasync/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/parallelasync/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/parallelasync/server">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/AsyncService.jar"
-                                     basedir="${servicejars.dir}/AsyncService"
-                                        />
-                                <delete dir="${servicejars.dir}/AsyncService"/>
+                                <zip destfile="${servicejars.dir}/AsyncService.jar" basedir="${servicejars.dir}/AsyncService" />
+                                <delete dir="${servicejars.dir}/AsyncService" />
 
                                 <copy toDir="${servicejars.dir}/AsyncService2/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/asyncdoclit/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/asyncdoclit/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/asyncdoclit/server">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/AsyncService2.jar"
-                                     basedir="${servicejars.dir}/AsyncService2"
-                                        />
-                                <delete dir="${servicejars.dir}/AsyncService2"/>
+                                <zip destfile="${servicejars.dir}/AsyncService2.jar" basedir="${servicejars.dir}/AsyncService2" />
+                                <delete dir="${servicejars.dir}/AsyncService2" />
 
                                 <copy toDir="${servicejars.dir}/FaultyWebServiceService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/faults/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/faults/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/faults">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/FaultyWebServiceService.jar"
-                                     basedir="${servicejars.dir}/FaultyWebServiceService"
-                                        />
-                                <delete dir="${servicejars.dir}/FaultyWebServiceService"/>
+                                <zip destfile="${servicejars.dir}/FaultyWebServiceService.jar" basedir="${servicejars.dir}/FaultyWebServiceService" />
+                                <delete dir="${servicejars.dir}/FaultyWebServiceService" />
 
                                 <copy toDir="${servicejars.dir}/FaultsService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/faultsservice/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/faultsservice/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/faultsservice">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/FaultsService.jar"
-                                     basedir="${servicejars.dir}/FaultsService"
-                                        />
-                                <delete dir="${servicejars.dir}/FaultsService"/>
+                                <zip destfile="${servicejars.dir}/FaultsService.jar" basedir="${servicejars.dir}/FaultsService" />
+                                <delete dir="${servicejars.dir}/FaultsService" />
 
                                 <copy toDir="${servicejars.dir}/BareDocLitService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/doclitbare/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/doclitbare/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/doclitbare">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/BareDocLitService.jar"
-                                     basedir="${servicejars.dir}/BareDocLitService"
-                                        />
-                                <delete dir="${servicejars.dir}/BareDocLitService"/>
+                                <zip destfile="${servicejars.dir}/BareDocLitService.jar" basedir="${servicejars.dir}/BareDocLitService" />
+                                <delete dir="${servicejars.dir}/BareDocLitService" />
 
                                 <copy toDir="${servicejars.dir}/EchoMessageService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/nonanonymous/complextype/**"/>
+                                        <include name="org/apache/axis2/jaxws/nonanonymous/complextype/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/nonanonymous/complextype">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/EchoMessageService.jar"
-                                     basedir="${servicejars.dir}/EchoMessageService"
-                                        />
-                                <delete dir="${servicejars.dir}/EchoMessageService"/>
+                                <zip destfile="${servicejars.dir}/EchoMessageService.jar" basedir="${servicejars.dir}/EchoMessageService" />
+                                <delete dir="${servicejars.dir}/EchoMessageService" />
 
                                 <copy toDir="${servicejars.dir}/ResourceInjectionService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/resourceinjection/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/resourceinjection/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/resourceinjection">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/ResourceInjectionService.jar"
-                                     basedir="${servicejars.dir}/ResourceInjectionService"
-                                        />
-                                <delete dir="${servicejars.dir}/ResourceInjectionService"/>
+                                <zip destfile="${servicejars.dir}/ResourceInjectionService.jar" basedir="${servicejars.dir}/ResourceInjectionService" />
+                                <delete dir="${servicejars.dir}/ResourceInjectionService" />
 
                                 <copy toDir="${servicejars.dir}/AnyTypeMessageService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/anytype/**"/>
+                                        <include name="org/apache/axis2/jaxws/anytype/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/anytype">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/AnyTypeMessageService.jar"
-                                     basedir="${servicejars.dir}/AnyTypeMessageService"
-                                        />
-                                <delete dir="${servicejars.dir}/AnyTypeMessageService"/>
+                                <zip destfile="${servicejars.dir}/AnyTypeMessageService.jar" basedir="${servicejars.dir}/AnyTypeMessageService" />
+                                <delete dir="${servicejars.dir}/AnyTypeMessageService" />
 
                                 <copy toDir="${servicejars.dir}/MessageContextService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/context/**"/>
+                                        <include name="org/apache/axis2/jaxws/context/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/context">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/MessageContextService.jar"
-                                     basedir="${servicejars.dir}/MessageContextService"
-                                        />
-                                <delete dir="${servicejars.dir}/MessageContextService"/>
+                                <zip destfile="${servicejars.dir}/MessageContextService.jar" basedir="${servicejars.dir}/MessageContextService" />
+                                <delete dir="${servicejars.dir}/MessageContextService" />
 
                                 <copy toDir="${servicejars.dir}/PolymorphicShapeService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/polymorphic/shape/**"/>
+                                        <include name="org/apache/axis2/jaxws/polymorphic/shape/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/polymorphic/shape">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/PolymorphicShapeService.jar"
-                                     basedir="${servicejars.dir}/PolymorphicShapeService"
-                                        />
-                                <delete dir="${servicejars.dir}/PolymorphicShapeService"/>
+                                <zip destfile="${servicejars.dir}/PolymorphicShapeService.jar" basedir="${servicejars.dir}/PolymorphicShapeService" />
+                                <delete dir="${servicejars.dir}/PolymorphicShapeService" />
 
                                 <copy toDir="${servicejars.dir}/RPCLitEnumService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/rpclit/enumtype/**"/>
+                                        <include name="org/apache/axis2/jaxws/rpclit/enumtype/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/rpclit/enumtype">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/RPCLitEnumService.jar"
-                                     basedir="${servicejars.dir}/RPCLitEnumService"
-                                        />
-                                <delete dir="${servicejars.dir}/RPCLitEnumService"/>
+                                <zip destfile="${servicejars.dir}/RPCLitEnumService.jar" basedir="${servicejars.dir}/RPCLitEnumService" />
+                                <delete dir="${servicejars.dir}/RPCLitEnumService" />
 
                                 <copy toDir="${servicejars.dir}/RPCLitStringArrayService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/rpclit/stringarray/**"/>
-                                        <include name="org/test/rpclit/stringarray/**"/>
+                                        <include name="org/apache/axis2/jaxws/rpclit/stringarray/**" />
+                                        <include name="org/test/rpclit/stringarray/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/rpclit/stringarray/">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/RPCLitStringArrayService.jar"
-                                     basedir="${servicejars.dir}/RPCLitStringArrayService"
-                                        />
-                                <delete dir="${servicejars.dir}/RPCLitStringArrayService"/>
+                                <zip destfile="${servicejars.dir}/RPCLitStringArrayService.jar" basedir="${servicejars.dir}/RPCLitStringArrayService" />
+                                <delete dir="${servicejars.dir}/RPCLitStringArrayService" />
 
 
                                 <copy toDir="${servicejars.dir}/BareDocLitMinService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/sample/doclitbaremin/**"/>
+                                        <include name="org/apache/axis2/jaxws/sample/doclitbaremin/**" />
                                     </fileset>
                                     <fileset dir="test/org/apache/axis2/jaxws/sample/doclitbaremin/">
-                                        <include name="META-INF/**"/>
+                                        <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/BareDocLitMinService.jar"
-                                     basedir="${servicejars.dir}/BareDocLitMinService"
-                                        />
-                                <delete dir="${servicejars.dir}/BareDocLitMinService"/>
+                                <zip destfile="${servicejars.dir}/BareDocLitMinService.jar" basedir="${servicejars.dir}/BareDocLitMinService" />
+                                <delete dir="${servicejars.dir}/BareDocLitMinService" />
 
                                 <copy toDir="${servicejars.dir}/StringListService/">
                                     <fileset dir="target/test-classes">
@@ -1170,51 +1073,43 @@
                                         <include name="META-INF/**" />
                                     </fileset>
                                 </copy>
-                                <zip destfile="${servicejars.dir}/StringListService.jar"
-                                     basedir="${servicejars.dir}/StringListService"
-                                        />
-                                <delete dir="${servicejars.dir}/StringListService"/>
+                                <zip destfile="${servicejars.dir}/StringListService.jar" basedir="${servicejars.dir}/StringListService" />
+                                <delete dir="${servicejars.dir}/StringListService" />
                                 
 								<copy toDir="${servicejars.dir}/SOAPBindingProviderService/">
 									<fileset dir="target/test-classes">
 									   <include name="org/apache/axis2/jaxws/provider/soapbinding/SOAPBindingProvider**" />
 									</fileset>
 									<fileset dir="test/org/apache/axis2/jaxws/provider/soapbinding">
-									   <include name="META-INF/**"/>
+									   <include name="META-INF/**" />
 									</fileset>
 								</copy>
-								<zip destfile="${servicejars.dir}/SOAPBindingProviderService.jar"
-						             basedir="${servicejars.dir}/SOAPBindingProviderService"
-						        />
+								<zip destfile="${servicejars.dir}/SOAPBindingProviderService.jar" basedir="${servicejars.dir}/SOAPBindingProviderService" />
 						        
-						        <delete dir="${servicejars.dir}/SOAPBindingProviderService"/>
+						        <delete dir="${servicejars.dir}/SOAPBindingProviderService" />
 						        
 								<copy toDir="${servicejars.dir}/SOAPBindingStringProviderService/">
 									<fileset dir="target/test-classes">
 									   <include name="org/apache/axis2/jaxws/provider/soapbinding/string/**" />
 									</fileset>
 									<fileset dir="test/org/apache/axis2/jaxws/provider/soapbinding/string">
-									   <include name="META-INF/**"/>
+									   <include name="META-INF/**" />
 									</fileset>
 								</copy>
 								
-								<zip destfile="${servicejars.dir}/SOAPBindingStringProviderService.jar"
-						             basedir="${servicejars.dir}/SOAPBindingStringProviderService"
-						        />
-						        <delete dir="${servicejars.dir}/SOAPBindingStringProviderService"/>
+								<zip destfile="${servicejars.dir}/SOAPBindingStringProviderService.jar" basedir="${servicejars.dir}/SOAPBindingStringProviderService" />
+						        <delete dir="${servicejars.dir}/SOAPBindingStringProviderService" />
 						        
 								<copy toDir="${servicejars.dir}/SoapMessageProviderService/">
 									<fileset dir="target/test-classes">
 									   <include name="org/apache/axis2/jaxws/provider/soapbinding/soapmsg/**" />
 									</fileset>
 									<fileset dir="test/org/apache/axis2/jaxws/provider/soapbinding/soapmsg">
-									   <include name="META-INF/**"/>
+									   <include name="META-INF/**" />
 									</fileset>
 								</copy>
-								<zip destfile="${servicejars.dir}/SoapMessageProviderService.jar"
-						             basedir="${servicejars.dir}/SoapMessageProviderService"
-						        />
-						        <delete dir="${servicejars.dir}/SoapMessageProviderService"/>
+								<zip destfile="${servicejars.dir}/SoapMessageProviderService.jar" basedir="${servicejars.dir}/SoapMessageProviderService" />
+						        <delete dir="${servicejars.dir}/SoapMessageProviderService" />
 						        
 								<copy toDir="${servicejars.dir}/HandlerHeaderService/">
 									<fileset dir="target/test-classes">
@@ -1222,7 +1117,7 @@
 									</fileset>
 									<fileset dir="test/org/apache/axis2/jaxws/handler/header">
 									   <include name="META-INF/**" />
-									   <include name="handler.xml" />									   
+									   <include name="handler.xml" />			   
 									</fileset>
 									
 								</copy>	
@@ -1233,47 +1128,39 @@
 									</fileset>
 								</copy>
 								
-								<zip destfile="${servicejars.dir}/HandlerHeaderService.jar"
-									basedir="${servicejars.dir}/HandlerHeaderService"
-								/>
+								<zip destfile="${servicejars.dir}/HandlerHeaderService.jar" basedir="${servicejars.dir}/HandlerHeaderService" />
 								
-								<delete dir="${servicejars.dir}/HandlerHeaderService"/>
+								<delete dir="${servicejars.dir}/HandlerHeaderService" />
 								
 								<copy toDir="${servicejars.dir}/ProcessDocumentService/">
 									<fileset dir="target/test-classes">
-									   <include name="org/apache/axis2/jaxws/sample/mtomfeature/**"/>
+									   <include name="org/apache/axis2/jaxws/sample/mtomfeature/**" />
 									</fileset>
 									<fileset dir="test/org/apache/axis2/jaxws/sample/mtomfeature/">
-									   <include name="META-INF/**"/>
+									   <include name="META-INF/**" />
 									</fileset>
 								</copy>
-								<zip destfile="${servicejars.dir}/ProcessDocumentService.jar"
-									basedir="${servicejars.dir}/ProcessDocumentService"
-								/>
+								<zip destfile="${servicejars.dir}/ProcessDocumentService.jar" basedir="${servicejars.dir}/ProcessDocumentService" />
 								
-								<delete dir="${servicejars.dir}/ProcessDocumentService"/>
+								<delete dir="${servicejars.dir}/ProcessDocumentService" />
 								
                                 <copy toDir="${servicejars.dir}/JAXBStringService/">
                                     <fileset dir="target/test-classes">
-                                        <include name="org/apache/axis2/jaxws/jaxb/string/**"/>
+                                        <include name="org/apache/axis2/jaxws/jaxb/string/**" />
                                     </fileset>
                                 </copy>
 
-                                <zip destfile="${servicejars.dir}/JAXBStringService.jar"
-                                     basedir="${servicejars.dir}/JAXBStringService"
-                                        />
+                                <zip destfile="${servicejars.dir}/JAXBStringService.jar" basedir="${servicejars.dir}/JAXBStringService" />
                                         
-                                <delete dir="${servicejars.dir}/JAXBStringService"/>
+                                <delete dir="${servicejars.dir}/JAXBStringService" />
                                 
                                 <copy toDir="${servicejars.dir}/OMProviderService/">
 									<fileset dir="target/test-classes">
-									   <include name="org/apache/axis2/jaxws/provider/om/**"/>
+									   <include name="org/apache/axis2/jaxws/provider/om/**" />
 									</fileset>
 								</copy>
-								<zip destfile="${servicejars.dir}/OMProviderService.jar"
-						             basedir="${servicejars.dir}/OMProviderService"
-						        />
-						        <delete dir="${servicejars.dir}/OMProviderService"/>      
+								<zip destfile="${servicejars.dir}/OMProviderService.jar" basedir="${servicejars.dir}/OMProviderService" />
+						        <delete dir="${servicejars.dir}/OMProviderService" />
                                 <copy toDir="target/test-classes/">
                                     <fileset dir="test-resources/">
                                         <include name="**/*.properties" />

Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Sun Sep 26 17:58:15 2010
@@ -18,8 +18,7 @@
   ~ 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">   
+<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.axis2</groupId>
@@ -226,12 +225,11 @@
                         <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"/>
+                                <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}" />
@@ -243,10 +241,10 @@
 
                                 <echo>Generating java from echo.xsd</echo>
                                 <java classname="com.sun.tools.xjc.Driver" fork="true">
-                                    <classpath refid="maven.runtime.classpath"/>
+                                    <classpath refid="maven.runtime.classpath" />
                                     
-                                    <classpath location="${compiled.classes.dir}"/>
-                                    <arg line="-d ${schema.generated.src.dir} -quiet  ${schema.source.dir}/echo.xsd"/>
+                                    <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>

Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=1001486&r1=1001485&r2=1001486&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Sun Sep 26 17:58:15 2010
@@ -118,11 +118,11 @@
                         <configuration>
                             <tasks unless="maven.test.skip">
                                 <java classname="org.jibx.binding.Compile" fork="true">
-                                    <classpath refid="maven.runtime.classpath"/>
-                                    <classpath location="target/test-classes"/>
-                                    <arg value="-v"/>
-                                    <arg value="test-resources/binding/customer-binding.xml"/>
-                                    <arg value="test-resources/binding/library-binding.xml"/>
+                                    <classpath refid="maven.runtime.classpath" />
+                                    <classpath location="target/test-classes" />
+                                    <arg value="-v" />
+                                    <arg value="test-resources/binding/customer-binding.xml" />
+                                    <arg value="test-resources/binding/library-binding.xml" />
                                 </java>
                             </tasks>
                         </configuration>