You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2007/05/12 17:15:08 UTC
svn commit: r537458 - in /webservices/axis2/trunk/java/modules:
adb-codegen/maven.xml adb-codegen/pom.xml integration/itest-build.xml
integration/maven.xml parent/pom.xml
Author: davidillsley
Date: Sat May 12 08:15:07 2007
New Revision: 537458
URL: http://svn.apache.org/viewvc?view=rev&rev=537458
Log:
More m2 pom cleanup
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/maven.xml
webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
webservices/axis2/trunk/java/modules/integration/itest-build.xml
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/parent/pom.xml
Modified: webservices/axis2/trunk/java/modules/adb-codegen/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/maven.xml?view=diff&rev=537458&r1=537457&r2=537458
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/maven.xml Sat May 12 08:15:07 2007
@@ -1,7 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Revision: 1.21 $ $Date: 2004-10-27 20:54:09 +0600 (Wed, 27 Oct 2004) $ -->
-
<project default="jar"
xmlns:j="jelly:core"
xmlns:u="jelly:util"
@@ -17,304 +14,9 @@
</j:if>
</preGoal>
-<!-- run the schema compiler -->
- <preGoal name="test:compile">
- <!--<j:if test="context.getVariable('maven.test.skip') != 'true'}">-->
-
- <j:set var="compiled.classes.dir" value="target/classes"/>
- <!-- Theres got to be a better way to do this -->
- <j:set var="schema.source.dir" value="test-resources/xsd"/>
- <j:set var="testsuite.source.dir" value="test-resources/testsuite"/>
- <j:set var="schema.output.base.dir" value="target/schema"/>
- <j:set var="schema.generated.src.dir" value="${schema.output.base.dir}/src"/>
- <j:set var="schema.generated.classes.dir" value="${schema.output.base.dir}/classes"/>
- <!-- make the dirs -->
- <mkdir dir="${schema.output.base.dir}"/>
- <mkdir dir="${schema.generated.src.dir}"/>
- <mkdir dir="${schema.generated.classes.dir}"/>
- <!-- Run schema compiler with designated schemas -->
- <ant:echo>Compiling simple_maxOccurs2.xsd</ant:echo>
- <!-- simple max occurs 2 xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs2.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <ant:echo>Compiling anonymous_complexType.xsd</ant:echo>
- <!-- anon complex type xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/anonymous_complexType.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- anon choice xsd -->
- <ant:echo>Compiling simple_choice.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- anon particle all xsd -->
- <ant:echo>Compiling simple_particle_all.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_particle_all.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- simple max occurs xsd -->
- <ant:echo>Compiling simple_maxOccurs.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- simple any type xsd -->
- <ant:echo>Compiling simple_anytype.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_anytype.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
-
- <!-- min occurs 0 xsd -->
- <ant:echo>Compiling simple-minoccurs0.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple-minoccurs0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- complex min occurs 0 xsd -->
- <ant:echo>Compiling complex-minoccurs0.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/complex-minoccurs0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <ant:echo>Compiling simple-recursive-datatypes.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple-recursive-datatypes.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <ant:echo>Compiling mixed_minoccus0.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/mixed_minoccus0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple primitive types xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple/simpleType-All.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- All simple derived types xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/derived/derivedType-All.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling complete.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/complete.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling simpleExtension.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/extensions.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling union.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/union.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling all.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/all.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling enumeration.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/enumeration.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling restrictions.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/restrictions.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling choice.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling list.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/list.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling element_references.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/element_references.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling innersequence_choice.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/innersequence_choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling testattribute.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/testattribute.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling boolean.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/boolean.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling particalMaxOccures.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/particalMaxOccures.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling innerParticles.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/innerParticles.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <ant:echo>Compiling default_namespaces.xsd</ant:echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.dependency.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/default_namespaces.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- Compile the generated classes -->
- <javac destdir="${schema.generated.classes.dir}" srcdir="${schema.generated.src.dir}">
- <classpath refid="maven.dependency.classpath"></classpath>
- <classpath location="${compiled.classes.dir}"></classpath>
- </javac>
-
- <ant:path id="schema.generated.classes.dir" location="${schema.generated.classes.dir}"/>
+ <preGoal name="test:compile">
+ <ant:ant antfile="sub-build.xml" inheritall="true" inheritrefs="true" dir="." target="main"/>
+ <ant:path id="schema.generated.classes.dir" location="target/schema/classes"/>
<maven:addPath id="maven.dependency.classpath" refid="schema.generated.classes.dir"/>
- <!--</j:if>-->
</preGoal>
</project>
Modified: webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/pom.xml?view=diff&rev=537458&r1=537457&r2=537458
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/pom.xml Sat May 12 08:15:07 2007
@@ -46,7 +46,15 @@
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
@@ -100,280 +108,11 @@
<phase>generate-test-sources</phase>
<configuration>
<tasks>
- <property name="compiled.classes.dir" location="target/classes"/>
- <property name="test.compiled.classes.dir" location="target/test-classes"/>
- <property name="schema.source.dir" location="test-resources/xsd"/>
- <property name="testsuite.source.dir" location="test-resources/testsuite"/>
- <property name="schema.output.base.dir" location="target/schema"/>
- <property name="schema.generated.src.dir" location="${schema.output.base.dir}/src"/>
- <property name="schema.generated.classes.dir"
- location="${schema.output.base.dir}/classes"/>
- <property name="maven.junit.jvmargs" value=""/>
- <!-- make the dirs -->
- <mkdir dir="${schema.output.base.dir}"/>
- <mkdir dir="${schema.generated.src.dir}"/>
- <mkdir dir="${schema.generated.classes.dir}"/>
- <mkdir dir="${test.compiled.classes.dir}"/>
- <!-- Run schema compiler with designated schemas -->
- <echo>Compiling simple_maxOccurs2.xsd</echo>
- <!-- simple max occurs 2 xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs2.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <echo>Compiling anonymous_complexType.xsd</echo>
- <!-- anon complex type xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/anonymous_complexType.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- anon choice xsd -->
- <echo>Compiling simple_choice.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- anon particle all xsd -->
- <echo>Compiling simple_particle_all.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_particle_all.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- simple max occurs xsd -->
- <echo>Compiling simple_maxOccurs.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_maxOccurs.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- simple any type xsd -->
- <echo>Compiling simple_anytype.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple_anytype.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- min occurs 0 xsd -->
- <echo>Compiling simple-minoccurs0.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple-minoccurs0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- complex min occurs 0 xsd -->
- <echo>Compiling complex-minoccurs0.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/complex-minoccurs0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <echo>Compiling simple-recursive-datatypes.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple-recursive-datatypes.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <echo>Compiling mixed_minoccus0.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/mixed_minoccus0.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple primitive types xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/simple/simpleType-All.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- All simple derived types xsd -->
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${schema.source.dir}/derived/derivedType-All.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling complete.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/complete.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling simpleExtension.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/extensions.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling union.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/union.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling all.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/all.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling enumeration.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/enumeration.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling restrictions.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/restrictions.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling choice.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling list.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/list.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling element_references.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/element_references.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling innersequence_choice.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/innersequence_choice.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling testattribute.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/testattribute.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling boolean.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/boolean.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling particalMaxOccures.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/particalMaxOccures.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling innerParticles.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/innerParticles.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
- <!-- ################################################################### -->
- <!-- All simple derived types xsd -->
- <echo>Compiling default_namespaces.xsd</echo>
- <java classname="org.apache.axis2.schema.XSD2Java" fork="true">
- <jvmarg line="${maven.junit.jvmargs}"/>
- <classpath refid="maven.runtime.classpath"/>
- <classpath location="${compiled.classes.dir}"/>
- <arg file="${testsuite.source.dir}/default_namespaces.xsd"/>
- <arg file="${schema.generated.src.dir}"/>
- </java>
-
+ <property name="maven.junit.jvmargs" value=""/>
+ <path id="maven.dependency.classpath">
+ <path refid="maven.compile.classpath"/>
+ </path>
+ <ant antfile="sub-build.xml" inheritall="true" inheritrefs="true" dir="." target="main"/>
</tasks>
</configuration>
<goals>
Modified: webservices/axis2/trunk/java/modules/integration/itest-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/itest-build.xml?view=diff&rev=537458&r1=537457&r2=537458
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/itest-build.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/itest-build.xml Sat May 12 08:15:07 2007
@@ -275,5 +275,15 @@
<mkdir dir="target/perf/build/repo/modules"/>
<copy file="../addressing/target/addressing-${addressing_version}.mar"
tofile="target/perf/build/repo/modules/addressing-${addressing_version}.mar"/>
+ </target>
+ <target name="build-soap12-services">
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
+ <ant antfile="build.xml" inheritall="true" inheritrefs="true"
+ dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
</target>
</project>
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/maven.xml?view=diff&rev=537458&r1=537457&r2=537458
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Sat May 12 08:15:07 2007
@@ -101,22 +101,14 @@
<j:if test="${context.getVariable('skip.enterprise.tests') != 'true'}">
<ant:ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
- dir="." target="rpc-wsdl-codegen"/>
+ dir="." target="rpc-wsdl-codegen"/>
<j:if test="${context.getVariable('maven.test.skip') != 'true'}">
<ant:ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
- dir="." target="enterprise-wsdl-codegen"/>
+ dir="." target="enterprise-wsdl-codegen"/>
</j:if>
- <j:jelly xmlns="jelly:ant">
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestModuleB"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestModuleC"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestServiceB"/>
- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true"
- dir="test-resources/SOAP12Testing/SOAP12TestServiceC"/>
- </j:jelly>
+ <ant:ant antfile="itest-build.xml" inheritall="true" inheritrefs="true"
+ dir="." target="build-soap12-services"/>
</j:if>
</preGoal>
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=537458&r1=537457&r2=537458
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Sat May 12 08:15:07 2007
@@ -334,69 +334,69 @@
<organization>Lanka Software Foundation / University of Moratuwa</organization>
</contributor>
</contributors>
- <repositories>
- <repository>
- <releases>
- <enabled>false</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- <id>apache-snapshots</id>
- <name>Apache Maven2 SNAPSHOTS</name>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <layout>default</layout>
- </repository>
+ <repositories>
+ <!--
+ Checking repositores takes lots of time.
+ Repositories which should NOT be put in here.
+
+ http://people.apache.org/repo/m2-snapshot-repository/
+ Exists in the org.apache.apache parent pom
+
+ http://repo1.maven.org/maven2/ aka 'Central'
+ Exists in the maven 'Super POM' which all poms extend
+
+ http://people.apache.org/repo/m2-ibiblio-rsync-repository/
+ Everything in here should be in 'Central'
+
+ Checksum policy when not specified always defaults to 'warn'
+ which is what we want.
+ -->
<repository>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
</releases>
<snapshots>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
</snapshots>
<id>apache-ws-snapshots2</id>
<name>Apache ws.zones - 2</name>
- <url>http://ws.zones.apache.org/repository2/</url>
- </repository>
- <repository>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>warn</checksumPolicy>
- </snapshots>
- <id>maven2</id>
- <name>Maven2 repo</name>
- <url>http://repo1.maven.org/maven2/</url>
+ <url>http://ws.zones.apache.org/repository2</url>
</repository>
<repository>
<id>tomcat-repository</id>
- <url>http://tomcat.apache.org/dev/dist/m2-repository</url>
- </repository>
- <repository>
- <id>apache-ibiblio-rsync</id>
- <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository/</url>
+ <url>http://tomcat.apache.org/dev/dist/m2-repository</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>apache-incubating</id>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+ <url>http://people.apache.org/repo/m2-incubating-repository</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>eclipse-repo</id>
<name>eclipse maven repository</name>
- <url>http://repo1.maven.org/eclipse</url>
+ <url>http://repo1.maven.org/eclipse</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
</repository>
<repository>
<id>jibx</id>
@@ -407,20 +407,6 @@
</repositories>
<pluginRepositories>
<pluginRepository>
- <id>apache-m2</id>
- <name>Apache M2 Repository</name>
- <url>http://people.apache.org/repo/m2-ibiblio-rsync-repository</url>
- <layout>default</layout>
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
- </snapshots>
- <releases>
- <enabled>true</enabled>
- </releases>
- </pluginRepository>
- <pluginRepository>
<id>apache-snapshots</id>
<name>Apache Snapshots Repository</name>
<url>http://people.apache.org/repo/m2-snapshot-repository</url>
@@ -428,7 +414,6 @@
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
</snapshots>
<releases>
<enabled>false</enabled>
@@ -442,7 +427,6 @@
<snapshots>
<enabled>true</enabled>
<updatePolicy>daily</updatePolicy>
- <checksumPolicy>ignore</checksumPolicy>
</snapshots>
<releases>
<enabled>true</enabled>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org