You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by da...@apache.org on 2007/05/12 17:47:41 UTC
svn commit: r537468 - in /webservices/axis2/trunk/java/modules/adb-codegen:
maven.xml pom.xml sub-build.xml
Author: davidillsley
Date: Sat May 12 08:47:41 2007
New Revision: 537468
URL: http://svn.apache.org/viewvc?view=rev&rev=537468
Log:
Fix (I hope) on non-OS-X jvms
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/maven.xml
webservices/axis2/trunk/java/modules/adb-codegen/pom.xml
webservices/axis2/trunk/java/modules/adb-codegen/sub-build.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=537468&r1=537467&r2=537468
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/maven.xml Sat May 12 08:47:41 2007
@@ -15,7 +15,21 @@
</preGoal>
<preGoal name="test:compile">
- <ant:ant antfile="sub-build.xml" inheritall="true" inheritrefs="true" dir="." target="main"/>
+ <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:ant antfile="sub-build.xml" inheritall="true" inheritrefs="true" dir="." target="main"/>
+ <!-- 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="target/schema/classes"/>
<maven:addPath id="maven.dependency.classpath" refid="schema.generated.classes.dir"/>
</preGoal>
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=537468&r1=537467&r2=537468
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/pom.xml Sat May 12 08:47:41 2007
@@ -112,6 +112,13 @@
<path id="maven.dependency.classpath">
<path refid="maven.compile.classpath"/>
</path>
+ <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"/>
</tasks>
</configuration>
Modified: webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml?view=diff&rev=537468&r1=537467&r2=537468
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml Sat May 12 08:47:41 2007
@@ -290,16 +290,6 @@
<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>
-
</target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org