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 di...@apache.org on 2007/08/02 03:57:40 UTC

svn commit: r561995 - in /webservices/axis2/trunk/java/modules: distribution/ documentation/xdocs/tools/1_3/ parent/ tool/axis2-eclipse-codegen-plugin/ tool/axis2-eclipse-service-plugin/ tool/conf/codegen/ tool/conf/service/

Author: dims
Date: Wed Aug  1 18:57:23 2007
New Revision: 561995

URL: http://svn.apache.org/viewvc?view=rev&rev=561995
Log:
Sync up with 1.3 branch

Modified:
    webservices/axis2/trunk/java/modules/distribution/pom.xml
    webservices/axis2/trunk/java/modules/documentation/xdocs/tools/1_3/CodegenToolReference.xml
    webservices/axis2/trunk/java/modules/parent/pom.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/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
    webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml
    webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
    webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
    webservices/axis2/trunk/java/modules/tool/conf/service/build.properties
    webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml

Modified: webservices/axis2/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/distribution/pom.xml?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/distribution/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/distribution/pom.xml Wed Aug  1 18:57:23 2007
@@ -31,6 +31,9 @@
     <description>Apache Axis2 Distribution</description>
     <packaging>pom</packaging>
 
+    <properties>
+       <docs.folder.version>1_3</docs.folder.version>
+    </properties>
 
     <dependencies>
         <dependency>

Modified: webservices/axis2/trunk/java/modules/documentation/xdocs/tools/1_3/CodegenToolReference.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/documentation/xdocs/tools/1_3/CodegenToolReference.xml?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/documentation/xdocs/tools/1_3/CodegenToolReference.xml (original)
+++ webservices/axis2/trunk/java/modules/documentation/xdocs/tools/1_3/CodegenToolReference.xml Wed Aug  1 18:57:23 2007
@@ -210,6 +210,90 @@
 <td width="60%">Generate an interface for the service
 skeleton.</td>
 <td></td>
+</tr>
+<tr>
+<td width="20%">-wv</td>
+<td width="20%">--wsdl-version</td>
+<td width="60%">WSDL Version. Valid Options : 2, 2.0, 1.1</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-S</td>
+<td width="20%">--source-folder</td>
+<td width="60%">Specify a directory path for generated source</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-R</td>
+<td width="20%">--resource-folder</td>
+<td width="60%">Specify a directory path for generated resources</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-em</td>
+<td width="20%">--external-mapping</td>
+<td width="60%">Specify an external mapping file</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-f</td>
+<td width="20%">--flatten-files</td>
+<td width="60%">Flattens the generated files</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-uw</td>
+<td width="20%">--unwrap-params</td>
+<td width="60%">Switch on un-wrapping</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-xsdconfig</td>
+<td width="20%"></td>
+<td width="60%">Use XMLBeans .xsdconfig file. Valid only with -d xmlbeans</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-ap</td>
+<td width="20%">--all-ports</td>
+<td width="60%">Generate code for all ports</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-or</td>
+<td width="20%">--over-ride</td>
+<td width="60%">Overwrite the existing classes</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-b</td>
+<td width="20%">--backword-compatible</td>
+<td width="60%">Generate Axis 1.x backword compatible code</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%">-sp</td>
+<td width="20%">--suppress-prefixes</td>
+<td width="60%">Suppress namespace prefixes (Optimzation that reduces size of soap request/response)</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%"></td>
+<td width="20%">--noBuildXML</td>
+<td width="60%">Don't generate the build.xml in the output directory</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%"></td>
+<td width="20%">--noWSDL</td>
+<td width="60%">Don't generate WSDL's in the resources directory</td>
+<td></td>
+</tr>
+<tr>
+<td width="20%"></td>
+<td width="20%">--noMessageReceiver</td>
+<td width="60%">Don't generate a MessageReceiver in the generated sources</td>
+<td></td>
 </tr>
 </tbody>
 </table>

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=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Wed Aug  1 18:57:23 2007
@@ -84,7 +84,6 @@
 	<soapmonitor.mar.version>SNAPSHOT</soapmonitor.mar.version>
 	<mex.mar.version>SNAPSHOT</mex.mar.version>
 	<ping.mar.version>SNAPSHOT</ping.mar.version>
-	<docs.folder.version>1_3</docs.folder.version>
 	<scripting.mar.version>SNAPSHOT</scripting.mar.version>
         <annogen.version>0.1.0</annogen.version>
         <ant.version>1.7.0</ant.version>

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?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- 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 Wed Aug  1 18:57:23 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/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?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- 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 Wed Aug  1 18:57:23 2007
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.apache.axis2</groupId>
 		<artifactId>axis2-parent</artifactId>
