Author: veithen Date: Thu Jul 22 19:46:59 2010 New Revision: 966825 URL: http://svn.apache.org/viewvc?rev=966825&view=rev Log: Some format changes in POM files to avoid spurious changes during the release process.
Modified: axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws-integration/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws-mar/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jibx/pom.xml axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml axis/axis2/java/core/branches/java/1_5/modules/metadata/pom.xml axis/axis2/java/core/branches/java/1_5/modules/mex/pom.xml axis/axis2/java/core/branches/java/1_5/modules/mtompolicy-mar/pom.xml axis/axis2/java/core/branches/java/1_5/modules/mtompolicy/pom.xml axis/axis2/java/core/branches/java/1_5/modules/osgi/pom.xml axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml axis/axis2/java/core/branches/java/1_5/modules/ping/pom.xml axis/axis2/java/core/branches/java/1_5/modules/resource-bundle/pom.xml axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml axis/axis2/java/core/branches/java/1_5/modules/samples/pom.xml axis/axis2/java/core/branches/java/1_5/modules/samples/version/pom.xml axis/axis2/java/core/branches/java/1_5/modules/scripting/pom.xml axis/axis2/java/core/branches/java/1_5/modules/soapmonitor/pom.xml axis/axis2/java/core/branches/java/1_5/modules/spring/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-aar-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-ant-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-codegen-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-eclipse-service-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-idea-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-mar-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/local/pom.xml axis/axis2/java/core/branches/java/1_5/modules/webapp/pom.xml axis/axis2/java/core/branches/java/1_5/modules/xmlbeans/pom.xml axis/axis2/java/core/branches/java/1_5/pom.xml Modified: axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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> @@ -116,13 +115,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> @@ -136,20 +135,18 @@ <phase>generate-test-sources</phase> <configuration> <tasks unless="maven.test.skip"> - <property name="maven.junit.jvmargs" value=""/> + <property name="maven.junit.jvmargs" value="" /> <path id="maven.dependency.classpath"> - <path refid="maven.compile.classpath"/> + <path refid="maven.compile.classpath" /> </path> - <property name="compiled.classes.dir" value="target/classes"/> + <property name="compiled.classes.dir" value="target/classes" /> <!-- Theres got to be a better way to do this --> - <property name="schema.source.dir" value="test-resources/xsd"/> - <property name="testsuite.source.dir" value="test-resources/testsuite"/> - <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"/> - <ant antfile="sub-build.xml" inheritall="true" inheritrefs="true" dir="." - target="main"/> + <property name="schema.source.dir" value="test-resources/xsd" /> + <property name="testsuite.source.dir" value="test-resources/testsuite" /> + <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" /> + <ant antfile="sub-build.xml" inheritall="true" inheritrefs="true" dir="." target="main" /> </tasks> </configuration> <goals> Modified: axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,10 +19,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/branches/java/1_5/modules/addressing/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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/branches/java/1_5/modules/clustering/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/clustering/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,9 +19,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/branches/java/1_5/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/codegen/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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> @@ -142,15 +141,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> @@ -163,13 +161,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/branches/java/1_5/modules/corba/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/corba/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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/branches/java/1_5/modules/fastinfoset/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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> @@ -167,49 +166,48 @@ <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.runtime.classpath"/> - <property name="maven.test.path" refid="maven.compile.classpath"/> + <property name="maven.class.path" refid="maven.runtime.classpath" /> + <property name="maven.test.path" refid="maven.compile.classpath" /> <!-- copy the mars so that they are available on the test classpath --> - <copy file="../addressing/target/addressing-${project.version}.mar" - tofile="target/test-classes/modules/addressing-${project.version}.mar"/> + <copy file="../addressing/target/addressing-${project.version}.mar" tofile="target/test-classes/modules/addressing-${project.version}.mar" /> - <property name="axis2.home" value="${basedir}/target"/> + <property name="axis2.home" value="${basedir}/target" /> <path id="maven.dependency.classpath"> - <path refid="maven.compile.classpath"/> + <path refid="maven.compile.classpath" /> </path> <!-- compiling some custom wsdl files --> - <property name="wsdl.source.dir" value="test-resources/wsdl"/> - <property name="wsdl.output.base.dir" value="target/wsdl"/> + <property name="wsdl.source.dir" value="test-resources/wsdl" /> + <property name="wsdl.output.base.dir" value="target/wsdl" /> <!-- make the dirs --> - <mkdir dir="${wsdl.output.base.dir}"/> + <mkdir dir="${wsdl.output.base.dir}" /> <echo>Compiling Service class</echo> <javac fork="true" destdir="target/test-classes" debug="on"> - <classpath refid="maven.dependency.classpath"/> - <classpath location="${compiled.classes.dir}"/> - <include name="**/*SimpleAddService.java"/> - <src path="test/"/> + <classpath refid="maven.dependency.classpath" /> + <classpath location="${compiled.classes.dir}" /> + <include name="**/*SimpleAddService.java" /> + <src path="test/" /> </javac> <echo>Generating the WSDL</echo> <java classname="org.apache.ws.java2wsdl.Java2WSDL" fork="true"> <classpath> - <path refid="maven.dependency.classpath"/> - <pathelement location="target/test-classes"/> + <path refid="maven.dependency.classpath" /> + <pathelement location="target/test-classes" /> </classpath> - <arg line="-o target/test-classes -of SimpleAddService.wsdl -efd unqualified -cn org.apache.axis2.fastinfoset.SimpleAddService"/> + <arg line="-o target/test-classes -of SimpleAddService.wsdl -efd unqualified -cn org.apache.axis2.fastinfoset.SimpleAddService" /> </java> <echo>Compiling SimpleAddService.wsdl</echo> - <mkdir dir="${wsdl.output.base.dir}/simpleAddService"/> + <mkdir dir="${wsdl.output.base.dir}/simpleAddService" /> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <classpath refid="maven.runtime.classpath"/> - <classpath location="${compiled.classes.dir}"/> - <arg line="-uri target/test-classes/SimpleAddService.wsdl -o target/wsdl/simpleAddService -S . -or"/> + <classpath refid="maven.runtime.classpath" /> + <classpath location="${compiled.classes.dir}" /> + <arg line="-uri target/test-classes/SimpleAddService.wsdl -o target/wsdl/simpleAddService -S . -or" /> </java> <javac fork="true" destdir="target/classes" debug="on"> - <classpath refid="maven.runtime.classpath"/> - <classpath location="${compiled.classes.dir}"/> - <src path="target/wsdl/simpleAddService"/> + <classpath refid="maven.runtime.classpath" /> + <classpath location="${compiled.classes.dir}" /> + <src path="target/wsdl/simpleAddService" /> </javac> </tasks> Modified: axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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> @@ -311,15 +310,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.runtime.classpath"/> + <property name="maven.class.path" refid="maven.runtime.classpath" /> <echo>Building enterprise 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="itest-build.xml" inheritall="true" inheritrefs="true" - dir="." target="enterprise-wsdl-codegen"/> + <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="enterprise-wsdl-codegen" /> </tasks> </configuration> <goals> @@ -385,14 +383,13 @@ <configuration> <tasks unless="maven.test.skip"> <condition property="test.skip"> - <equals arg1="true" arg2="${maven.test.skip}"/> + <equals arg1="true" arg2="${maven.test.skip}" /> </condition> <echo>${test.skip}</echo> - <property name="addressing_version" value="${project.version}"/> - <property name="maven.class.path" refid="maven.runtime.classpath"/> - <property name="maven.test.path" refid="maven.compile.classpath"/> - <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" - dir="." target="generate-test-sources"/> + <property name="addressing_version" value="${project.version}" /> + <property name="maven.class.path" refid="maven.runtime.classpath" /> + <property name="maven.test.path" refid="maven.compile.classpath" /> + <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="generate-test-sources" /> </tasks> </configuration> <goals> @@ -405,18 +402,17 @@ <configuration> <tasks unless="maven.test.skip"> <condition property="test.skip"> - <equals arg1="true" arg2="${maven.test.skip}"/> + <equals arg1="true" arg2="${maven.test.skip}" /> </condition> <echo>${test.skip}</echo> - <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="addressing_version" value="${project.version}" /> + <property name="groovy.all.version" value="${groovy.all.version}" /> + <property name="maven.repo.local" value="${settings.localRepository}" /> <path id="maven.dependency.classpath"> - <path refid="maven.compile.classpath"/> - <path refid="maven.runtime.classpath"/> + <path refid="maven.compile.classpath" /> + <path refid="maven.runtime.classpath" /> </path> - <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" - dir="." target="build-repos"/> + <ant antfile="itest-build.xml" inheritall="true" inheritrefs="true" dir="." target="build-repos" /> </tasks> </configuration> <goals> Modified: axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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/branches/java/1_5/modules/jaxbri/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml?rev=966825&r1=966824&r2=966825&view=diff ============================================================================== --- axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml Thu Jul 22 19:46:59 2010 @@ -19,8 +19,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> @@ -125,33 +124,32 @@ <phase>generate-test-sources</phase> <configuration> <tasks unless="maven.test.skip"> - <property name="axis2.home" value="${basedir}/target"/> - <property name="maven.class.path" refid="maven.runtime.classpath"/> + <property name="axis2.home" value="${basedir}/target" /> + <property name="maven.class.path" refid="maven.runtime.classpath" /> <!-- 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}"/> - <mkdir dir="${schema.generated.src.dir}"/> - <mkdir dir="${schema.generated.classes.dir}"/> + <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 for DocLitBareService test</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}/DocLitBareService.wsdl"/> + <classpath refid="maven.runtime.classpath" /> + <classpath location="${compiled.classes.dir}" /> + <arg line="-d ${schema.generated.src.dir} -quiet -wsdl ${wsdl.source.dir}/DocLitBareService.wsdl" /> </java> <echo>Generating Service / Service Client for Test01 test</echo> <java classname="org.apache.axis2.wsdl.WSDL2Java" fork="true"> - <classpath refid="maven.runtime.classpath"/> - <classpath location="${compiled.classes.dir}"/> - <arg line="-d jaxbri -ss -sd -t -o target/wsdl/Test01 -u -uri ${wsdl.source.dir}/Test01.wsdl"/> + <classpath refid="maven.runtime.classpath" /> + <classpath location="${compiled.classes.dir}" /> + <arg line="-d jaxbri -ss -sd -t -o target/wsdl/Test01 -u -uri ${wsdl.source.dir}/Test01.wsdl" /> </java> - <ant dir="target/wsdl/Test01"/> + <ant dir="target/wsdl/Test01" /> </tasks> </configuration> <goals>