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 di...@apache.org on 2006/01/09 04:15:47 UTC
svn commit: r367172 - in /webservices/axis2/trunk/java/modules:
codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
integration/maven.xml
Author: dims
Date: Sun Jan 8 19:15:42 2006
New Revision: 367172
URL: http://svn.apache.org/viewcvs?rev=367172&view=rev
Log:
build.xml was picking up old versions of jars, trying another tactic now...namely use maven.dependency.classpath down to build.xml
Modified:
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
webservices/axis2/trunk/java/modules/integration/maven.xml
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl?rev=367172&r1=367171&r2=367172&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/adbAntBuildTemplate.xsl Sun Jan 8 19:15:42 2006
@@ -11,6 +11,9 @@
<property name="axis2.home">
<xsl:attribute name="value">${env.AXIS2_HOME}</xsl:attribute>
</property>
+ <property name="axis2.class.path">
+ <xsl:attribute name="value"></xsl:attribute>
+ </property>
<property name="name">
<xsl:attribute name="value"><xsl:value-of select="@servicename"/></xsl:attribute>
</property>
@@ -36,27 +39,18 @@
<property name="jars.ok" value=""></property>
<path id="axis2.class.path">
+ <pathelement>
+ <xsl:attribute name="path">${java.class.path}</xsl:attribute>
+ </pathelement>
+ <pathelement>
+ <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>
+ </pathelement>
<fileset>
<xsl:attribute name="dir">${axis2.home}</xsl:attribute>
<include>
<xsl:attribute name="name">lib/*.jar</xsl:attribute>
</include>
</fileset>
- <fileset>
- <xsl:attribute name="dir">${user.home}</xsl:attribute>
- <include>
- <xsl:attribute name="name">.maven/repository/junit/jars/*.jar</xsl:attribute>
- </include>
- <include>
- <xsl:attribute name="name">.maven/repository/stax/jars/*.jar</xsl:attribute>
- </include>
- <include>
- <xsl:attribute name="name">.maven/repository/axis2/jars/*.jar</xsl:attribute>
- </include>
- </fileset>
- <pathelement>
- <xsl:attribute name="path">${java.class.path}</xsl:attribute>
- </pathelement>
</path>
<target name="init">
Modified: webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl?rev=367172&r1=367171&r2=367172&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl (original)
+++ webservices/axis2/trunk/java/modules/codegen/src/org/apache/axis2/wsdl/template/general/xmlbeansAntBuildTemplate.xsl Sun Jan 8 19:15:42 2006
@@ -9,6 +9,9 @@
<property name="axis2.home">
<xsl:attribute name="value">${env.AXIS2_HOME}</xsl:attribute>
</property>
+ <property name="axis2.class.path">
+ <xsl:attribute name="value"></xsl:attribute>
+ </property>
<property name="name">
<xsl:attribute name="value"><xsl:value-of select="@servicename"/></xsl:attribute>
</property>
@@ -36,30 +39,18 @@
<property name="jars.ok" value=""></property>
<path id="axis2.class.path">
+ <pathelement>
+ <xsl:attribute name="path">${java.class.path}</xsl:attribute>
+ </pathelement>
+ <pathelement>
+ <xsl:attribute name="path">${axis2.class.path}</xsl:attribute>
+ </pathelement>
<fileset>
<xsl:attribute name="dir">${axis2.home}</xsl:attribute>
<include>
<xsl:attribute name="name">lib/*.jar</xsl:attribute>
</include>
</fileset>
- <fileset>
- <xsl:attribute name="dir">${user.home}</xsl:attribute>
- <include>
- <xsl:attribute name="name">.maven/repository/xmlbeans/jars/*.jar</xsl:attribute>
- </include>
- <include>
- <xsl:attribute name="name">.maven/repository/stax/jars/*.jar</xsl:attribute>
- </include>
- <include>
- <xsl:attribute name="name">.maven/repository/junit/jars/*.jar</xsl:attribute>
- </include>
- <include>
- <xsl:attribute name="name">.maven/repository/axis2/jars/*.jar</xsl:attribute>
- </include>
- </fileset>
- <pathelement>
- <xsl:attribute name="path">java.class.path</xsl:attribute>
- </pathelement>
</path>
<target name="init">
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=367172&r1=367171&r2=367172&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Sun Jan 8 19:15:42 2006
@@ -17,6 +17,9 @@
</postGoal>
<preGoal name="test:compile">
+ <!-- Set a property that can be picked up from the ant build.xml's -->
+ <ant:property name="axis2.class.path" refid="maven.dependency.classpath"/>
+
<!-- copy the mars so that they are available on the test classpath -->
<copy file="../addressing/target/addressing.mar"
tofile="target/test-classes/modules/addressing.mar"/>