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 di...@apache.org on 2006/10/27 03:10:37 UTC
svn commit: r468221 - in /webservices/axis2/branches/java/1_1/modules/tool:
axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/
axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/resource/
conf/ser...
Author: dims
Date: Thu Oct 26 18:10:36 2006
New Revision: 468221
URL: http://svn.apache.org/viewvc?view=rev&rev=468221
Log:
Fix for AXIS2-1515 - fix for the ide-plugin (eclipse-servise-archive-wizard) 1391 1428
Fix for AXIS2-1391 - Update "Eclipse Service Archive Creation" plugin
Fix for AXIS2-1428 - An error of a particular page is given at the end of the wizard in the "Axis2 Service Archiver"
Modified:
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/resource/ServiceResources.properties
webservices/axis2/branches/java/1_1/modules/tool/conf/service/.project
webservices/axis2/branches/java/1_1/modules/tool/conf/service/build.properties
webservices/axis2/branches/java/1_1/modules/tool/conf/service/plugin.xml
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java?view=diff&rev=468221&r1=468220&r2=468221
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java Thu Oct 26 18:10:36 2006
@@ -124,7 +124,7 @@
((ServiceArchiveWizard)this.getWizard()).setClassFileLocation(classLocationText);
if ("".equals(classLocationText)){
- updateStatus("page1.error.filemissing");
+ updateStatus(ServiceArchiver.getResourceString("page1.error.filemissing"));
}else{
updateStatus(null);
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java?view=diff&rev=468221&r1=468220&r2=468221
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java Thu Oct 26 18:10:36 2006
@@ -101,8 +101,8 @@
});
autoGenerateWSDLCheckButton.setToolTipText(ServiceArchiver.getResourceString("page5.autogen.tooltip"));
////////////////////////////////////////
- // Disable the automatic generation box
- autoGenerateWSDLCheckButton.setEnabled(false);
+ // enable the automatic generation box
+ autoGenerateWSDLCheckButton.setEnabled(true);
///////////////////////////////////////
//add an empty lable
@@ -115,8 +115,8 @@
skipWSDLCheckButton.setLayoutData(gd);
skipWSDLCheckButton.setSelection(settings.getBoolean(PREF_CHECK_SKIP_WSDL));
////////////////////////////////////////
- // Disable the skip check box
- skipWSDLCheckButton.setEnabled(false);
+ // enable the skip check box
+ skipWSDLCheckButton.setEnabled(true);
///////////////////////////////////////
skipWSDLCheckButton.addSelectionListener(new SelectionListener(){
public void widgetSelected(SelectionEvent e){
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/resource/ServiceResources.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/resource/ServiceResources.properties?view=diff&rev=468221&r1=468220&r2=468221
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/resource/ServiceResources.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/resource/ServiceResources.properties Thu Oct 26 18:10:36 2006
@@ -1,96 +1,99 @@
-################################################################
-################## Resources for the interface ###############
-##################### Default en_us ###########################
-#
-# Main page title
-main.title=Apache Axis Service Archiver
-
-#general texts
-#Ok button caption
-general.ok=Ok
-#Cancle button caption
-general.cancel=Cancel
-#Next button caption
-general.next=Next
-#Previous button caption
-general.prev=Prev
-#Finish button caption
-general.finish=Finish
-#browse
-general.browse=Browse...
-general.add=Add
-###############################################################################
-#Firstpage title
-page1.name=page1
-page1.title=Service Archiver
-page1.desc=Welcome to the new AXIS Service packager Wizard Interface.Insert the location for the class files here.
-# First page
-page1.fileLocationLabel=Class File Location
-page1.filedialogTitle=Browse for the class file location
-page1.filter.caption=Include .class files only
-page1.filedialogTitle=Browse for a location
-page1.error.filemissing=The specified file is missing
-################################################################################
-# second page
-page2.name=page2
-page2.title=Service Archiver
-page2.desc=Select the Service XML file to be included in the Service archive
-page2.selectservicexml.caption=Set the service XML file
-page2.generateauto.caption=Generate the service xml automatically
-page2.error.servicenameempty=Service XML should not be empty
-page2.error.servicenamewrong=Please select a file named service.xml
-###############################################################################
-#third page
-page3.name=page3
-page3.title=Service Archiver
-page3.desc=Generate the Service XML file
-page3.servicename.lable=Service name
-page3.servicename.tooltip=Put the name of the service here.
-page3.classname.lable=Class name
-page3.classname.tooltip=The class that you need to expose as the service. Note that this needs to be in the previosly selected folder
-page3.loadbutton.lable=Load
-page3.declared.lable=Search declared methods only
-page3.table.col1=Method name
-page3.table.col2=Return type
-page3.table.col3=Parameters
-page3.error.url=Error : invalid location
-page3.error.class=Error : Class not found
-page3.error.unknown=Error : Unknown error
-################################################################################
-#Fourth page
-page4.name=page4
-page4.title=Service Archiver
-page4.desc=Set the output loacation and the output file name
-page4.outputlocation.label=Output file location
-page4.outputname.label=Output File Name
-page4.dirdialog.caption=Browse for the output location
-#################################################################################
-#Fifth page
-page5.name=page5
-page5.title=Service Archiver
-page5.desc=Add the WSDL File
-page5.selectwsdl.caption=Select a WSDL file
-page5.generateauto.caption=Generate a WSDL file
-page5.autogen.tooltip=Tick this to generate a WSDL file automatically
-page5.recommendation=Since you generated the service.XML it is recommended that the WSDL is auto generated
-page5.error.wsdlnameempty=WSDL file name is empty
-page5.error.wsdlnamewrong=WSDL file name is invalid
-page5.skipWSDL.caption=Skip WSDL
-##################################################################################
-#Sixth page
-page6.name=page6
-page6.title=Service Archiver
-page6.desc=Add any external libraries
-page6.add=Add ->
-page6.remove=Remove <-
-page6.libnames.caption=Libraries
-page6.liblist.caption=Added libraries
-page6.liblist.count.caption= jars in list
-
-##################################################################################
-# Wizards error messages
-wizard.codegen.success=Service Archive Generated successfully!
-wizard.codegen.unknown.error=Unknown Error!
-wizard.codegen.success.msg.heading=Success
-wizard.codegen.error.msg.heading=Error
-wizard.codegen.startmsg=Running the archiving process
+################################################################
+################## Resources for the interface ###############
+##################### Default en_us ###########################
+#
+# Main page title
+main.title=Apache Axis Service Archiver
+
+#general texts
+#Ok button caption
+general.ok=Ok
+#Cancle button caption
+general.cancel=Cancel
+#Next button caption
+general.next=Next
+#Previous button caption
+general.prev=Prev
+#Finish button caption
+general.finish=Finish
+#browse
+general.browse=Browse...
+general.add=Add
+###############################################################################
+#Firstpage title
+page1.name=page1
+page1.title=Service Archiver
+page1.desc=Welcome to the new AXIS Service packager Wizard Interface.Insert the location for the class files here.
+# First page
+page1.fileLocationLabel=Class File Location
+page1.filedialogTitle=Browse for the class file location
+page1.filter.caption=Include .class files only
+page1.filedialogTitle=Browse for a location
+page1.error.filemissing=The specified file is missing
+################################################################################
+# second page
+page2.name=page2
+page2.title=Service Archiver
+page2.desc=Select the Service XML file to be included in the Service archive
+page2.selectservicexml.caption=Set the service XML file
+page2.generateauto.caption=Generate the service xml automatically
+page2.error.servicenameempty=Service XML should not be empty
+page2.error.servicenamewrong=Please select a file named service.xml
+###############################################################################
+#third page
+page3.name=page3
+page3.title=Service Archiver
+page3.desc=Generate the Service XML file
+page3.servicename.lable=Service name
+page3.servicename.tooltip=Put the name of the service here.
+page3.classname.lable=Class name
+page3.classname.tooltip=The class that you need to expose as the service. Note that this needs to be in the previosly selected folder
+page3.loadbutton.lable=Load
+page3.declared.lable=Search declared methods only
+page3.table.col1=Method name
+page3.table.col2=Return type
+page3.table.col3=Parameters
+page3.error.url=Error : invalid location
+page3.error.class=Error : Class not found
+page3.error.unknown=Error : Unknown error
+################################################################################
+#Fourth page
+page4.name=page4
+page4.title=Service Archiver
+page4.desc=Set the output loacation and the output file name
+page4.outputlocation.label=Output file location
+page4.outputname.label=Output File Name
+page4.dirdialog.caption=Browse for the output location
+# errors
+page4.error.location=Browse and enter the location to save the output file
+page4.error.filename=Enter a name for Service File (Ideally it sould be the service name ending with the valid extention *.jar)
+#################################################################################
+#Fifth page
+page5.name=page5
+page5.title=Service Archiver
+page5.desc=Add the WSDL File
+page5.selectwsdl.caption=Select a WSDL file
+page5.generateauto.caption=Generate a WSDL file
+page5.autogen.tooltip=Tick this to generate a WSDL file automatically
+page5.recommendation=Since you generated the service.XML it is recommended that the WSDL is auto generated
+page5.error.wsdlnameempty=WSDL file name is empty
+page5.error.wsdlnamewrong=WSDL file name is invalid
+page5.skipWSDL.caption=Skip WSDL
+##################################################################################
+#Sixth page
+page6.name=page6
+page6.title=Service Archiver
+page6.desc=Add any external libraries
+page6.add=Add ->
+page6.remove=Remove <-
+page6.libnames.caption=Libraries
+page6.liblist.caption=Added libraries
+page6.liblist.count.caption= jars in list
+
+##################################################################################
+# Wizards error messages
+wizard.codegen.success=Service Archive Generated successfully!
+wizard.codegen.unknown.error=Unknown Error!
+wizard.codegen.success.msg.heading=Success
+wizard.codegen.error.msg.heading=Error
+wizard.codegen.startmsg=Running the archiving process
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/service/.project
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/service/.project?view=diff&rev=468221&r1=468220&r2=468221
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/service/.project (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/service/.project Thu Oct 26 18:10:36 2006
@@ -1,29 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>Axis-ServiceArchiver</name>
- <comment></comment>
- <projects>
- <project>Axis-CodegenWizard</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Axis-ServiceArchiver</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
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=468221&r1=468220&r2=468221
==============================================================================
--- 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 Thu Oct 26 18:10:36 2006
@@ -1,17 +1,23 @@
-source.Axis_Service_Archiver.jar = src/
-output.Axis_Service_Archiver.jar = bin/
-bin.includes = plugin.xml,\
- Axis_Service_Archiver.jar,\
- icons/,\
- lib/,\
- help_toc.xml,\
- help/
-src.includes = icons/,\
- build.properties,\
- .project,\
- .classpath,\
- src/,\
- plugin.xml,\
- lib/,\
- help_toc.xml,\
- help/
+source.Axis_Service_Archiver.jar = src/
+output.Axis_Service_Archiver.jar = bin/
+bin.includes = plugin.xml,\
+ icons/,\
+ help_toc.xml,\
+ help/,\
+ lib/,\
+ src/,\
+ lib/axis2-codegen-1.1-RC1.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,\
+ src/,\
+ help_toc.xml,\
+ help/,\
+ .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=468221&r1=468220&r2=468221
==============================================================================
--- 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 Thu Oct 26 18:10:36 2006
@@ -11,23 +11,30 @@
<library name="Axis_Service_Archiver.jar">
<export name="*"/>
</library>
- <library name="lib/axis2-codegen-1.0.jar">
+ <library name="lib/axis2-codegen-1.1-RC1.jar">
<export name="*"/>
</library>
- <library name="lib/commons-logging-1.0.4.jar">
+ <library name="lib/axis2-kernel-1.1-RC1.jar">
<export name="*"/>
</library>
- <library name="lib/log4j-1.2.13.jar">
+ <library name="lib/commons-logging-1.1.jar">
+ <export name="*"/>
+ </library>
+ <library name="lib/log4j-1.2.8.jar">
+ <export name="*"/>
+ </library>
+ <library name="lib/ant-1.6.5.jar">
<export name="*"/>
</library>
</runtime>
<requires>
<import plugin="org.eclipse.ui"/>
+ <import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.core.runtime"/>
+ <import plugin="org.eclipse.core.resources"/>
<import plugin="org.apache.ant"/>
<import plugin="org.eclipse.jface.text"/>
- <import plugin="org.eclipse.ui.ide"/>
</requires>
<extension
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org