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 th...@apache.org on 2006/11/01 08:32:04 UTC
svn commit: r469800 - in /webservices/axis2/branches/java/1_1/modules/tool:
conf/codegen/build.properties conf/codegen/plugin.xml
conf/service/build.properties conf/service/plugin.xml create-project.xml
readme.txt
Author: thilina
Date: Tue Oct 31 23:32:04 2006
New Revision: 469800
URL: http://svn.apache.org/viewvc?view=rev&rev=469800
Log:
Applying the patch given at http://issues.apache.org/jira/browse/AXIS2-1568..
Thanx Sandakith
Modified:
webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties
webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml
webservices/axis2/branches/java/1_1/modules/tool/conf/service/build.properties
webservices/axis2/branches/java/1_1/modules/tool/conf/service/plugin.xml
webservices/axis2/branches/java/1_1/modules/tool/create-project.xml
webservices/axis2/branches/java/1_1/modules/tool/readme.txt
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties?view=diff&rev=469800&r1=469799&r2=469800
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties Tue Oct 31 23:32:04 2006
@@ -7,21 +7,21 @@
help/,\
lib/,\
src/,\
- lib/activation-1.1.jar,\
- lib/annogen-0.1.0.jar,\
- lib/ant-1.6.5.jar,\
- lib/axiom-api-SNAPSHOT.jar,\
- lib/axiom-dom-SNAPSHOT.jar,\
- lib/axiom-impl-SNAPSHOT.jar,\
- lib/axis2-1.1-SNAPSHOT.jar,\
- lib/commons-logging-1.1.jar,\
- lib/log4j-1.2.13.jar,\
- lib/neethi-SNAPSHOT.jar,\
- lib/stax-api-1.0.1.jar,\
- lib/wsdl4j-1.6.1.jar,\
- lib/wstx-asl-3.0.1.jar,\
- lib/xbean-2.2.0.jar,\
- lib/XmlSchema-SNAPSHOT.jar,\
+ lib/activation-@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-@axis2_version@.jar,\
+ lib/commons-logging-@commons.logging.version@.jar,\
+ lib/log4j-@log4j.version@.jar,\
+ lib/neethi-@neethi.version@.jar,\
+ lib/stax-api-@stax.api.version@.jar,\
+ lib/wsdl4j-@wsdl4j.version@.jar,\
+ lib/wstx-@stax.impl.version@.jar,\
+ lib/xbean-@xbean.version@.jar,\
+ lib/XmlSchema-@XmlSchema.version@.jar,\
src.includes = icons/,\
plugin.xml,\
src/,\
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml?view=diff&rev=469800&r1=469799&r2=469800
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml Tue Oct 31 23:32:04 2006
@@ -11,49 +11,49 @@
<library name="Axis2CodegenWizard.jar">
<export name="*"/>
</library>
- <library name="lib/activation-1.1.jar">
+ <library name="lib/activation-@activation.version@.jar">
<export name="*"/>
</library>
- <library name="lib/annogen-0.1.0.jar">
+ <library name="lib/annogen-@annogen.version@.jar">
<export name="*"/>
</library>
- <library name="lib/ant-1.6.5.jar">
+ <library name="lib/ant-@ant.version@.jar">
<export name="*"/>
</library>
- <library name="lib/axiom-api-SNAPSHOT.jar">
+ <library name="lib/axiom-api-@axiom.version@.jar">
<export name="*"/>
</library>
- <library name="lib/axiom-dom-SNAPSHOT.jar">
+ <library name="lib/axiom-dom-@axiom.version@.jar">
<export name="*"/>
</library>
- <library name="lib/axiom-impl-SNAPSHOT.jar">
+ <library name="lib/axiom-impl-@axiom.version@.jar">
<export name="*"/>
</library>
- <library name="lib/commons-logging-1.1.jar">
+ <library name="lib/commons-logging-@commons.logging.version@.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-1.1-SNAPSHOT.jar">
+ <library name="lib/axis2-@axis2_version@.jar">
<export name="*"/>
</library>
- <library name="lib/log4j-1.2.13.jar">
+ <library name="lib/log4j-@log4j.version@.jar">
<export name="*"/>
</library>
- <library name="lib/neethi-SNAPSHOT.jar">
+ <library name="lib/neethi-@neethi.version@.jar">
<export name="*"/>
</library>
- <library name="lib/stax-api-1.0.1.jar">
+ <library name="lib/stax-api-@stax.api.version@.jar">
<export name="*"/>
</library>
- <library name="lib/wsdl4j-1.6.1.jar">
+ <library name="lib/wsdl4j-@wsdl4j.version@.jar">
<export name="*"/>
</library>
- <library name="lib/wstx-asl-3.0.1.jar">
+ <library name="lib/wstx-@stax.impl.version@.jar">
<export name="*"/>
</library>
- <library name="lib/xbean-2.2.0.jar">
+ <library name="lib/xbean-@xbean.version@.jar">
<export name="*"/>
</library>
- <library name="lib/XmlSchema-SNAPSHOT.jar">
+ <library name="lib/XmlSchema-@XmlSchema.version@.jar">
<export name="*"/>
</library>
</runtime>
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/service/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/service/build.properties?view=diff&rev=469800&r1=469799&r2=469800
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/service/build.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/service/build.properties Tue Oct 31 23:32:04 2006
@@ -6,10 +6,10 @@
help/,\
lib/,\
src/,\
- lib/axis2-1.1-SNAPSHOT.jar,\
- lib/commons-logging-1.1.jar,\
- lib/log4j-1.2.8.jar,\
- lib/ant-1.6.5.jar,\
+ lib/axis2-1.1-@axis2_version@.jar,\
+ lib/commons-logging-@commons.logging.version@.jar,\
+ lib/log4j-@log4j.version@.jar,\
+ lib/ant-@ant.version@.jar,\
Axis_Service_Archiver.jar
src.includes = icons/,\
plugin.xml,\
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/service/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/service/plugin.xml?view=diff&rev=469800&r1=469799&r2=469800
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/service/plugin.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/service/plugin.xml Tue Oct 31 23:32:04 2006
@@ -11,16 +11,16 @@
<library name="Axis_Service_Archiver.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-1.1-SNAPSHOT.jar">
+ <library name="lib/axis2-@axis2_version@.jar">
<export name="*"/>
</library>
- <library name="lib/commons-logging-1.1.jar">
+ <library name="lib/commons-logging-@commons.logging.version@.jar">
<export name="*"/>
</library>
- <library name="lib/log4j-1.2.13.jar">
+ <library name="lib/log4j-@log4j.version@.jar">
<export name="*"/>
</library>
- <library name="lib/ant-1.6.5.jar">
+ <library name="lib/ant-@ant.version@.jar">
<export name="*"/>
</library>
</runtime>
Modified: webservices/axis2/branches/java/1_1/modules/tool/create-project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/create-project.xml?view=diff&rev=469800&r1=469799&r2=469800
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/create-project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/create-project.xml Tue Oct 31 23:32:04 2006
@@ -1,15 +1,21 @@
<project basedir="." default="all">
-
+
<!--Set your elcipse home directory -->
- <property environment="env" />
- <property name="eclipse.home" value="${env.ECLIPSE_HOME}"></property>
+ <property environment="env" />
+ <property name="eclipse.home" value="${env.ECLIPSE_HOME}"></property>
+
+ <!-- properties file to load the versions of dependencies -->
+ <property file="../../etc/project.properties"/>
<property name="codegen.plugin.version" value="Axis2_Codegen_Wizard_1.2.0"></property>
<property name="service.plugin.version" value="Axis_Service_Archiver_1.0.0"></property>
-
+ <property name="codegen.plugin.zip.name" value="axis2-codegen-archive-wizard.zip"></property>
+ <property name="service.plugin.zip.name" value="axis2-service-archive-wizard.zip"></property>
+
<property name="src" value="./src"></property>
<property name="codegen.src.dir" value="./axis2-eclipse-codegen-plugin/src/main/java"></property>
<property name="service.src.dir" value="./axis2-eclipse-service-plugin/src/main/java"></property>
<property name="output" value="./eclipse_projects"></property>
+ <property name="output.target" value="${output}/target"></property>
<property name="service.output.dir" value="${output}/service-archiver"></property>
<property name="codegen.output.dir" value="${output}/code-gen"></property>
<property name="plugin.output.dir" value="${output}/plugin"></property>
@@ -32,31 +38,47 @@
<property name="axis2.lib.dir" value="../../target/lib"></property>
+ <!--Filter tockens for the copy command to filter the versions of external dependencies -->
+ <filter token="axis2_version" value="${axis2_version}" />
+ <filter token="activation.version" value="${activation.version}" />
+ <filter token="annogen.version" value="${annogen.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="xbean.version" value="${xbean.version}" />
+ <filter token="XmlSchema.version" value="${XmlSchema.version}" />
+ <filter token="log4j.version" value="${log4j.version}" />
+ <filter token="wsdl4j.version" value="${wsdl4j.version}" />
+
+
<!--Codegen wizard libraries -->
<fileset id="codegen.libs" dir="${axis2.lib.dir}">
- <include name="activation-1.1.jar" />
- <include name="annogen-0.1.0.jar" />
- <include name="ant-1.6.5.jar" />
- <include name="axiom-api-SNAPSHOT.jar" />
- <include name="axiom-dom-SNAPSHOT.jar" />
- <include name="axiom-impl-SNAPSHOT.jar" />
- <include name="axis2-1.1-SNAPSHOT.jar" />
- <include name="commons-logging-1.1.jar" />
- <include name="log4j-1.2.13.jar" />
- <include name="neethi-SNAPSHOT.jar" />
- <include name="stax-api-1.0.1.jar" />
- <include name="wsdl4j-1.6.1.jar" />
- <include name="wstx-asl-3.0.1.jar" />
- <include name="xbean-2.2.0.jar" />
- <include name="XmlSchema-SNAPSHOT.jar" />
+ <include name="activation-${activation.version}.jar" />
+ <include name="annogen-${annogen.version}.jar" />
+ <include name="ant-${ant.version}.jar" />
+ <include name="axiom-api-${axiom.version}.jar" />
+ <include name="axiom-dom-${axiom.version}.jar" />
+ <include name="axiom-impl-${axiom.version}.jar" />
+ <include name="axis2-${axis2_version}.jar" />
+ <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="xbean-${xbean.version}.jar" />
+ <include name="XmlSchema-${XmlSchema.version}.jar" />
</fileset>
<!--Service wizard libraries -->
<fileset id="service.libs" dir="${axis2.lib.dir}">
- <include name="ant-1.6.5.jar" />
- <include name="log4j-1.2.13.jar" />
- <include name="commons-logging-1.1.jar" />
- <include name="axis2-1.1-SNAPSHOT.jar" />
+ <include name="ant-${ant.version}.jar" />
+ <include name="log4j-${log4j.version}.jar" />
+ <include name="commons-logging-${commons.logging.version}.jar" />
+ <include name="axis2-${axis2_version}.jar" />
</fileset>
@@ -82,18 +104,18 @@
<fileset dir="${service.src.dir}" excludes="**/codegen/**/*.java"/>
</copy>
<!-- Copy the other stuff -->
- <copy todir="${service.output.dir}">
+ <copy todir="${service.output.dir}" filtering="on">
<fileset dir="${service.resource.dir}"></fileset>
</copy>
- <!-- create bin directory -->
- <mkdir dir="${service.output.dir}/${bin.dir.name}"></mkdir>
- <!-- create the help directory -->
- <mkdir dir="${service.output.dir}/${help.dir.name}"></mkdir>
- <!-- copy the help directory -->
+ <!-- create bin directory -->
+ <mkdir dir="${service.output.dir}/${bin.dir.name}"></mkdir>
+ <!-- create the help directory -->
+ <mkdir dir="${service.output.dir}/${help.dir.name}"></mkdir>
+ <!-- copy the help directory -->
<copy todir="${service.output.dir}/${help.dir.name}">
<fileset file="${service.help.resource.file}"></fileset>
</copy>
- <available property="images.dir"
+ <available property="images.dir"
file="${service.help.images.dir}"
type="dir"
value="${service.help.images.dir}"/>
@@ -110,18 +132,18 @@
<fileset dir="${codegen.src.dir}" excludes="**/service/**/*.java"/>
</copy>
<!-- Copy the other stuff -->
- <copy todir="${codegen.output.dir}">
+ <copy todir="${codegen.output.dir}" filtering="on" >
<fileset dir="${codegen.resource.dir}"></fileset>
</copy>
<!-- create bin directory -->
- <mkdir dir="${codegen.output.dir}/${bin.dir.name}"></mkdir>
+ <mkdir dir="${codegen.output.dir}/${bin.dir.name}"></mkdir>
<!-- create the help directory -->
<mkdir dir="${codegen.output.dir}/${help.dir.name}"></mkdir>
- <!-- copy the help directory -->
+ <!-- copy the help directory -->
<copy todir="${codegen.output.dir}/${help.dir.name}">
<fileset file="${codegen.help.resource.file}"></fileset>
</copy>
- <available property="images.dir" file="${codegen.help.images.dir}" type="dir" value="${codegen.help.images.dir}"/>
+ <available property="images.dir" file="${codegen.help.images.dir}" type="dir" value="${codegen.help.images.dir}"/>
<copy todir="${codegen.output.dir}/${help.dir.name}/images">
<fileset dir="${images.dir}"/>
</copy>
@@ -264,16 +286,66 @@
</copy>
</target>
- <!--Relese the plugins -->
+ <!--Relese the plugins (this will install the plugins and build the zip version)-->
<target name="release-plugins">
+ <delete dir="${output.target}" />
+ <mkdir dir="${output.target}" />
+ <mkdir dir="${output.target}/service/${service.plugin.version}" />
+ <mkdir dir="${output.target}/codegen/${codegen.plugin.version}" />
+
<antcall target="install-service-plugin"/>
<antcall target="install-codegen-plugin"/>
+
+ <copy todir="${output.target}/service/${service.plugin.version}">
+ <fileset dir="${plugin.output.dir}/${service.plugin.version}"/>
+ </copy>
+ <copy todir="${output.target}/codegen/${codegen.plugin.version}">
+ <fileset dir="${plugin.output.dir}/${codegen.plugin.version}"/>
+ </copy>
+
+ <!--Zip the eclipse plugins to eclipse_plugins/target -->
+ <zip destfile="${output.target}/${codegen.plugin.zip.name}"
+ basedir="${output.target}/codegen"
+ update="true"
+ />
+ <zip destfile="${output.target}/${service.plugin.zip.name}"
+ basedir="${output.target}/service"
+ update="true"
+ />
+ <delete dir="${output.target}/service" />
+ <delete dir="${output.target}/codegen" />
</target>
<!-- Clean the directory -->
<target name="clean">
<delete dir="${output}"></delete>
+ </target>
+
+ <target name="help">
+ <echo message="****************************************************************************" />
+ <echo message="** Eclipse Plugin Build **" />
+ <echo message="** pre-requisit : env.ECLIPSE_HOME **" />
+ <echo message="** **" />
+ <echo message="** **" />
+ <echo message="** build eclipse projects : generate-service-project **" />
+ <echo message="** generate-codegen-project **" />
+ <echo message="** **" />
+ <echo message="** build eclipse plugins : generate-service-plugin **" />
+ <echo message="** generate-codegen-plugin **" />
+ <echo message="** **" />
+ <echo message="** install plugins : install-service-plugin **" />
+ <echo message="** install-codegen-plugin **" />
+ <echo message="** **" />
+ <echo message="** release eclipse plugins : release-plugins **" />
+ <echo message="** **" />
+ <echo message="** **" />
+ <echo message="** **" />
+ <echo message="** **" />
+ <echo message="** **" />
+ <echo message="** **" />
+ <echo message="****************************************************************************" />
+
</target>
</project>
Modified: webservices/axis2/branches/java/1_1/modules/tool/readme.txt
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/readme.txt?view=diff&rev=469800&r1=469799&r2=469800
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/readme.txt (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/readme.txt Tue Oct 31 23:32:04 2006
@@ -1,25 +1,41 @@
-================
-Using the tools
-================
-
-(1) elcipse plugins
-
-* Since the source for the tools has a dependency on the eclipse classes. one has to run the
- ant build file (create-project.xml) to generate a relevant eclipse project from the source.
-
-* [use the ant -f create-project.xml command]
-
-* Once the projects are generated (which can be found in the newly created eclipse_project
- directory) they can be opened in the Eclipse PDE for building and editing.
-
-* If you need to build and install the eclipse plugin to your local eclipse plugin directory
- * Edit the eclipse.home property to your eclipse home directory.
- * stop eclpse if still on operation.
- * use ant -f create-project.xml install-codegen-plugin install-service-plugin
- * or to release the plugins [ant -f create-project.xml release-plugins]
- * start eclipse
- * plugins will be accessible through [File -> New -> Other] ctl+n
-
-* The tool sources are not included in the build
-
-Note - The plugins are specifially for Eclipse version 3.1 and up
+================
+Using the tools
+================
+
+(1) elcipse plugins
+
+Note - The plugins are specificallyqp for Eclipse version 3.1 and up
+
+Create Eclipse Plugin Projects
+------------------------------
+
+ * Since the source for the tools has a dependency on the eclipse classes. one has to run the
+ ant build file (create-project.xml) to generate a relevant eclipse project from the source.
+
+ * In order to compile the plugin first you must do a maven create-lib on Axis2 Source and
+ set ECLIPSE_HOME environment variable to point to your eclipse home directory.
+
+ * use the ant -f create-project.xml command to generate the plugin projects.
+
+ * Once the projects are generated (which can be found in the newly created eclipse_project
+ directory) they can be opened in the Eclipse PDE for building and editing.
+
+ * This can be done by File -> Import -> Existing project into workspace on Elcipse menu and
+ point that to the eclipse_project directory newly created.
+
+Build Eclipse Plugin Projects
+------------------------------
+
+ * If you need to build and install the eclipse plugin to your local eclipse plugin directory
+ * In order to compile the plugin first you must do a maven create-lib on Axis2 Source and
+ set ECLIPSE_HOME environment variable to point to your eclipse home directory
+ * stop eclpse if still on operation.
+ * use ant -f create-project.xml install-codegen-plugin install-service-plugin
+ or to release the plugins [ant -f create-project.xml release-plugins]
+ * start eclipse
+ * plugins will be accessible through [File -> New -> Other] ctl+n under Axis2 Wizards.
+
+ * The tool sources are not included in the build
+
+ * To run the plugin you need please refer to
+ - Tools Page On Apache Axis 2 Documentation http://ws.apache.org/axis2/tools/
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org