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 aj...@apache.org on 2005/09/22 14:55:58 UTC
svn commit: r290933 - in /webservices/axis2/trunk/java/modules/tool: ./
conf/codegen/ conf/service/ help/ help/codegen/ help/service/
src/org/apache/axis2/tool/service/eclipse/ui/
Author: ajith
Date: Thu Sep 22 05:55:32 2005
New Revision: 290933
URL: http://svn.apache.org/viewcvs?rev=290933&view=rev
Log:
1. Updated the plugins to include integrated help.
2. Added the necessary help/support files
3. Fixed some bugs in the plugins
4. Updated the ant script to generate the correct type of projects
Added:
webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath
webservices/axis2/trunk/java/modules/tool/conf/codegen/help_toc.xml
webservices/axis2/trunk/java/modules/tool/conf/service/.classpath
webservices/axis2/trunk/java/modules/tool/conf/service/help_toc.xml
webservices/axis2/trunk/java/modules/tool/help/
webservices/axis2/trunk/java/modules/tool/help/codegen/
webservices/axis2/trunk/java/modules/tool/help/codegen/codegen-help.html
webservices/axis2/trunk/java/modules/tool/help/service/
webservices/axis2/trunk/java/modules/tool/help/service/service-help.html
Modified:
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
webservices/axis2/trunk/java/modules/tool/create-project.xml
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
Added: webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath?rev=290933&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath (added)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/.classpath Thu Sep 22 05:55:32 2005
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/build.properties Thu Sep 22 05:55:32 2005
@@ -3,7 +3,8 @@
bin.includes = plugin.xml,\
Axis2CodegenWizard.jar,\
icons/,\
- lib/
+ lib/,\
+ bin/
src.includes = icons/,\
plugin.xml,\
src/
Added: webservices/axis2/trunk/java/modules/tool/conf/codegen/help_toc.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/codegen/help_toc.xml?rev=290933&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/help_toc.xml (added)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/help_toc.xml Thu Sep 22 05:55:32 2005
@@ -0,0 +1,3 @@
+<toc label="Axis2 Code Generator" >
+ <topic label="Code Generator" href="help/codegen-help.html"/>
+</toc>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/codegen/plugin.xml Thu Sep 22 05:55:32 2005
@@ -55,5 +55,8 @@
id="org.apache.axis2.tool.codegen.eclipse.CodeGenWizard">
</wizard>
</extension>
+ <extension point="org.eclipse.help.toc">
+ <toc file="help_toc.xml" primary="true" />
+</extension>
</plugin>
Added: webservices/axis2/trunk/java/modules/tool/conf/service/.classpath
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/service/.classpath?rev=290933&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/.classpath (added)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/.classpath Thu Sep 22 05:55:32 2005
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Modified: webservices/axis2/trunk/java/modules/tool/conf/service/build.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/service/build.properties?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/build.properties Thu Sep 22 05:55:32 2005
@@ -2,4 +2,16 @@
output.Axis_Service_Archiver.jar = bin/
bin.includes = plugin.xml,\
Axis_Service_Archiver.jar,\
- icons/
+ icons/,\
+ lib/,\
+ help_toc.xml,\
+ help/
+src.includes = icons/,\
+ build.properties,\
+ .project,\
+ .classpath,\
+ src/,\
+ plugin.xml,\
+ lib/,\
+ help_toc.xml,\
+ help/
Added: webservices/axis2/trunk/java/modules/tool/conf/service/help_toc.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/service/help_toc.xml?rev=290933&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/help_toc.xml (added)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/help_toc.xml Thu Sep 22 05:55:32 2005
@@ -0,0 +1,3 @@
+<toc label="Axis2 Service Archiver" >
+ <topic label="Service Archiver" href="help/service-help.html"/>
+</toc>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml Thu Sep 22 05:55:32 2005
@@ -38,4 +38,7 @@
id="org.apache.axis2.tool.service.serviceWizard">
</wizard>
</extension>
+ <extension point="org.eclipse.help.toc">
+ <toc file="help_toc.xml" primary="true" />
+</extension>
</plugin>
Modified: webservices/axis2/trunk/java/modules/tool/create-project.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/create-project.xml?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/create-project.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/create-project.xml Thu Sep 22 05:55:32 2005
@@ -8,17 +8,22 @@
<property name="source.dir.name" value="src"></property>
<property name="lib.dir.name" value="lib"></property>
<property name="bin.dir.name" value="bin"></property>
+ <property name="help.dir.name" value="help"></property>
<property name="codegen.resource.dir" value="./conf/codegen"></property>
<property name="service.resource.dir" value="./conf/service"></property>
+ <property name="codegen.help.resource.dir" value="./help/codegen"></property>
+ <property name="service.help.resource.dir" value="./help/service"></property>
+
+
<!-- Default target to generate all the services -->
<target name="all">
<antcall target="generate-service-project"/>
<antcall target="generate-codegen-project"/>
</target>
- <!-- inith-->
+ <!-- init-->
<target name="init">
<mkdir dir="${output}"></mkdir>
<mkdir dir="${service.output.dir}"></mkdir>
@@ -35,9 +40,19 @@
<copy todir="${service.output.dir}">
<fileset dir="${service.resource.dir}"></fileset>
</copy>
- <!-- create bin directory -->
- <mkdir dir="${bin.dir.name}"></mkdir>
-
+ <!-- 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 dir="${service.help.resource.dir}"></fileset>
+ </copy>
+ <available property="images.dir" file="../../xdocs/images/tools" type="dir" value="../../xdocs/images/tools"/>
+ <copy todir="${service.output.dir}/${help.dir.name}">
+ <fileset dir="${images.dir}"/>
+ </copy>
+
</target>
<!--generate the codegen project-->
@@ -52,8 +67,20 @@
<fileset dir="${codegen.resource.dir}"></fileset>
</copy>
<!-- create bin directory -->
- <mkdir 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 todir="${codegen.output.dir}/${help.dir.name}">
+ <fileset dir="${codegen.help.resource.dir}"></fileset>
+ </copy>
+ <available property="images.dir" file="../../xdocs/images/tools" type="dir" value="../../xdocs/images/tools"/>
+ <copy todir="${codegen.output.dir}/${help.dir.name}">
+ <fileset dir="${images.dir}"/>
+ </copy>
+
</target>
+
<!-- Clean the directory -->
<target name="clean">
Added: webservices/axis2/trunk/java/modules/tool/help/codegen/codegen-help.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/help/codegen/codegen-help.html?rev=290933&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/help/codegen/codegen-help.html (added)
+++ webservices/axis2/trunk/java/modules/tool/help/codegen/codegen-help.html Thu Sep 22 05:55:32 2005
@@ -0,0 +1,48 @@
+<title>Code Generator Wizard - Eclipse Plug-in</title>
+<h1>Code Generator Wizard - Eclipse Plug-in</h1>
+<h2>Introduction</h2>
+<p>The Axis2 code generator comes built-in with an
+<a href="http://www.eclipse.org">Eclipse</a> plug-in. This document explains the
+usage of the code generator plug-in. The full documentation that includes the installation is avaialble
+at the Axis2 web site</p>
+<h2>Operation</h2>
+<p>If the plug-in is properly installed you should see a new wizard under the
+"New" section.(use the File -> New -> Other or Ctrl + N ) </p>
+<p>
+<img border="0" src="wizardSelectionPage.jpg" width="500" height="500"></p>
+<p>Selecting the wizard and pressing the next button will start the code
+generator wizard. Following is the first wizard page.</p>
+<p>
+<img border="0" src="toolSelectionpage.jpg" width="557" height="501"></p>
+<p>Selecting the generate code from WSDL option leads to the next page. Note
+that the Java-to-WSDL tool is disabled.</p>
+<p>
+<img border="0" src="WSDLSelectionPage.jpg" width="518" height="500"></p>
+<p>To move on to the next page the WSDL file location must be given. The browse
+button can be used to easily browse for a file rather than typing the whole
+path.</p>
+<p>Once the WSDL file is selected, codegen options are to be selected. By far
+this is the most important page in this wizard, which determines the
+characteristics of the code being generated. Novices need not worry about these
+options since the most common options are defaulted, But advanced users will
+find it very easy to "turn the knobs" using these options.</p>
+<p><img border="0" src="OptionsPage.jpg" width="518" height="500"></p>
+<p>Once the options are taken care of, only the final step of the code
+generation is left. it is the selection of the output file location.</p>
+<p><img border="0" src="OutputPage.jpg" width="518" height="500"></p>
+<p>When the output file location is selected, the Finish button will be enabled.
+Pressing the finish button will generate the code and a message box will pop up
+acknowledging the success. Well Done! You've successfully completed Axis2 Code generation.</p>
+<h1>Appendix</h1>
+<ul>
+ <li>Eclipse reference - <a href="http://www.eclipse.org/">
+ http://www.eclipse.org/</a></li>
+ <li>Custom Ant Tasks -
+ <a href="http://ant.apache.org/manual/develop.html">
+ http://ant.apache.org/manual/develop.html</a></li>
+</ul>
+<p> </p>
+<p> </p>
+<p> </p>
+<p> </p>
+<p> </p>
\ No newline at end of file
Added: webservices/axis2/trunk/java/modules/tool/help/service/service-help.html
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/help/service/service-help.html?rev=290933&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/help/service/service-help.html (added)
+++ webservices/axis2/trunk/java/modules/tool/help/service/service-help.html Thu Sep 22 05:55:32 2005
@@ -0,0 +1,21 @@
+<title>Service Archive Generator Wizard - Eclipse Plug-in</title>
+<h1>Service Archive Generator Wizard - Eclipse Plug-in</h1>
+<h2>Introduction</h2>
+<p>As part of the Axis2 tool set, the service archive generator is an important tool that
+allows the generation of service archives.This document explains the
+usage of the archive generator plug-in. The full documentation that includes the installation is avaialble
+at the Axis2 web site</p>
+<h2>Operation</h2>
+<p>If the plug-in is properly installed you should see a new wizard under the
+"New" section.(use the File -> New -> Other or Ctrl + N ) </p>
+<p>
+<h1> Fill all this </h1></p>
+<h1>Appendix</h1>
+<ul>
+ <li>Eclipse reference - <a href="http://www.eclipse.org/">
+ http://www.eclipse.org/</a></li>
+ <li>Custom Ant Tasks -
+ <a href="http://ant.apache.org/manual/develop.html">
+ http://ant.apache.org/manual/develop.html</a></li>
+</ul>
+<hr/>
\ No newline at end of file
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java Thu Sep 22 05:55:32 2005
@@ -110,7 +110,7 @@
dummyLabel.setText(ServiceArchiver.getResourceString("page6.liblist.caption"));
dummyLabel.setLayoutData(gd);
- gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd = new GridData(GridData.FILL_BOTH);
gd.horizontalSpan = 3;
gd.verticalSpan = 5;
@@ -158,7 +158,7 @@
}
private void updateList(){
- jarFilecountLabel.setText(jarFileList.getItemCount() + ServiceArchiver.getResourceString("page6.liblist.count.caption"));
+ jarFilecountLabel.setText(jarFileList.getItemCount() + " " + ServiceArchiver.getResourceString("page6.liblist.count.caption"));
settings.put(PREF_LIB_LIBNAMES,jarFileList.getItems());
}
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java Thu Sep 22 05:55:32 2005
@@ -75,7 +75,7 @@
}
public void updateServiceXMLGeneration(boolean status){
- updateServiceGenerationStatus = status;
+ serviceXMLGenerationPage.setPageComplete(status);
}
/**
*
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java Thu Sep 22 05:55:32 2005
@@ -121,6 +121,7 @@
handleSelection();
}else{
setPageComplete(false);
+ updateGenerationPage(false);
}
@@ -142,20 +143,20 @@
changeManualSelectionStatus(false);
this.skipNextPage = false;
updateStatus(null);
- //updateGenerationPage(false);
+ updateGenerationPage(false);
}else{
changeManualSelectionStatus(true);
this.skipNextPage = true;
handleModify();
- //updateGenerationPage(true);
+ updateGenerationPage(true);
}
}
-// private void updateGenerationPage(boolean status){
-// ServiceArchiveWizard wizard = (ServiceArchiveWizard)this.getWizard();
-// wizard.updateServiceXMLGeneration(status);
-//
-// }
+ private void updateGenerationPage(boolean status){
+ ServiceArchiveWizard wizard = (ServiceArchiveWizard)this.getWizard();
+ wizard.updateServiceXMLGeneration(status);
+
+ }
private void changeManualSelectionStatus(boolean state){
this.serviceXMLText.setEnabled(state);
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java?rev=290933&r1=290932&r2=290933&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java Thu Sep 22 05:55:32 2005
@@ -154,6 +154,8 @@
if (restoredFromPreviousSettings){
//try running the update
updateTable();
+ }else{
+ setPageComplete(false);
}
@@ -217,10 +219,10 @@
try {
String classFileLocation = getClassFileLocation();
URL classFileURL = new File(classFileLocation).toURL();
- ClassLoader loader = new URLClassLoader(new URL[] { classFileURL },Thread.currentThread().getContextClassLoader());
-
- Class clazz = loader.loadClass(classNameTextBox.getText());
+ ClassLoader loader = new URLClassLoader(new URL[] { classFileURL });
+ Class clazz = Class.forName(classNameTextBox.getText(),false,loader);
Method[] methods = null;
+
if (searchDeclaredMethodsCheckBox.getSelection()){
methods = clazz.getDeclaredMethods();