-		<version>SNAPSHOT</version>
+		<version>1.3-SNAPSHOT</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 	<artifactId>axis2.eclipse.codegen.plugin</artifactId>
@@ -141,72 +141,110 @@
 		<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>
-			<artifactId>axis2-kernel</artifactId>
-			<version>${version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-codegen</artifactId>
-			<version>${version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-adb-codegen</artifactId>
-			<version>${version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-java2wsdl</artifactId>
-			<version>${version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-adb</artifactId>
+			<artifactId>axis2</artifactId>
 			<version>${version}</version>
 		</dependency>
+                <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-codegen</artifactId>
+                        <version>${version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-kernel</artifactId>
+                        <version>${version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-adb</artifactId>
+                        <version>${version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-adb-codegen</artifactId>
+                        <version>${version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-java2wsdl</artifactId>
+                        <version>${version}</version>
+                </dependency>
 		<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>
@@ -257,7 +295,8 @@
 						<phase>package</phase>
 						<configuration>
 							<tasks>
-								<property name="codegen.plugin.version" value="Axis2_Codegen_Wizard_1.2.0"/>
+                                                                <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"/>
@@ -285,8 +324,9 @@
 								<delete dir="./target/dist"/>
 								<mkdir dir="./target/dist"/>
 								<!--Filter tockens 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}" />
+								     <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="ant.version" value="${ant.version}" />
 								     <filter token="axiom.version" value="${axiom.version}" />
@@ -295,7 +335,7 @@
 								     <filter token="stax.api.version" value="${stax.api.version}" />
 								     <filter token="stax.impl.version" value="${stax.impl.version}" />
 								     <filter token="xbean.version" value="${xbean.version}" />
-								     <filter token="XmlSchema.version" value="${XmlSchema.version}" />
+								     <filter token="xmlschema.version" value="${xmlschema.version}" />
 								     <filter token="log4j.version" value="${log4j.version}" />
 								     <filter token="wsdl4j.version" value="${wsdl4j.version}" />
 								     <filter token="woden.version" value="${woden.version}" />
@@ -304,7 +344,7 @@
 								     <filter token="jibx.version" value="${jibx.version}" />
 
 								<unzip src="./target/axis2.eclipse.codegen.plugin-${pom.version}.jar" dest="./target/plugin/${codegen.plugin.version}"/>
-								<!-- Copy to the same position with the filtering on-->
+                                                                <!-- Copy to the same position with the filtering on-->
 								<copy todir="./target/plugin/${codegen.plugin.version}" filtering="on">
 									<fileset dir="${codegen.resource.dir}">
 										<include name="plugin.xml"/>

Modified: webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/eclipse-service-plugin-assembly.xml Wed Aug  1 18:57:23 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/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/axis2-eclipse-service-plugin/pom.xml Wed Aug  1 18:57:23 2007
@@ -32,22 +32,22 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-kernel</artifactId>
+			<artifactId>axis2</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-codegen</artifactId>
+                        <artifactId>axis2-java2wsdl</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-adb-codegen</artifactId>
+                        <artifactId>axis2-codegen</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.axis2</groupId>
-			<artifactId>axis2-java2wsdl</artifactId>
+                        <artifactId>axis2-kernel</artifactId>
 			<version>${version}</version>
 		</dependency>
 		<dependency>
@@ -56,6 +56,11 @@
 			<version>${version}</version>
 		</dependency>
 		<dependency>
+                        <groupId>org.apache.axis2</groupId>
+                        <artifactId>axis2-adb-codegen</artifactId>
+                        <version>${version}</version>
+                </dependency>
+		<dependency>
 			<groupId>commons-logging</groupId>
 			<artifactId>commons-logging</artifactId>
 		</dependency>
@@ -207,7 +212,8 @@
 						<phase>package</phase>
 						<configuration>
 							<tasks>
-								<property name="service.plugin.version" value="Axis2_Service_Archiver_1.0.0"/>
+                                                                <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"/>
@@ -230,7 +236,9 @@
 								<property name="service.help.images.dir" value="../../../modules/documentation/xdocs/tools/1_3/eclipse/images"/>
 								<property name="axis2.lib.dir" value="../../../target/lib"/>
 								<!--Filter tockens for the copy command to filter the versions of external dependencies -->
-								<filter token="version_number" value="${version_number}"/>
+								<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}"/>
@@ -238,7 +246,7 @@
 								<mkdir dir="./target/plugin/${service.plugin.version}"/>
 								<delete dir="./target/dist"/>
 								<mkdir dir="./target/dist"/>
-								<unzip src="./target/axis2.eclipse.service.plugin-${pom.version}.jar" dest="./target/plugin/${service.plugin.version}"/>
+								<unzip src="./target/axis2.eclipse.service.plugin-${version}.jar" dest="./target/plugin/${service.plugin.version}"/>
 								<!-- Copy to the same position with the filtering on-->
 								<copy todir="./target/plugin/${service.plugin.version}" filtering="on">
 									<fileset dir="${service.resource.dir}">

Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties Wed Aug  1 18:57:23 2007
@@ -25,13 +25,13 @@
                help/,\
                lib/,\
                src/,\
-               lib/activation-@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,\
                lib/axiom-dom-@axiom.version@.jar,\
                lib/axiom-impl-@axiom.version@.jar,\
-               lib/axis2-@version_number@.jar,\
+               lib/axis2-@version@.jar,\
                lib/commons-logging-@commons.logging.version@.jar,\
                lib/log4j-@log4j.version@.jar,\
                lib/neethi-@neethi.version@.jar,\
@@ -39,11 +39,10 @@
                lib/wsdl4j-@wsdl4j.version@.jar,\
                lib/wstx-@stax.impl.version@.jar,\
                lib/xbean-@xbean.version@.jar,\
-               lib/XmlSchema-@XmlSchema.version@.jar,\
+               lib/XmlSchema-@xmlschema.version@.jar,\
                lib/woden-@woden.version@.jar,\
 	       lib/commons-httpclient-@commons.httpclient.version@.jar,\
 	       lib/commons-codec-@commons.codec.version@.jar,\
-	       lib/axis2-jibx-@version_number@.jar,\
 	       lib/jibx-bind-@jibx.version@.jar,\
 	       lib/jibx-run-@jibx.version@.jar,\
 src.includes = icons/,\

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?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Wed Aug  1 18:57:23 2007
@@ -21,7 +21,7 @@
 <plugin
    id="Axis2_Codegen_Wizard"
    name="Axis2 Codegen Wizard Plug-in"
-   version="@version_number@"
+   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/activation-@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">
@@ -50,7 +50,7 @@
       <library name="lib/commons-logging-@commons.logging.version@.jar">
          <export name="*"/>
       </library>
-       <library name="lib/axis2-@version_number@.jar">
+       <library name="lib/axis2-@version@.jar">
        <export name="*"/>
        </library>
        <library name="lib/log4j-@log4j.version@.jar">
@@ -71,7 +71,7 @@
       <library name="lib/xbean-@xbean.version@.jar">
          <export name="*"/>
       </library>
-      <library name="lib/XmlSchema-@XmlSchema.version@.jar">
+      <library name="lib/XmlSchema-@xmlschema.version@.jar">
          <export name="*"/>
       </library>
       <library name="lib/woden-@woden.version@.jar">
@@ -81,9 +81,6 @@
          <export name="*"/>
       </library>
       <library name="lib/commons-codec-@commons.codec.version@.jar">
-         <export name="*"/>
-      </library>
-      <library name="lib/axis2-jibx-@version_number@.jar">
          <export name="*"/>
       </library>
       <library name="lib/jibx-bind-@jibx.version@.jar">

Modified: webservices/axis2/trunk/java/modules/tool/conf/service/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/service/build.properties?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/build.properties Wed Aug  1 18:57:23 2007
@@ -24,7 +24,7 @@
                help/,\
                lib/,\
                src/,\
-               lib/axis2-@version_number@.jar,\
+               lib/axis2-@version@.jar,\
                lib/commons-logging-@commons.logging.version@.jar,\
                lib/log4j-@log4j.version@.jar,\
                lib/ant-@ant.version@.jar,\

Modified: webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml?view=diff&rev=561995&r1=561994&r2=561995
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml Wed Aug  1 18:57:23 2007
@@ -21,7 +21,7 @@
 <plugin
    id="Axis2_Service_Archiver"
    name="Axis2 Service Maker"
-   version="@version_number@"
+   version="@eclipse.plugins.version@"
    provider-name="Apache Software Foundation"
    class="org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver">
 
@@ -29,7 +29,7 @@
       <library name="Axis_Service_Archiver.jar">
          <export name="*"/>
       </library>
-       <library name="lib/axis2-@version_number@.jar">
+       <library name="lib/axis2-@version@.jar">
            <export name="*"/>
        </library>
        <library name="lib/commons-logging-@commons.logging.version@.jar">



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org