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 ba...@apache.org on 2008/06/27 19:12:44 UTC
svn commit: r672331 - in /webservices/axis2/trunk/java/modules: parent/
tool/axis2-eclipse-codegen-plugin/ tool/conf/codegen/
Author: barrettj
Date: Fri Jun 27 10:12:44 2008
New Revision: 672331
URL: http://svn.apache.org/viewvc?rev=672331&view=rev
Log:
AXIS2-3792
Commit patch submitted by Tom Seelbach. Thank Tom!
Modified:
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?rev=672331&r1=672330&r2=672331&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Fri Jun 27 10:12:44 2008
@@ -99,7 +99,7 @@
<commons.httpclient.version>3.1</commons.httpclient.version>
<commons.io.version>1.4</commons.io.version>
<commons.logging.version>1.1.1</commons.logging.version>
- <eclipse.plugins.version>1.3.0</eclipse.plugins.version>
+ <eclipse.plugins.version>1.4.0</eclipse.plugins.version>
<eclipse.version>3.2.0</eclipse.version>
<fi.version>1.1.8</fi.version>
<geronimo.spec.activation.version>1.0.1</geronimo.spec.activation.version>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml?rev=672331&r1=672330&r2=672331&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/build.xml Fri Jun 27 10:12:44 2008
@@ -19,7 +19,7 @@
<project basedir="." default="help">
- <!--Set your elcipse home directory -->
+ <!--Set your eclipse home directory -->
<property environment="env" />
<property name="eclipse.home" value="${env.ECLIPSE_HOME}"></property>
@@ -52,7 +52,7 @@
<property name="codegen.help.images.dir" value="../../../modules/documentation/xdocs/tools/${tool_docs_version}/eclipse/images"></property>
<property name="axis2.lib.dir" value="../../../target/lib"></property>
- <!--Filter tockens for the copy command to filter the versions of external dependencies -->
+ <!--Filter tokens for the copy command to filter the versions of external dependencies -->
<filter token="version_number" value="${version_number}" />
<filter token="activation.version" value="${activation.version}" />
@@ -61,7 +61,6 @@
<filter token="commons.logging.version" value="${commons.logging.version}" />
<filter token="neethi.version" value="${neethi.version}" />
<filter token="stax.api.version" value="${stax.api.version}" />
- <filter token="stax.impl.version" value="${stax.impl.version}" />
<filter token="xmlbeans.version" value="${xmlbeans.version}" />
<filter token="XmlSchema.version" value="${XmlSchema.version}" />
<filter token="log4j.version" value="${log4j.version}" />
@@ -70,12 +69,14 @@
<filter token="commons.httpclient.version" value="${commons.httpclient.version}" />
<filter token="commons.codec.version" value="${commons.codec.version}" />
<filter token="jibx.version" value="${jibx.version}" />
+ <filter token="geronimo.spec.stax.version" value="${geronimo.spec.stax.version}" />
+ <filter token="geronimo.spec.activation.version" value="${geronimo.spec.activation.version}" />
<!--Codegen wizard libraries -->
<fileset id="codegen.libs" dir="${axis2.lib.dir}">
- <include name="activation-${activation.version}.jar" />
-
+ <include name="geronimo-activation_1.1_spec-${geronimo.spec.activation.version}.jar" />
+ <include namo="geronimo-stax-api_1.0_spec-${geronimo.spec.stax.version}.jar" />
<include name="ant-${ant.version}.jar" />
<include name="axiom-api-${axiom.version}.jar" />
<include name="axiom-dom-${axiom.version}.jar" />
@@ -84,9 +85,7 @@
<include name="commons-logging-${commons.logging.version}.jar" />
<include name="log4j-${log4j.version}.jar" />
<include name="neethi-${neethi.version}.jar" />
- <include name="stax-api-${stax.api.version}.jar" />
<include name="wsdl4j-${wsdl4j.version}.jar" />
- <include name="wstx-${stax.impl.version}.jar" />
<include name="xmlbeans-${xmlbeans.version}.jar" />
<include name="XmlSchema-${XmlSchema.version}.jar" />
<include name="woden-${woden.version}.jar" />
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?rev=672331&r1=672330&r2=672331&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Fri Jun 27 10:12:44 2008
@@ -54,20 +54,13 @@
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>${artifactId}-${version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifactId}-${axis2.version}.${extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.apache.axis2:axis2:jar</include>
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>${artifactId}-${stax.impl.version}.${extension}</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.codehaus.woodstox:wstx-asl:jar</include>
- </includes>
- </dependencySet>
- <dependencySet>
<outputFileNameMapping>${artifactId}-${neethi.version}.${extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
@@ -75,10 +68,10 @@
</includes>
</dependencySet>
<dependencySet>
- <outputFileNameMapping>${artifactId}-${stax.api.version}.${extension}</outputFileNameMapping>
+ <outputFileNameMapping>${artifactId}-${geronimo.spec.stax.version}.${extension}</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
- <include>stax:stax-api:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:jar</include>
</includes>
</dependencySet>
<dependencySet>
@@ -138,12 +131,5 @@
<include>jibx:jibx-run:jar</include>
</includes>
</dependencySet>
- <dependencySet>
- <outputFileNameMapping>${artifactId}-${ant.version}.${extension}</outputFileNameMapping>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>org.apache.ant:ant:jar</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?rev=672331&r1=672330&r2=672331&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Fri Jun 27 10:12:44 2008
@@ -182,9 +182,9 @@
<version>${version}</version>
</dependency>
<dependency>
- <groupId>${stax.impl.groupid}</groupId>
- <artifactId>${stax.impl.artifact}</artifactId>
- <version>${stax.impl.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+ <version>${geronimo.spec.stax.version}</version>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
@@ -201,6 +201,12 @@
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
<version>${xmlbeans.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
@@ -355,18 +361,17 @@
<mkdir dir="./target/plugin/${codegen.plugin.version}"/>
<delete dir="./target/dist"/>
<mkdir dir="./target/dist"/>
- <!--Filter tockens for the copy command to filter the versions of external dependencies -->
+ <!--Filter tokens for the copy command to filter the versions of external dependencies -->
<filter token="eclipse.plugins.version" value="${eclipse.plugins.version}"/>
<filter token="version" value="${version}"/>
<filter token="geronimo.spec.activation.version"
value="${geronimo.spec.activation.version}"/>
- <filter token="annogen.version" value="${annogen.version}"/>
+ <filter token="geronimo.spec.stax.version"
+ value="${geronimo.spec.stax.version}"/>
<filter token="ant.version" value="${ant.version}"/>
<filter token="axiom.version" value="${axiom.version}"/>
<filter token="commons.logging.version" value="${commons.logging.version}"/>
<filter token="neethi.version" value="${neethi.version}"/>
- <filter token="stax.api.version" value="${stax.api.version}"/>
- <filter token="stax.impl.version" value="${stax.impl.version}"/>
<filter token="xmlbeans.version" value="${xmlbeans.version}"/>
<filter token="xmlschema.version" value="${xmlschema.version}"/>
<filter token="log4j.version" value="${log4j.version}"/>
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml?rev=672331&r1=672330&r2=672331&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Fri Jun 27 10:12:44 2008
@@ -34,8 +34,7 @@
<library name="lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar">
<export name="*"/>
</library>
-
- <library name="lib/ant-@ant.version@.jar">
+ <library name="lib/geronimo-stax-api_1.0_spec-@geronimo.spec.stax.version@.jar">
<export name="*"/>
</library>
<library name="./lib/axiom-api-@axiom.version@.jar">
@@ -59,15 +58,9 @@
<library name="lib/neethi-@neethi.version@.jar">
<export name="*"/>
</library>
- <library name="lib/stax-api-@stax.api.version@.jar">
- <export name="*"/>
- </library>
<library name="lib/wsdl4j-@wsdl4j.version@.jar">
<export name="*"/>
</library>
- <library name="lib/wstx-asl-@stax.impl.version@.jar">
- <export name="*"/>
- </library>
<library name="lib/xmlbeans-@xmlbeans.version@.jar">
<export name="*"/>
</library>