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/21 15:28:13 UTC
svn commit: r290691 - in /webservices/axis2/trunk/java/modules/tool:
conf/service/ src/org/apache/axis2/tool/core/
src/org/apache/axis2/tool/service/bean/
src/org/apache/axis2/tool/service/control/
src/org/apache/axis2/tool/service/eclipse/plugin/ src/...
Author: ajith
Date: Wed Sep 21 06:27:25 2005
New Revision: 290691
URL: http://svn.apache.org/viewcvs?rev=290691&view=rev
Log:
1. Updated the eclipse service archive generator tool. Now it's functonality is almost finished.
2. Cleaned up the SVN a bit. Now the unwanted classes are removed
Added:
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/LibrarySelectionBean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java
Removed:
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane1.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane2.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane3.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WizardPane4.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/resource/ServiceResources_de.properties
Modified:
webservices/axis2/trunk/java/modules/tool/conf/service/.project
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/src/org/apache/axis2/tool/core/ClassFileHandler.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/FileCopier.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/ClassFileSelectionBean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page2Bean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page3Bean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLAutoGenerateOptionBean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLFileLocationBean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WizardBean.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/ProcessException.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.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
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java
webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/resource/ServiceResources.properties
Modified: webservices/axis2/trunk/java/modules/tool/conf/service/.project
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/conf/service/.project?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/.project (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/.project Wed Sep 21 06:27:25 2005
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>Axis-CodegenWizard</name>
+ <name>Axis-ServiceArchiver</name>
<comment></comment>
<projects>
+ <project>Axis-CodegenWizard</project>
</projects>
<buildSpec>
<buildCommand>
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=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/build.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/build.properties Wed Sep 21 06:27:25 2005
@@ -1,4 +1,5 @@
-source.Axis_ServiceArchiver.jar = src/
-output.Axis_ServiceArchiver.jar = bin/
+source.Axis_Service_Archiver.jar = src/
+output.Axis_Service_Archiver.jar = bin/
bin.includes = plugin.xml,\
- Axis_ServiceArchiver.jar
+ Axis_Service_Archiver.jar,\
+ icons/
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=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml (original)
+++ webservices/axis2/trunk/java/modules/tool/conf/service/plugin.xml Wed Sep 21 06:27:25 2005
@@ -11,6 +11,9 @@
<library name="Axis_Service_Archiver.jar">
<export name="*"/>
</library>
+ <library name="lib/axis2-1.0-alpha.jar">
+ <export name="*"/>
+ </library>
</runtime>
<requires>
@@ -19,7 +22,6 @@
<import plugin="org.apache.ant"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.ide"/>
- <import plugin="Axis2_Codegen_Wizard"/>
</requires>
<extension
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ClassFileHandler.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,14 @@
+package org.apache.axis2.tool.core;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+
+import sun.misc.URLClassPath;
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -13,18 +24,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis2.tool.core;
-
-import sun.misc.URLClassPath;
-
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Enumeration;
public class ClassFileHandler {
@@ -42,10 +41,10 @@
throw new IOException("the location is invalid");
URL[] urlList = {fileEndpoint.toURL()};
URLClassPath classLoader = new URLClassPath(urlList);
- Enumeration enumeration = classLoader.getResources("");
+ Enumeration enum = classLoader.getResources("");
- while (enumeration.hasMoreElements()) {
- Object o = enumeration.nextElement();
+ while (enum.hasMoreElements()) {
+ Object o = enum.nextElement();
System.out.println("o = " + o);
}
return null;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/FileCopier.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/FileCopier.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/FileCopier.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/FileCopier.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,11 @@
+package org.apache.axis2.tool.core;
+
+import java.io.File;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Copy;
+import org.apache.tools.ant.types.FileSet;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -13,14 +21,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis2.tool.core;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Copy;
-import org.apache.tools.ant.types.FileSet;
-
-import java.io.File;
public class FileCopier extends Copy{
public FileCopier() {
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/JarFileWriter.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,11 @@
+package org.apache.axis2.tool.core;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.taskdefs.Jar;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -13,15 +21,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis2.tool.core;
-
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Jar;
-
-import java.io.File;
-import java.io.IOException;
-
public class JarFileWriter extends Jar{
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/core/ServiceFileCreator.java Wed Sep 21 06:27:25 2005
@@ -1,39 +1,39 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package org.apache.axis2.tool.core;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
import org.apache.axis2.wsdl.codegen.writer.ClassWriter;
import org.apache.axis2.wsdl.codegen.writer.ServiceXMLWriter;
import org.apache.crimson.tree.XmlDocument;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
+/*
+* Copyright 2004,2005 The Apache Software Foundation.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
public class ServiceFileCreator {
public File createServiceFile(String serviceName,String implementationClassName,ArrayList methodList) throws Exception {
String currentUserDir = System.getProperty("user.dir");
- String fileName = "service.xml";
+ String fileName = "services.xml";
ClassWriter serviceXmlWriter = new ServiceXMLWriter(currentUserDir);
writeClass(getServiceModel(serviceName,implementationClassName,methodList),serviceXmlWriter,fileName);
@@ -48,7 +48,7 @@
private XmlDocument getServiceModel(String serviceName,String className,ArrayList methods){
XmlDocument doc = new XmlDocument();
Element rootElement = doc.createElement("interface");
- addAttribute(doc,"package","", rootElement);
+ addAttribute(doc,"classpackage","", rootElement);
addAttribute(doc,"name",className,rootElement);
addAttribute(doc,"servicename",serviceName,rootElement);
Element methodElement = null;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/ClassFileSelectionBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/ClassFileSelectionBean.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/ClassFileSelectionBean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/ClassFileSelectionBean.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,5 @@
+package org.apache.axis2.tool.service.bean;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -13,8 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis2.tool.service.bean;
public class ClassFileSelectionBean {
private String fileLocation;
Added: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/LibrarySelectionBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/LibrarySelectionBean.java?rev=290691&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/LibrarySelectionBean.java (added)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/LibrarySelectionBean.java Wed Sep 21 06:27:25 2005
@@ -0,0 +1,27 @@
+
+package org.apache.axis2.tool.service.bean;
+
+/**
+ * @author Ajith
+ *
+
+ */
+public class LibrarySelectionBean {
+
+ private String[] fileList = null;
+
+
+
+ /**
+ * @return Returns the fileList.
+ */
+ public String[] getFileList() {
+ return fileList;
+ }
+ /**
+ * @param fileList The fileList to set.
+ */
+ public void setFileList(String[] fileList) {
+ this.fileList = fileList;
+ }
+}
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page2Bean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page2Bean.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page2Bean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page2Bean.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,7 @@
+package org.apache.axis2.tool.service.bean;
+
+import java.util.ArrayList;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -14,13 +18,9 @@
* limitations under the License.
*/
-package org.apache.axis2.tool.service.bean;
-
-import java.util.ArrayList;
-
public class Page2Bean {
- private boolean manual;
- private boolean automatic;
+ private boolean manual = false;
+ private boolean automatic = false;
private String manualFileName;
private String automaticClassName;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page3Bean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page3Bean.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page3Bean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/Page3Bean.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,5 @@
+package org.apache.axis2.tool.service.bean;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -13,8 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis2.tool.service.bean;
public class Page3Bean {
private String outputFolderName;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLAutoGenerateOptionBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLAutoGenerateOptionBean.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLAutoGenerateOptionBean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLAutoGenerateOptionBean.java Wed Sep 21 06:27:25 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.bean;
import java.util.Vector;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLFileLocationBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLFileLocationBean.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLFileLocationBean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WSDLFileLocationBean.java Wed Sep 21 06:27:25 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.bean;
public class WSDLFileLocationBean {
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WizardBean.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WizardBean.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WizardBean.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/bean/WizardBean.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,5 @@
+package org.apache.axis2.tool.service.bean;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -14,14 +16,27 @@
* limitations under the License.
*/
-package org.apache.axis2.tool.service.bean;
-
public class WizardBean {
private ClassFileSelectionBean classFileBean;
private WSDLFileLocationBean wsdlBean;
+ private LibrarySelectionBean libraryBean;
+
private Page2Bean page2bean;
private Page3Bean page3bean;
+
+ /**
+ * @return Returns the libraryBean.
+ */
+ public LibrarySelectionBean getLibraryBean() {
+ return libraryBean;
+ }
+ /**
+ * @param libraryBean The libraryBean to set.
+ */
+ public void setLibraryBean(LibrarySelectionBean libraryBean) {
+ this.libraryBean = libraryBean;
+ }
/**
* @return Returns the wsdlBean.
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/Controller.java Wed Sep 21 06:27:25 2005
@@ -1,19 +1,3 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
package org.apache.axis2.tool.service.control;
import org.apache.axis2.tool.core.ClassFileHandler;
@@ -21,6 +5,7 @@
import org.apache.axis2.tool.core.JarFileWriter;
import org.apache.axis2.tool.core.ServiceFileCreator;
import org.apache.axis2.tool.service.bean.ClassFileSelectionBean;
+import org.apache.axis2.tool.service.bean.LibrarySelectionBean;
import org.apache.axis2.tool.service.bean.Page2Bean;
import org.apache.axis2.tool.service.bean.Page3Bean;
import org.apache.axis2.tool.service.bean.WSDLFileLocationBean;
@@ -29,6 +14,23 @@
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
+
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
public class Controller {
@@ -57,6 +59,7 @@
ClassFileSelectionBean page1Bean = bean.getPage1bean();
WSDLFileLocationBean wsdlBean = bean.getWsdlBean();
+ LibrarySelectionBean libBean = bean.getLibraryBean();
Page2Bean page2Bean = bean.getPage2bean();
Page3Bean page3Bean = bean.getPage3bean();
@@ -94,7 +97,7 @@
}
serviceFile =
new ServiceFileCreator().createServiceFile(
- page2Bean.getProviderClassName(),
+ page2Bean.getServiceName(),
page2Bean.getAutomaticClassName(),
page2Bean.getSelectedMethodNames());//create the file here
isServiceCreated = true;
@@ -111,6 +114,22 @@
}
}
+ List fileList = new ArrayList();
+ //check the libs
+ if (libBean!=null){
+ String[] files = libBean.getFileList();
+ File tempFile = null;
+ if (files!=null){
+ for (int i=0;i<files.length;i++){
+ tempFile = new File(files[i]);
+ if (!tempFile.exists()||tempFile.isDirectory()){
+ throw new ProcessException("Invalid libraries");
+ }else{
+ fileList.add(tempFile);
+ }
+ }
+ }
+ }
outputFolder = new File(page3Bean.getOutputFolderName());
outputFileName = page3Bean.getOutputFileName();
@@ -124,11 +143,23 @@
//create a temporary directory and copy the files
tempFileFolder = new File("Service-copy");
tempFileFolder.mkdir();
+
File metaInfFolder = new File(tempFileFolder, "META-INF");
metaInfFolder.mkdir();
-
- new FileCopier().copyFiles(classFileFolder, tempFileFolder,null);
- new FileCopier().copyFiles(serviceFile, metaInfFolder,null);
+
+ File libFolder = new File(tempFileFolder,"lib");
+ libFolder.mkdir();
+
+ FileCopier copier = new FileCopier();
+ //copy the classes
+ copier.copyFiles(classFileFolder, tempFileFolder,page1Bean.getFilter());
+ //copy the service.xml
+ copier.copyFiles(serviceFile, metaInfFolder,null);
+ //copy the libs
+ for (int i=0;i < fileList.size();i++){
+ copier.copyFiles((File)fileList.get(i),libFolder,null);
+ }
+
if (isWSDLAvailable){
new FileCopier().copyFiles(wsdlFile, metaInfFolder,null);
}
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/ProcessException.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/ProcessException.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/ProcessException.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/control/ProcessException.java Wed Sep 21 06:27:25 2005
@@ -1,3 +1,5 @@
+package org.apache.axis2.tool.service.control;
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -13,8 +15,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-package org.apache.axis2.tool.service.control;
public class ProcessException extends Exception {
public ProcessException() {
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/plugin/ServiceArchiver.java Wed Sep 21 06:27:25 2005
@@ -1,4 +1,4 @@
-/*
+/**
* Copyright 2004,2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.plugin;
import org.eclipse.jface.resource.ImageDescriptor;
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java Wed Sep 21 06:27:25 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
@@ -67,6 +66,7 @@
return false;
}
+ //public abstract WizardBean getBean();
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ClassFileLocationPage.java Wed Sep 21 06:27:25 2005
@@ -1,19 +1,18 @@
-/*
+/**
* Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
@@ -121,6 +120,9 @@
private void handleModify(){
String classLocationText = this.classFileLocationText.getText().trim();
settings.put(PREF_CLASS_FILE_LOCATION,classLocationText);
+ //update the wizard
+ ((ServiceArchiveWizard)this.getWizard()).setClassFileLocation(classLocationText);
+
if ("".equals(classLocationText)){
updateStatus("page1.error.filemissing");
}else{
Added: 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=290691&view=auto
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java (added)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java Wed Sep 21 06:27:25 2005
@@ -0,0 +1,171 @@
+
+package org.apache.axis2.tool.service.eclipse.ui;
+
+import org.apache.axis2.tool.service.bean.LibrarySelectionBean;
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.FileDialog;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.List;
+import org.eclipse.swt.widgets.Text;
+
+/**
+ * @author Ajith
+ *
+
+ */
+public class LibraryAddingPage extends AbstractServiceWizardPage {
+
+ private Label libraryNameLabel;
+ private Text libraryNameText;
+ private Button browseButton;
+ private Button addButton;
+ private Button removeButton;
+ private List jarFileList;
+ private Label jarFilecountLabel;
+
+ /**
+ *
+ */
+ public LibraryAddingPage() {
+ super("page6");
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
+ */
+ protected void initializeDefaultSettings() {
+ settings.put(PREF_LIB_LIBNAMES,new String[]{});//put an empty array
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
+ */
+ public void createControl(Composite parent) {
+ Composite container = new Composite(parent, SWT.NULL);
+ GridLayout layout = new GridLayout();
+ layout.numColumns=3;
+ container.setLayout(layout);
+
+
+ GridData gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan =3;
+ libraryNameText = new Text(container,SWT.BORDER);
+ libraryNameText.setLayoutData(gd);
+
+ libraryNameText.addModifyListener(new ModifyListener(){
+ public void modifyText(ModifyEvent e){
+ //handleModify();
+ }
+ });
+
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ browseButton = new Button(container,SWT.PUSH);
+ browseButton.setLayoutData(gd);
+ browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+ browseButton.addMouseListener(new MouseAdapter(){
+ public void mouseUp(MouseEvent e) {
+ handleBrowse();
+ }
+ });
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ addButton = new Button(container,SWT.PUSH);
+ addButton.setLayoutData(gd);
+ addButton.setText(ServiceArchiver.getResourceString("page6.add"));
+ addButton.addMouseListener(new MouseAdapter(){
+ public void mouseUp(MouseEvent e) {
+ handleAdd();
+ }
+
+
+ });
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ removeButton = new Button(container,SWT.PUSH);
+ removeButton.setLayoutData(gd);
+ removeButton.setText(ServiceArchiver.getResourceString("page6.remove"));
+ removeButton.addMouseListener(new MouseAdapter(){
+ public void mouseUp(MouseEvent e) {
+ handleRemove();
+ }
+
+
+ });
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 3;
+ Label dummyLabel = new Label(container,SWT.NONE);
+ dummyLabel.setText(ServiceArchiver.getResourceString("page6.liblist.caption"));
+ dummyLabel.setLayoutData(gd);
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 3;
+ gd.verticalSpan = 5;
+
+ jarFileList = new List(container,SWT.BORDER|SWT.V_SCROLL);
+ jarFileList.setItems(settings.getArray(PREF_LIB_LIBNAMES));
+ jarFileList.setLayoutData(gd);
+
+
+ // Label for the count
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ gd.horizontalSpan = 3;
+ jarFilecountLabel = new Label(container,SWT.NONE);
+ jarFilecountLabel.setLayoutData(gd);
+
+ setControl(container);
+ setPageComplete(true);
+ }
+
+ private void handleBrowse(){
+ FileDialog fileDialog = new FileDialog(this.getShell());
+ fileDialog.setFilterExtensions(new String[]{"*.jar"});
+ String returnFileName = fileDialog.open() ;
+ if (returnFileName!=null){
+ this.libraryNameText.setText(returnFileName);
+ }
+ }
+
+ private void handleAdd() {
+ String libName = libraryNameText.getText().trim();
+ if (!libName.equals("")){
+ //add the libs to the list
+ jarFileList.add(libName);
+ updateList();
+ libraryNameText.setText("");
+ }
+ }
+
+ private void handleRemove() {
+ int selectedIndex = jarFileList.getSelectionIndex();
+ //-1 is returned when nothing is selected
+ if (selectedIndex!=-1){
+ jarFileList.remove(selectedIndex);
+ updateList();
+ }
+ }
+
+ private void updateList(){
+ jarFilecountLabel.setText(jarFileList.getItemCount() + ServiceArchiver.getResourceString("page6.liblist.count.caption"));
+ settings.put(PREF_LIB_LIBNAMES,jarFileList.getItems());
+ }
+
+ public LibrarySelectionBean getBean(){
+ LibrarySelectionBean bean = new LibrarySelectionBean();
+ bean.setFileList(jarFileList.getItems());
+ return bean;
+ }
+
+}
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java Wed Sep 21 06:27:25 2005
@@ -1,19 +1,18 @@
-/*
- * Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
+ /*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.axis2.tool.service.eclipse.ui;
import org.apache.axis2.tool.service.bean.Page3Bean;
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=290691&r1=290690&r2=290691&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 Wed Sep 21 06:27:25 2005
@@ -13,21 +13,32 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
+import java.lang.reflect.InvocationTargetException;
+
+
import org.apache.axis2.tool.service.bean.WizardBean;
import org.apache.axis2.tool.service.control.Controller;
-import org.apache.axis2.tool.service.control.ProcessException;
import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.ui.INewWizard;
import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.actions.WorkspaceModifyOperation;
+/**
+ * @author Ajith
+ * <p/>
+ * TODO To change the template for this generated type comment go to Window -
+ * Preferences - Java - Code Style - Code Templates
+ */
public class ServiceArchiveWizard extends Wizard implements INewWizard {
private ClassFileLocationPage classFileLocationPage;
@@ -35,11 +46,13 @@
private ServiceXMLFileSelectionPage serviceXMLFileSelectionPage;
private ServiceXMLGenerationPage serviceXMLGenerationPage;
private ServiceArchiveOutputLocationPage serviceArchiveOutputLocationPage;
+ private LibraryAddingPage libPage;
private boolean updateServiceGenerationStatus;
private String classFileLocation;
private String wsdlFileGenerationStatus;
+
/**
* @return Returns the wsdlFileGenerationStatus.
@@ -61,7 +74,7 @@
this.classFileLocation = location;
}
- public void updateServiceGeneration(boolean status){
+ public void updateServiceXMLGeneration(boolean status){
updateServiceGenerationStatus = status;
}
/**
@@ -69,9 +82,28 @@
*/
public ServiceArchiveWizard() {
super();
+ setNeedsProgressMonitor(true);
setWindowTitle(ServiceArchiver.getResourceString("main.title"));
}
+
+ /* (non-Javadoc)
+ * @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
+ */
+ public IWizardPage getNextPage(IWizardPage page) {
+ AbstractServiceWizardPage thisPage = (AbstractServiceWizardPage)page;
+ AbstractServiceWizardPage nextPage = (AbstractServiceWizardPage)super.getNextPage(page);
+ while (thisPage!=null && thisPage.isSkipNext()) {
+ if (nextPage!=null) {
+ thisPage = nextPage;
+ nextPage = (AbstractServiceWizardPage)super.getNextPage(nextPage);
+ }else{
+ break;
+ }
+ }
+ return nextPage;
+ }
+
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizard#addPages()
*/
@@ -82,8 +114,10 @@
this.addPage(wsdlFileSelectionPage);
serviceXMLFileSelectionPage = new ServiceXMLFileSelectionPage();
this.addPage(serviceXMLFileSelectionPage);
-// serviceXMLGenerationPage = new ServiceXMLGenerationPage();
-// this.addPage(serviceXMLGenerationPage);
+ serviceXMLGenerationPage = new ServiceXMLGenerationPage();
+ this.addPage(serviceXMLGenerationPage);
+ libPage = new LibraryAddingPage();
+ this.addPage(libPage);
serviceArchiveOutputLocationPage = new ServiceArchiveOutputLocationPage();
this.addPage(serviceArchiveOutputLocationPage);
}
@@ -92,26 +126,72 @@
* @see org.eclipse.jface.wizard.IWizard#performFinish()
*/
public boolean performFinish() {
- //create a wizard bean
- WizardBean wizBean = new WizardBean();
- wizBean.setPage1bean(classFileLocationPage.getBean());
- wizBean.setWsdlBean(wsdlFileSelectionPage.getBean());
- wizBean.setPage2bean(serviceXMLFileSelectionPage.getBean());
- wizBean.setPage3bean(serviceArchiveOutputLocationPage.getBean());
-
+
+ WorkspaceModifyOperation op = new WorkspaceModifyOperation()
+ {
+ protected void execute(IProgressMonitor monitor)
+ {
+ if (monitor == null)
+ monitor = new NullProgressMonitor();
+
+ /*
+ * "7" is the total amount of steps, see below monitor.worked(amount)
+ */
+ monitor.beginTask(ServiceArchiver.getResourceString("wizard.codegen.startmsg"), 8);
+
+ try
+ {
+ monitor.worked(1);
+// create a wizard bean
+ WizardBean wizBean = new WizardBean();
+ monitor.worked(1);
+ wizBean.setPage1bean(classFileLocationPage.getBean());
+ monitor.worked(1);
+ wizBean.setWsdlBean(wsdlFileSelectionPage.getBean());
+ monitor.worked(1);
+ wizBean.setPage2bean(serviceXMLGenerationPage.getBean(serviceXMLFileSelectionPage.getBean()));
+ monitor.worked(1);
+ wizBean.setLibraryBean(libPage.getBean());
+ monitor.worked(1);
+ wizBean.setPage3bean(serviceArchiveOutputLocationPage.getBean());
+ monitor.worked(1);
+ new Controller().process(wizBean);
+ monitor.worked(1);
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+
+ monitor.done();
+ }
+ };
- try {
- new Controller().process(wizBean);
- showSuccessMessage(" jar file creation successful! ");
- return true;
- } catch (ProcessException e) {
- showErrorMessage(e.getMessage());
+ /*
+ * Start the generation as new Workbench Operation, so the user
+ * can see the progress and, if needed, can stop the operation.
+ */
+ try
+ {
+ getContainer().run(false, true, op);
+ showSuccessMessage(ServiceArchiver.getResourceString("wizard.codegen.success"));
+ return true;
+ }
+ catch (InvocationTargetException e1)
+ {
+ showErrorMessage(e1.getTargetException().getMessage());
return false;
- } catch (Exception e) {
- showErrorMessage("Unknown Error! " + e.getMessage());
+ }
+ catch (InterruptedException e1)
+ {
+ showErrorMessage(e1.getMessage());
+ return false;
+ }
+ catch (Exception e)
+ {
+ showErrorMessage(ServiceArchiver.getResourceString("wizard.codegen.unknown.error") + e.getMessage());
return false;
}
-
}
@@ -125,10 +205,10 @@
}
private void showErrorMessage(String message) {
- MessageDialog.openError(this.getShell(), "Error", message);
+ MessageDialog.openError(this.getShell(), ServiceArchiver.getResourceString("wizard.codegen.error.msg.heading"), message);
}
private void showSuccessMessage(String message) {
- MessageDialog.openInformation(this.getShell(), "Success", message);
+ MessageDialog.openInformation(this.getShell(), ServiceArchiver.getResourceString("wizard.codegen.success.msg.heading"), message);
}
}
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=290691&r1=290690&r2=290691&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 Wed Sep 21 06:27:25 2005
@@ -1,19 +1,18 @@
/*
* Copyright 2004,2005 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
import org.apache.axis2.tool.service.bean.Page2Bean;
@@ -25,6 +24,7 @@
import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.events.SelectionListener;
+
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -35,6 +35,7 @@
public class ServiceXMLFileSelectionPage extends AbstractServiceWizardPage {
+ private static final String SERVICES_XML_NAME = "services.xml";
private Text serviceXMLText;
private Label manualSelectionLabel;
private Label recommendationTextLable;
@@ -101,8 +102,8 @@
public void widgetDefaultSelected(SelectionEvent e){}
});
/////////////////////////////////////////
- //disable the selection combo for now
- selectAutoFileGenerationCheckBox.setEnabled(false);
+ //enable the selection combo for now
+ //selectAutoFileGenerationCheckBox.setEnabled(false);
selectAutoFileGenerationCheckBox.setToolTipText(ServiceArchiver.getResourceString("page2.autogen.tooltip"));
////////////////////////////////////////////
@@ -127,7 +128,7 @@
private void handleBrowse(){
FileDialog fileDialog = new FileDialog(this.getShell());
- fileDialog.setFilterExtensions(new String[]{"service.xml"});
+ fileDialog.setFilterExtensions(new String[]{SERVICES_XML_NAME});
String returnFileName = fileDialog.open() ;
if (returnFileName!=null){
this.serviceXMLText.setText(returnFileName);
@@ -141,20 +142,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.updateServiceGeneration(status);
-
- }
+// private void updateGenerationPage(boolean status){
+// ServiceArchiveWizard wizard = (ServiceArchiveWizard)this.getWizard();
+// wizard.updateServiceXMLGeneration(status);
+//
+// }
private void changeManualSelectionStatus(boolean state){
this.serviceXMLText.setEnabled(state);
@@ -167,7 +168,7 @@
settings.put(PREF_SERVICE_XML_FILE,serviceXMLString);
if (serviceXMLString.equals("")){
this.updateStatus(ServiceArchiver.getResourceString("page2.error.servicenameempty"));
- }else if(!serviceXMLString.endsWith("service.xml")){
+ }else if(!serviceXMLString.endsWith(SERVICES_XML_NAME)){
this.updateStatus(ServiceArchiver.getResourceString("page2.error.servicenamewrong"));
}else{
this.updateStatus(null);
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=290691&r1=290690&r2=290691&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 Wed Sep 21 06:27:25 2005
@@ -13,11 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+
import org.apache.axis2.tool.service.bean.Page2Bean;
import org.apache.axis2.tool.service.bean.WSDLAutoGenerateOptionBean;
+import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
@@ -33,13 +40,6 @@
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-
public class ServiceXMLGenerationPage extends AbstractServiceWizardPage{
@@ -59,8 +59,9 @@
* @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#initializeDefaultSettings()
*/
protected void initializeDefaultSettings() {
- // TODO Auto-generated method stub
-
+ settings.put(PREF_SERVICE_GEN_SERVICE_NAME,"MyService");
+ settings.put(PREF_SERVICE_GEN_CLASSNAME,"");
+ settings.put(PREF_SERVICE_GEN_LOAD_ALL,false);
}
/* (non-Javadoc)
* @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
@@ -71,37 +72,43 @@
layout.numColumns=3;
container.setLayout(layout);
-
-
-
Label label = new Label(container,SWT.NULL);
- label.setText("Service name");
+ label.setText(ServiceArchiver.getResourceString("page3.servicename.lable"));
GridData gd = new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan = 2;
serviceNameTextBox = new Text(container,SWT.BORDER);
serviceNameTextBox.setLayoutData(gd);
+ serviceNameTextBox.setToolTipText(ServiceArchiver.getResourceString("page3.servicename.tooltip"));
+ serviceNameTextBox.setText(settings.get(PREF_SERVICE_GEN_SERVICE_NAME));
serviceNameTextBox.addModifyListener(new ModifyListener(){
public void modifyText(ModifyEvent e){
+ updateDirtyStatus(true);
+ settings.put(PREF_SERVICE_GEN_SERVICE_NAME,serviceNameTextBox.getText());
+ //validate
}
});
-
+
label = new Label(container,SWT.NULL);
- label.setText("Class Name");
+ label.setText(ServiceArchiver.getResourceString("page3.classname.lable"));
gd = new GridData(GridData.FILL_HORIZONTAL);
classNameTextBox = new Text(container,SWT.BORDER);
classNameTextBox.setLayoutData(gd);
+ classNameTextBox.setToolTipText(ServiceArchiver.getResourceString("page3.classname.tooltip"));
+ classNameTextBox.setText(settings.get(PREF_SERVICE_GEN_CLASSNAME));
classNameTextBox.addModifyListener(new ModifyListener(){
public void modifyText(ModifyEvent e){
updateDirtyStatus(true);
+ settings.put(PREF_SERVICE_GEN_CLASSNAME,classNameTextBox.getText());
}
});
+
gd = new GridData(GridData.FILL_HORIZONTAL);
loadButton = new Button(container,SWT.PUSH);
- loadButton.setText("Load");
+ loadButton.setText(ServiceArchiver.getResourceString("page3.loadbutton.lable"));
loadButton.setLayoutData(gd);
loadButton.addSelectionListener(new SelectionListener(){
public void widgetSelected(SelectionEvent e){
@@ -115,13 +122,19 @@
searchDeclaredMethodsCheckBox = new Button(container,SWT.CHECK);
searchDeclaredMethodsCheckBox.setLayoutData(gd);
- searchDeclaredMethodsCheckBox.setText("List Declared Methods Only");
+ searchDeclaredMethodsCheckBox.setText(ServiceArchiver.getResourceString("page3.declared.lable"));
searchDeclaredMethodsCheckBox.addSelectionListener(new SelectionListener(){
public void widgetSelected(SelectionEvent e){
updateDirtyStatus(true);//dirty
+ settings.put(PREF_SERVICE_GEN_LOAD_ALL,searchDeclaredMethodsCheckBox.getSelection());
+ if(table.isVisible()){
+ updateTable();
+ }
+
}
public void widgetDefaultSelected(SelectionEvent e){}
});
+ searchDeclaredMethodsCheckBox.setSelection(settings.getBoolean(PREF_SERVICE_GEN_LOAD_ALL));
gd = new GridData(GridData.FILL_BOTH);
gd.horizontalSpan = 2;
@@ -132,12 +145,18 @@
table.setHeaderVisible(true);
table.setLayoutData(gd);
declareColumn(table,20,"");
- declareColumn(table,100,"Method Name");
- declareColumn(table,100,"Return Type");
- declareColumn(table,100,"Parameter Count");
+ declareColumn(table,100,ServiceArchiver.getResourceString("page3.table.col1"));
+ declareColumn(table,100,ServiceArchiver.getResourceString("page3.table.col2"));
+ declareColumn(table,100,ServiceArchiver.getResourceString("page3.table.col3"));
table.setVisible(false);
+ if (restoredFromPreviousSettings){
+ //try running the update
+ updateTable();
+ }
+
+
setControl(container);
}
@@ -198,7 +217,7 @@
try {
String classFileLocation = getClassFileLocation();
URL classFileURL = new File(classFileLocation).toURL();
- ClassLoader loader = new URLClassLoader(new URL[] { classFileURL });
+ ClassLoader loader = new URLClassLoader(new URL[] { classFileURL },Thread.currentThread().getContextClassLoader());
Class clazz = loader.loadClass(classNameTextBox.getText());
Method[] methods = null;
@@ -228,9 +247,12 @@
}
} catch (MalformedURLException e) {
- updateStatus("Error : invalid location " +e.getMessage());
+ updateStatus(ServiceArchiver.getResourceString("page3.error.url") +e.getMessage());
} catch (ClassNotFoundException e) {
- updateStatus("Error : Class not found " + e.getMessage());
+ updateStatus(ServiceArchiver.getResourceString("page3.error.class")+ e.getMessage());
+ } catch (Exception e){
+ e.printStackTrace();
+ updateStatus(ServiceArchiver.getResourceString("page3.error.unknown") + e.getMessage());
}
}
@@ -243,17 +265,20 @@
}
public Page2Bean getBean(Page2Bean previousBean){
- previousBean.setAutomaticClassName(classNameTextBox.getText());
- ArrayList list = new ArrayList();
- TableItem[] items = table.getItems();
- int itemLength = items.length;
- for(int i=0;i<itemLength;i++){
- if(items[i].getChecked()){
- list.add(items[i].getText(1));//get the selected method name only
- }
+ if (!previousBean.isManual()){
+ previousBean.setAutomatic(true);
+ previousBean.setAutomaticClassName(classNameTextBox.getText());
+ ArrayList list = new ArrayList();
+ TableItem[] items = table.getItems();
+ int itemLength = items.length;
+ for(int i=0;i<itemLength;i++){
+ if(items[i].getChecked()){
+ list.add(items[i].getText(1));//get the selected method name only
+ }
+ }
+ previousBean.setSelectedMethodNames(list);
+ previousBean.setServiceName(this.serviceNameTextBox.getText());
}
- previousBean.setSelectedMethodNames(list);
- previousBean.setServiceName(this.serviceNameTextBox.getText());
return previousBean;
}
}
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLFileSelectionPage.java Wed Sep 21 06:27:25 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
import org.apache.axis2.tool.service.bean.WSDLFileLocationBean;
@@ -35,7 +34,8 @@
public class WSDLFileSelectionPage extends AbstractServiceWizardPage {
- private boolean skipNextPage = true;
+ // set the default to false. This step cannot be skipped
+ private boolean skipNextPage = false;
private Text wsdlTextBox;
private Label selectionLabel;
@@ -114,6 +114,10 @@
skipWSDLCheckButton.setText(ServiceArchiver.getResourceString("page5.skipWSDL.caption"));
skipWSDLCheckButton.setLayoutData(gd);
skipWSDLCheckButton.setSelection(settings.getBoolean(PREF_CHECK_SKIP_WSDL));
+ ////////////////////////////////////////
+ // Disable the skip check box
+ skipWSDLCheckButton.setEnabled(false);
+ ///////////////////////////////////////
skipWSDLCheckButton.addSelectionListener(new SelectionListener(){
public void widgetSelected(SelectionEvent e){
handleSkip();
@@ -125,6 +129,7 @@
setControl(container);
if (restoredFromPreviousSettings){
+ handleSkip();
if (!skipWSDLCheckButton.getSelection()){
handleSelection();
}
@@ -209,7 +214,8 @@
* @see org.apache.axis2.tool.service.eclipse.ui.AbstractServiceWizardPage#isSkipNext()
*/
public boolean isSkipNext() {
- return this.skipNextPage;
+ return false;
+ //return this.skipNextPage;
}
public WSDLFileLocationBean getBean(){
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java Wed Sep 21 06:27:25 2005
@@ -13,9 +13,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.ui;
+import java.io.File;
+import java.lang.reflect.Method;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+
import org.apache.axis2.tool.service.bean.WSDLAutoGenerateOptionBean;
import org.apache.axis2.tool.service.eclipse.plugin.ServiceArchiver;
import org.eclipse.swt.SWT;
@@ -34,12 +39,12 @@
import org.eclipse.swt.widgets.TableItem;
import org.eclipse.swt.widgets.Text;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
-
+/**
+ * @author Ajith
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
public class WSDLOptionsPage extends AbstractServiceWizardPage {
private static final String SERVICE_WSDL_DEFAULT_NAME = "service.wsdl";
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java Wed Sep 21 06:27:25 2005
@@ -13,9 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.axis2.tool.service.eclipse.util;
+/**
+ * @author Ajith
+ *
+ */
public interface SettingsConstants {
//#####################################################
static final String PREF_CLASS_FILE_LOCATION = "CLASS_FILE_LOCATION" ;
@@ -33,6 +36,12 @@
//#######################################################
static final String PREF_OUTPUT_LOCATION="OUT_LOCATION";
static final String PREF_OUTPUT_NAME="OUT_NAME";
+// #######################################################
+ static final String PREF_SERVICE_GEN_SERVICE_NAME="SERVICE_NAME";
+ static final String PREF_SERVICE_GEN_CLASSNAME="CLASSNAME";
+ static final String PREF_SERVICE_GEN_LOAD_ALL="LOAD_ALL";
+ //######################################################
+ static final String PREF_LIB_LIBNAMES="LIB_NAMES";
Modified: webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/resource/ServiceResources.properties
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/resource/ServiceResources.properties?rev=290691&r1=290690&r2=290691&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/resource/ServiceResources.properties (original)
+++ webservices/axis2/trunk/java/modules/tool/src/org/apache/axis2/tool/service/resource/ServiceResources.properties Wed Sep 21 06:27:25 2005
@@ -18,11 +18,12 @@
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.This should be a folder with the compiled classes
+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
@@ -43,6 +44,18 @@
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
@@ -64,3 +77,20 @@
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