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 ch...@apache.org on 2006/10/30 06:11:17 UTC
svn commit: r469072 - in /webservices/axis2/branches/java/1_1/modules/tool:
./ axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/
axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/
conf/codegen/ con...
Author: chinthaka
Date: Sun Oct 29 21:11:16 2006
New Revision: 469072
URL: http://svn.apache.org/viewvc?view=rev&rev=469072
Log:
Applying the patch in https://issues.apache.org/jira/browse/AXIS2-1543. Thanks Sandakith.
Modified:
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
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/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java?view=diff&rev=469072&r1=469071&r2=469072
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/WSDL2JavaGenerator.java Sun Oct 29 21:11:16 2006
@@ -18,8 +18,8 @@
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.WSDL11ToAxisServiceBuilder;
-import org.apache.axis2.wsdl.util.CommandLineOption;
-import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
+import org.apache.axis2.util.CommandLineOption;
+import org.apache.axis2.util.CommandLineOptionConstants;
import javax.wsdl.WSDLException;
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java?view=diff&rev=469072&r1=469071&r2=469072
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-codegen-plugin/src/main/java/org/apache/axis2/tool/codegen/eclipse/CodeGenWizard.java Sun Oct 29 21:11:16 2006
@@ -33,7 +33,7 @@
import org.apache.axis2.tool.core.SrcCompiler;
import org.apache.axis2.wsdl.codegen.CodeGenConfiguration;
import org.apache.axis2.wsdl.codegen.CodeGenerationEngine;
-import org.apache.axis2.wsdl.util.CommandLineOptionConstants;
+import org.apache.axis2.util.CommandLineOptionConstants;
import org.apache.ws.java2wsdl.Java2WSDLCodegenEngine;
import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
import org.eclipse.core.resources.IWorkspaceRoot;
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=469072&r1=469071&r2=469072
==============================================================================
--- 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 Sun Oct 29 21:11:16 2006
@@ -13,22 +13,15 @@
lib/axiom-api-SNAPSHOT.jar,\
lib/axiom-dom-SNAPSHOT.jar,\
lib/axiom-impl-SNAPSHOT.jar,\
- lib/axis2-adb-1.1-RC1.jar,\
- lib/axis2-adb-codegen-1.1-RC1.jar,\
- lib/axis2-codegen-1.1-RC1.jar,\
- lib/axis2-java2wsdl-1.1-RC1.jar,\
- lib/axis2-kernel-1.1-RC1.jar,\
+ lib/axis2-1.1-SNAPSHOT.jar,\
lib/commons-logging-1.1.jar,\
- lib/jakarta-oro-2.0.8.jar,\
- lib/jalopy-1.0b11.jar,\
- lib/log4j-1.2.8.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/axis2-xmlbeans-1.1-RC1.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=469072&r1=469071&r2=469072
==============================================================================
--- 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 Sun Oct 29 21:11:16 2006
@@ -29,31 +29,13 @@
<library name="lib/axiom-impl-SNAPSHOT.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-adb-1.1-RC1.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-adb-codegen-1.1-RC1.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-codegen-1.1-RC1.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-java2wsdl-1.1-RC1.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-kernel-1.1-RC1.jar">
- <export name="*"/>
- </library>
<library name="lib/commons-logging-1.1.jar">
<export name="*"/>
</library>
- <library name="lib/jakarta-oro-2.0.8.jar">
+ <library name="lib/axis2-1.1-SNAPSHOT.jar">
<export name="*"/>
</library>
- <library name="lib/jalopy-1.0b11.jar">
- <export name="*"/>
- </library>
- <library name="lib/log4j-1.2.8.jar">
+ <library name="lib/log4j-1.2.13.jar">
<export name="*"/>
</library>
<library name="lib/neethi-SNAPSHOT.jar">
@@ -72,9 +54,6 @@
<export name="*"/>
</library>
<library name="lib/XmlSchema-SNAPSHOT.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-xmlbeans-1.1-RC1.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=469072&r1=469071&r2=469072
==============================================================================
--- 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 Sun Oct 29 21:11:16 2006
@@ -6,11 +6,10 @@
help/,\
lib/,\
src/,\
- lib/axis2-codegen-1.1-RC1.jar,\
+ 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-kernel-1.1-RC1.jar,\
Axis_Service_Archiver.jar
src.includes = icons/,\
plugin.xml,\
@@ -20,4 +19,3 @@
.project,\
.classpath,\
build.properties
-jars.compile.order = Axis_Service_Archiver.jar
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=469072&r1=469071&r2=469072
==============================================================================
--- 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 Sun Oct 29 21:11:16 2006
@@ -11,16 +11,13 @@
<library name="Axis_Service_Archiver.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-codegen-1.1-RC1.jar">
- <export name="*"/>
- </library>
- <library name="lib/axis2-kernel-1.1-RC1.jar">
+ <library name="lib/axis2-1.1-SNAPSHOT.jar">
<export name="*"/>
</library>
<library name="lib/commons-logging-1.1.jar">
<export name="*"/>
</library>
- <library name="lib/log4j-1.2.8.jar">
+ <library name="lib/log4j-1.2.13.jar">
<export name="*"/>
</library>
<library name="lib/ant-1.6.5.jar">
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=469072&r1=469071&r2=469072
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/create-project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/create-project.xml Sun Oct 29 21:11:16 2006
@@ -1,8 +1,7 @@
<project basedir="." default="all">
<!--Set your elcipse home directory -->
- <property name="eclipse.home" value="----PATH TO ECLIPSE HOME----"></property>
-
+ <property name="eclipse.home" value="----ECLIPSE HOME -----"></property>
<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>
@@ -40,7 +39,7 @@
<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="axis2-1.1-SNAPSHOT.jar" />
<include name="commons-logging-1.1.jar" />
<include name="log4j-1.2.13.jar" />
<include name="neethi-SNAPSHOT.jar" />
@@ -53,10 +52,10 @@
<!--Service wizard libraries -->
<fileset id="service.libs" dir="${axis2.lib.dir}">
- <include name="ant-1.6.5.jar" />
+ <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="axis2-1.1-SNAPSHOT.jar" />
</fileset>
@@ -74,11 +73,11 @@
<mkdir dir="${service.output.dir}"></mkdir>
<mkdir dir="${codegen.output.dir}"></mkdir>
</target>
+
<!-- generate the service archiver project -->
<target name="generate-service-project" depends="init">
- <mkdir dir="${service.output.dir}/${source.dir.name}"></mkdir>
- <!-- copy the source to src -->
- <copy todir="${service.output.dir}/${source.dir.name}">
+ <!-- copy the source -->
+ <copy todir="${service.output.dir}">
<fileset dir="${service.src.dir}" excludes="**/codegen/**/*.java"/>
</copy>
<!-- Copy the other stuff -->
@@ -105,9 +104,8 @@
<!--generate the codegen project-->
<target name="generate-codegen-project" depends="init">
- <mkdir dir="${codegen.output.dir}/${source.dir.name}"></mkdir>
- <!-- copy the source to src -->
- <copy todir="${codegen.output.dir}/${source.dir.name}">
+ <!-- copy the source -->
+ <copy todir="${codegen.output.dir}">
<fileset dir="${codegen.src.dir}" excludes="**/service/**/*.java"/>
</copy>
<!-- Copy the other stuff -->
@@ -115,7 +113,7 @@
<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 -->
@@ -155,13 +153,15 @@
</copy>
<!-- copy the sources to the plugin-->
<copy todir="${codegen.plugin.output.dir}/src">
- <fileset dir="${codegen.output.dir}/src" />
+ <fileset dir="${codegen.output.dir}">
+ <include name="org/**" />
+ </fileset>
</copy>
<!-- compile the plugin java files -->
<delete dir="${codegen.plugin.output.dir}/class"></delete>
<mkdir dir="${codegen.plugin.output.dir}/class"></mkdir>
- <javac srcdir="${codegen.output.dir}/src"
+ <javac srcdir="${codegen.output.dir}"
destdir="${codegen.plugin.output.dir}/class"
includes="org/apache/axis2/**">
<classpath>
@@ -176,7 +176,7 @@
<!-- create the Axis2CodegenWizard.jar -->
<copy todir="${codegen.plugin.output.dir}/class">
- <fileset dir="${codegen.output.dir}/src" >
+ <fileset dir="${codegen.output.dir}" >
<include name="**/Codegen.properties" />
</fileset>
</copy>
@@ -221,13 +221,15 @@
</copy>
<!-- copy the sources to the plugin-->
<copy todir="${service.plugin.output.dir}/src">
- <fileset dir="${service.output.dir}/src" />
+ <fileset dir="${service.output.dir}">
+ <include name="org/**" />
+ </fileset>
</copy>
<!-- compile the plugin java files -->
<delete dir="${service.plugin.output.dir}/class"></delete>
<mkdir dir="${service.plugin.output.dir}/class"></mkdir>
- <javac srcdir="${service.output.dir}/src"
+ <javac srcdir="${service.output.dir}"
destdir="${service.plugin.output.dir}/class"
includes="org/apache/axis2/**">
<classpath>
@@ -242,7 +244,7 @@
<!-- create the Axis_Service_Archiver.jar -->
<copy todir="${service.plugin.output.dir}/class">
- <fileset dir="${service.output.dir}/src" >
+ <fileset dir="${service.output.dir}" >
<include name="**/ServiceResources.properties" />
</fileset>
</copy>
@@ -259,6 +261,12 @@
<copy todir="${eclipse.home}/plugins">
<fileset dir="${plugin.output.dir}"/>
</copy>
+ </target>
+
+ <!--Relese the plugins -->
+ <target name="release-plugins">
+ <antcall target="install-service-plugin"/>
+ <antcall target="install-codegen-plugin"/>
</target>
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=469072&r1=469071&r2=469072
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/readme.txt (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/readme.txt Sun Oct 29 21:11:16 2006
@@ -1,12 +1,25 @@
-===========================
-Using the tools source
-===========================
-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.
+================
+Using the tools
+================
-The tool sources are not included in the build
+(1) elcipse plugins
-Note - The plugins are specifially for Eclipse version 3.0 and up
\ No newline at end of file
+* 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
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org