Modified: axis/axis2/java/core/trunk/modules/json/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/json/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/json/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/kernel/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Thu Jul 22 21:01:28 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> @@ -178,12 +177,11 @@ <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> - <filter token="axisVersion" value="${project.version}"/> - <filter token="TODAY" value="${build.time}"/> - <copy toDir="${basedir}/target/classes/org/apache/axis2/i18n" overwrite="true" - filtering="on" file="${basedir}/src/org/apache/axis2/i18n/resource.properties"/> + <filter token="axisVersion" value="${project.version}" /> + <filter token="TODAY" value="${build.time}" /> + <copy toDir="${basedir}/target/classes/org/apache/axis2/i18n" overwrite="true" filtering="on" file="${basedir}/src/org/apache/axis2/i18n/resource.properties" /> </tasks> </configuration> <goals> @@ -221,9 +219,8 @@ <phase>test-compile</phase> <configuration> <tasks unless="maven.test.skip"> - <property name="maven.build.dir" location="${basedir}/target"/> - <ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" - dir="test-resources/"/> + <property name="maven.build.dir" location="${basedir}/target" /> + <ant antfile="j2secbuild.xml" inheritall="true" inheritrefs="true" dir="test-resources/" /> </tasks> </configuration> <goals> Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:966825* +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/JSR181HelperImpl.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/NullJSR181Helper.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebMethodAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebParamAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebResultAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/WebServiceAnnotation.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/jsr181/package-info.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:966825 +/webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/jsr181/package-info.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:966825 /webservices/axis2/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:765840 Propchange: axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:966825 /webservices/axis2/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:765840 Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Thu Jul 22 21:01:28 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> @@ -192,23 +191,22 @@ <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}"/> - <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 from XSDs</echo> <echo>Generating java from ProxyDocLitWrapped.wsdl</echo> <java classname="com.sun.tools.xjc.Driver" fork="true"> - <classpath refid="maven.runtime.classpath"/> - <classpath location="${compiled.classes.dir}"/> - <arg line="-d ${schema.generated.src.dir} -quiet -p org.test.proxy.doclitwrapped -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitWrapped.wsdl"/> + <classpath refid="maven.runtime.classpath" /> + <classpath location="${compiled.classes.dir}" /> + <arg line="-d ${schema.generated.src.dir} -quiet -p org.test.proxy.doclitwrapped -quiet -wsdl ${wsdl.source.dir}/ProxyDocLitWrapped.wsdl" /> </java> </tasks> </configuration> @@ -223,15 +221,14 @@ <tasks unless="maven.test.skip"> <copy toDir="target/test-classes/"> <fileset dir="test-resources/"> - <include name="**/*.properties"/> + <include name="**/*.properties" /> </fileset> <fileset dir="test"> - <include name="org/apache/axis2/jaxws/description/HandlerConfigFile.xml"/> + <include name="org/apache/axis2/jaxws/description/HandlerConfigFile.xml" /> </fileset> </copy> - <property name="addressing_version" value="${project.version}"/> - <ant antfile="build.xml" inheritall="true" inheritrefs="true" - dir="." target="build-repo"/> + <property name="addressing_version" value="${project.version}" /> + <ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="." target="build-repo" /> </tasks> </configuration> <goals> Modified: axis/axis2/java/core/trunk/modules/mex/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mex/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/mex/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/mex/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/mtompolicy-mar/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/mtompolicy-mar/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/mtompolicy/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/mtompolicy/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/osgi/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/osgi/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/osgi/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/osgi/pom.xml Thu Jul 22 21:01:28 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";> <parent> <groupId>org.apache.axis2</groupId> Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Thu Jul 22 21:01:28 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";> <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> @@ -341,7 +339,6 @@ <name>Davanum Srinivas</name> <id>dims</id> <email>davanum AT gmail.com</email> - <organization></organization> </developer> <developer> <name>Jayachandra Sekhara Rao Sunkara</name> @@ -375,7 +372,6 @@ <name>Eranga Jayasundera</name> <id>eranga</id> <email>eranga AT apache.org</email> - <organization></organization> </developer> <developer> <name>Sanjiva Weerawarana</name> @@ -404,7 +400,6 @@ </contributor> <contributor> <name>Dharshana Dias</name> - <email/> <organization>Lanka Software Foundation / University of Moratuwa</organization> </contributor> <contributor> @@ -429,7 +424,6 @@ </contributor> <contributor> <name>Chinthaka Thilakarathne</name> - <email/> <organization>Lanka Software Foundation / University of Moratuwa</organization> </contributor> <contributor> Modified: axis/axis2/java/core/trunk/modules/ping/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/ping/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/ping/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/ping/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/resource-bundle/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/resource-bundle/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/resource-bundle/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/saaj/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/saaj/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/saaj/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/saaj/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/samples/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/samples/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/pom.xml Thu Jul 22 21:01:28 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> @@ -139,18 +138,16 @@ <phase>process-test-resources</phase> <configuration> <tasks unless="maven.test.skip"> - <mkdir dir="target/version"/> + <mkdir dir="target/version" /> <jar destfile="target/version/version.jar"> <fileset dir="version/target/classes"> - <include name="sample/axisversion/**"/> + <include name="sample/axisversion/**" /> </fileset> <fileset dir="version/src/sample/axisversion/"> - <include name="META-INF/services.xml"/> + <include name="META-INF/services.xml" /> </fileset> </jar> - <copy file="target/version/version.jar" - tofile="target/toWar/services/version.aar"/> - + <copy file="target/version/version.jar" tofile="target/toWar/services/version.aar" /> </tasks> </configuration> <goals> @@ -162,7 +159,7 @@ <phase>test-compile</phase> <configuration> <tasks unless="maven.test.skip"> - <property name="maven.build.dir" location="${basedir}/target"/> + <property name="maven.build.dir" location="${basedir}/target" /> </tasks> </configuration> <goals> Modified: axis/axis2/java/core/trunk/modules/samples/version/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/version/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/samples/version/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/samples/version/pom.xml Thu Jul 22 21:01:28 2010 @@ -17,8 +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/scripting/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/scripting/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/scripting/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/spring/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/spring/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/spring/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/spring/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/tool/axis2-ant-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Thu Jul 22 21:01:28 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> @@ -258,7 +257,7 @@ <Embed-Transitive>true</Embed-Transitive> <!-- Exclude imports that are actually not used --> <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!com.sun.*,!org.apache.xmlbeans.*,!org.xmlpull.*,!org.apache.commons.io*,*</Import-Package> - <Export-Package></Export-Package> + <Export-Package /> <Bundle-Name>Axis2 Codegen Wizard Plug-in</Bundle-Name> <Bundle-Activator>org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin</Bundle-Activator> <Bundle-SymbolicName>org.apache.axis2.eclipse.codegen.plugin;singleton:=true</Bundle-SymbolicName> Modified: axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-eclipse-service-plugin/pom.xml Thu Jul 22 21:01:28 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> @@ -231,7 +230,7 @@ <Embed-Transitive>true</Embed-Transitive> <!-- Exclude imports that are actually not used --> <Import-Package>!org.dom4j*,!nu.xom,!org.jdom*,!javax.portlet,!org.apache.commons.io*,*</Import-Package> - <Export-Package></Export-Package> + <Export-Package /> <Bundle-Name>Axis2 Service Maker</Bundle-Name> <Bundle-Activator>org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver</Bundle-Activator> <Bundle-SymbolicName>org.apache.axis2.eclipse.service.plugin;singleton:=true</Bundle-SymbolicName> Modified: axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/transport/http/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/http/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/transport/http/pom.xml Thu Jul 22 21:01:28 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> Propchange: axis/axis2/java/core/trunk/modules/transport/http/pom.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1,2 +1,3 @@ +/axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml:966825 /webservices/axis2/branches/java/1_5/modules/transport/http/pom.xml:765840,790721 /webservices/axis2/tags/java/v1.5/modules/transport/http/pom.xml:790721 Propchange: axis/axis2/java/core/trunk/modules/transport/http/src/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/transport/http/src:966825 /webservices/axis2/branches/java/1_5/modules/transport/http/src:765840 Propchange: axis/axis2/java/core/trunk/modules/transport/local/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/transport/local:966825 /webservices/axis2/branches/java/1_5/modules/transport/local:765840 Modified: axis/axis2/java/core/trunk/modules/transport/local/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/local/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/transport/local/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/transport/local/pom.xml Thu Jul 22 21:01:28 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/trunk/modules/webapp/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/webapp/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/webapp/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/webapp/pom.xml Thu Jul 22 21:01:28 2010 @@ -17,9 +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> Propchange: axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport:966825* +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/ ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http:966825* +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -0,0 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:966825 +/webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/transport/http/AxisAdminServlet.java:745088,749052,749058,751161,751271,760467,765840,790721 Propchange: axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:966825 /webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:765840 Propchange: axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Jul 22 21:01:28 2010 @@ -1 +1,2 @@ +/axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:966825 /webservices/axis2/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:765840 Modified: axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/xmlbeans/pom.xml Thu Jul 22 21:01:28 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> @@ -105,8 +104,8 @@ <phase>generate-test-sources</phase> <configuration> <tasks unless="maven.test.skip"> - <property name="cp" refid="maven.runtime.classpath"/> - <echo message="${cp}" file="target/cp.txt"/> + <property name="cp" refid="maven.runtime.classpath" /> + <echo message="${cp}" file="target/cp.txt" /> </tasks> </configuration> <goals> Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=966855&r1=966854&r2=966855&view=diff ============================================================================== --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Thu Jul 22 21:01:28 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";> <parent> <groupId>org.apache</groupId> <artifactId>apache</artifactId> @@ -154,16 +152,16 @@ <phase>package</phase> <configuration> <tasks> - <mkdir dir="target/lib"/> + <mkdir dir="target/lib" /> <jar destfile="target/lib/axis2-${pom.version}.jar"> - <fileset dir="modules/java2wsdl/target/classes"/> - <fileset dir="modules/kernel/target/classes"/> - <fileset dir="modules/addressing/target/classes"/> - <fileset dir="modules/codegen/target/classes"/> - <fileset dir="modules/adb/target/classes"/> - <fileset dir="modules/adb-codegen/target/classes"/> - <fileset dir="modules/xmlbeans/target/classes"/> - <fileset dir="modules/clustering/target/classes"/> + <fileset dir="modules/java2wsdl/target/classes" /> + <fileset dir="modules/kernel/target/classes" /> + <fileset dir="modules/addressing/target/classes" /> + <fileset dir="modules/codegen/target/classes" /> + <fileset dir="modules/adb/target/classes" /> + <fileset dir="modules/adb-codegen/target/classes" /> + <fileset dir="modules/xmlbeans/target/classes" /> + <fileset dir="modules/clustering/target/classes" /> </jar> </tasks> </configuration>
