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 sa...@apache.org on 2007/08/01 14:44:06 UTC
svn commit: r561787 - in /webservices/axis2/branches/java/1_3/modules/tool:
axis2-eclipse-codegen-plugin/ axis2-eclipse-service-plugin/ conf/codegen/
conf/service/
Author: sandakith
Date: Wed Aug 1 05:44:05 2007
New Revision: 561787
URL: http://svn.apache.org/viewvc?view=rev&rev=561787
Log:
Fixing the eclipse plugins distribution
all libs verfied
version labels fixed
Modified:
webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/pom.xml
webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/build.properties
webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/plugin.xml
webservices/axis2/branches/java/1_3/modules/tool/conf/service/plugin.xml
Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/eclipse-codegen-plugin-assembly.xml Wed Aug 1 05:44:05 2007
@@ -47,7 +47,11 @@
<include>org.apache.ws.commons.schema:XmlSchema:jar</include>
<include>log4j:log4j:jar</include>
<include>org.apache.woden:woden:jar</include>
- <include>ant:ant:jar</include>
+ <include>commons-httpclient:commons-httpclient:jar</include>
+ <include>commons-codec:commons-codec:jar</include>
+ <include>jibx:jibx-bind:jar</include>
+ <include>jibx:jibx-run::jar</include>
+ <include>org.apache.ant:ant:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/pom.xml?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-codegen-plugin/pom.xml Wed Aug 1 05:44:05 2007
@@ -141,14 +141,17 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>${geronimo.spec.activation.version}</version>
</dependency>
<dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
+ <version>${annogen.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
</dependency>
<dependency>
<groupId>org.apache.axis2</groupId>
@@ -183,35 +186,65 @@
<dependency>
<groupId>${stax.impl.groupid}</groupId>
<artifactId>${stax.impl.artifactid}</artifactId>
+ <version>${stax.impl.version}</version>
</dependency>
<dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
+ <version>${neethi.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
</dependency>
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
+ <version>${xbean.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.schema</groupId>
<artifactId>XmlSchema</artifactId>
+ <version>${xmlschema.version}</version>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
+ <version>${ant.version}</version>
</dependency>
<dependency>
<groupId>org.apache.woden</groupId>
<artifactId>woden</artifactId>
+ <version>${woden.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons.httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-bind</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
+ <version>${log4j.version}</version>
</dependency>
</dependencies>
<distributionManagement>
@@ -262,7 +295,8 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="codegen.plugin.version" value="Axis2_Codegen_Wizard_${version}"/>
+ <property name="eclipse.plugins.version" value="1.3.0"/>
+ <property name="codegen.plugin.version" value="Axis2_Codegen_Wizard_${eclipse.plugins.version}"/>
<property name="codegen.plugin.zip.name" value="axis2-eclipse-codegen-wizard.zip"/>
<property name="codegen.plugin.jar.name" value="Axis2CodegenWizard.jar"/>
<property name="src" value="./src"/>
@@ -290,6 +324,7 @@
<delete dir="./target/dist"/>
<mkdir dir="./target/dist"/>
<!--Filter tockens 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}" />
Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml Wed Aug 1 05:44:05 2007
@@ -35,7 +35,7 @@
<include>commons-logging:commons-logging:jar</include>
<include>org.apache.axis2:axis2:jar</include>
<include>log4j:log4j:jar</include>
- <include>ant:ant:jar</include>
+ <include>org.apache.ant:ant:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/pom.xml?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/axis2-eclipse-service-plugin/pom.xml Wed Aug 1 05:44:05 2007
@@ -212,7 +212,8 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="service.plugin.version" value="Axis2_Service_Archiver_${version}"/>
+ <property name="eclipse.plugins.version" value="1.3.0"/>
+ <property name="service.plugin.version" value="Axis2_Service_Archiver_${eclipse.plugins.version}"/>
<property name="service.plugin.zip.name" value="axis2-eclipse-service-archiver-wizard.zip"/>
<property name="service.plugin.jar.name" value="Axis_Service_Archiver.jar"/>
<property name="src" value="./src"/>
@@ -236,6 +237,8 @@
<property name="axis2.lib.dir" value="../../../target/lib"/>
<!--Filter tockens for the copy command to filter the versions of external dependencies -->
<filter token="version" value="${version}"/>
+ <filter token="eclipse.plugins.version" value="${eclipse.plugins.version}"/>
+ <filter token="eclipse.plugins.version" value="${eclipse.plugins.version}"/>
<filter token="ant.version" value="${ant.version}"/>
<filter token="commons.logging.version" value="${commons.logging.version}"/>
<filter token="log4j.version" value="${log4j.version}"/>
Modified: webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/build.properties?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/build.properties Wed Aug 1 05:44:05 2007
@@ -25,7 +25,7 @@
help/,\
lib/,\
src/,\
- lib/geronimo.spec.activation-@geronimo.spec.activation.version@.jar,\
+ lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar,\
lib/annogen-@annogen.version@.jar,\
lib/ant-@ant.version@.jar,\
lib/axiom-api-@axiom.version@.jar,\
Modified: webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/plugin.xml?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/conf/codegen/plugin.xml Wed Aug 1 05:44:05 2007
@@ -21,7 +21,7 @@
<plugin
id="Axis2_Codegen_Wizard"
name="Axis2 Codegen Wizard Plug-in"
- version="@version@"
+ version="@eclipse.plugins.version@"
provider-name="Apache Software Foundation"
class="org.apache.axis2.tool.codegen.eclipse.plugin.CodegenWizardPlugin">
@@ -29,7 +29,7 @@
<library name="Axis2CodegenWizard.jar">
<export name="*"/>
</library>
- <library name="lib/geronimo.spec.activation-@geronimo.spec.activation.version@.jar">
+ <library name="lib/geronimo-activation_1.1_spec-@geronimo.spec.activation.version@.jar">
<export name="*"/>
</library>
<library name="lib/annogen-@annogen.version@.jar">
Modified: webservices/axis2/branches/java/1_3/modules/tool/conf/service/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_3/modules/tool/conf/service/plugin.xml?view=diff&rev=561787&r1=561786&r2=561787
==============================================================================
--- webservices/axis2/branches/java/1_3/modules/tool/conf/service/plugin.xml (original)
+++ webservices/axis2/branches/java/1_3/modules/tool/conf/service/plugin.xml Wed Aug 1 05:44:05 2007
@@ -21,7 +21,7 @@
<plugin
id="Axis2_Service_Archiver"
name="Axis2 Service Maker"
- version="@version@"
+ version="@eclipse.plugins.version@"
provider-name="Apache Software Foundation"
class="org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver">
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org