You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by th...@apache.org on 2006/11/09 06:14:00 UTC
svn commit: r472776 - in /webservices/axis2/branches/java/1_1/modules/tool:
./ axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/
axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/
axis2-eclipse-servic...
Author: thilina
Date: Wed Nov 8 21:13:59 2006
New Revision: 472776
URL: http://svn.apache.org/viewvc?view=rev&rev=472776
Log:
applying the patch given at http://issues.apache.org/jira/browse/AXIS2-1652
Seems like Sandakith is still not ready to test his Karma :)
Added:
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java
Modified:
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java
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/LibraryAddingPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.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/eclipse/ui/WSDLOptionsPage.java
webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.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/codegen/build.properties
webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml
webservices/axis2/branches/java/1_1/modules/tool/create-project.xml
Added: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.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/core/ServiceXMLCreater.java?view=auto&rev=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java (added)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/core/ServiceXMLCreater.java Wed Nov 8 21:13:59 2006
@@ -0,0 +1,63 @@
+/*
+ * 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.util.ArrayList;
+
+public class ServiceXMLCreater {
+ private String serviceName;
+ private String serviceClass;
+ private ArrayList operations;
+
+ public ServiceXMLCreater(String serviceName, String serviceClass, ArrayList operations) {
+ this.serviceName = serviceName;
+ this.serviceClass = serviceClass;
+ this.operations = operations;
+ }
+
+ public String getServiceName() {
+ return serviceName;
+ }
+
+ public String getServiceClass() {
+ return serviceClass;
+ }
+
+ public ArrayList getOperations() {
+ return operations;
+ }
+
+ public String toString() {
+ String serviceXML = "<service name=\"" + serviceName + "\" >\n" +
+ "<description>\n" +
+ "Please Type your service description here\n" +
+ "</description>\n" +
+ "<parameter name=\"ServiceClass\" locked=\"false\">" + serviceClass + "</parameter>\n";
+ if (operations.size() > 0) {
+ serviceXML = serviceXML + "<excludeOperations>\n";
+ for (int i = 0; i < operations.size(); i++) {
+ String s = (String) operations.get(i);
+ String op = "<operation>" + s + "</operation>\n";
+ serviceXML = serviceXML + op;
+ }
+ serviceXML = serviceXML + "</excludeOperations>\n";
+ }
+ serviceXML = serviceXML + "</service>\n";
+ return serviceXML;
+ }
+
+}
+
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.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/control/Controller.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/control/Controller.java Wed Nov 8 21:13:59 2006
@@ -4,6 +4,7 @@
import org.apache.axis2.tool.core.FileCopier;
import org.apache.axis2.tool.core.JarFileWriter;
import org.apache.axis2.tool.core.ServiceFileCreator;
+import org.apache.axis2.tool.core.ServiceXMLCreater;
import org.apache.axis2.tool.service.bean.ClassFileSelectionBean;
import org.apache.axis2.tool.service.bean.LibrarySelectionBean;
import org.apache.axis2.tool.service.bean.Page2Bean;
@@ -11,7 +12,9 @@
import org.apache.axis2.tool.service.bean.WSDLFileLocationBean;
import org.apache.axis2.tool.service.bean.WizardBean;
+import java.io.BufferedWriter;
import java.io.File;
+import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -95,11 +98,23 @@
throw new ProcessException(
"There are no methods selected to generate the service!!");
}
- serviceFile =
- new ServiceFileCreator().createServiceFile(
- page2Bean.getServiceName(),
- page2Bean.getAutomaticClassName(),
- page2Bean.getSelectedMethodNames());//create the file here
+ String currentUserDir = System.getProperty("user.dir");
+ String fileName = "services.xml";
+ ServiceXMLCreater serviceXMLCreater = new ServiceXMLCreater(page2Bean.getServiceName(),
+ page2Bean.getAutomaticClassName(),
+ page2Bean.getSelectedMethodNames());
+ String serviceFileString = serviceXMLCreater.toString();
+ serviceFile = new File(currentUserDir + File.separator + fileName);
+ FileWriter serviceXMLFileWriter = new FileWriter(serviceFile, true);
+ BufferedWriter writer = new BufferedWriter(serviceXMLFileWriter) ;
+ writer.write(serviceFileString) ;
+ writer.close() ;
+
+// new ServiceFileCreator().createServiceFile(
+// page2Bean.getServiceName(),
+// page2Bean.getAutomaticClassName(),
+// page2Bean.getSelectedMethodNames());//create the file here
+
isServiceCreated = true;
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.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/AbstractServiceWizardPage.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/AbstractServiceWizardPage.java Wed Nov 8 21:13:59 2006
@@ -61,6 +61,8 @@
protected abstract void initializeDefaultSettings();
+ protected abstract boolean getWizardComplete();
+
//Default implementation
public boolean isSkipNext(){
return false;
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=472776&r1=472775&r2=472776
==============================================================================
--- 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 Wed Nov 8 21:13:59 2006
@@ -142,4 +142,10 @@
}
return pageBean;
}
+
+
+
+ protected boolean getWizardComplete() {
+ return false;
+ }
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.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/LibraryAddingPage.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/LibraryAddingPage.java Wed Nov 8 21:13:59 2006
@@ -14,169 +14,173 @@
* limitations under the License.
*/
-
-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;
-
-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_BOTH);
- 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;
- }
-
-}
+
+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;
+
+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_BOTH);
+ 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;
+ }
+
+ protected boolean getWizardComplete() {
+ return false;
+ }
+
+}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.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/ServiceArchiveOutputLocationPage.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveOutputLocationPage.java Wed Nov 8 21:13:59 2006
@@ -36,6 +36,7 @@
private Text outputFileLocationTextBox;
private Button browseButton;
private Text outputFileNameTextbox;
+ private boolean isWizardComplete = false;
public ServiceArchiveOutputLocationPage(){
super("page4");
@@ -67,7 +68,7 @@
outputFileLocationTextBox = new Text(container,SWT.BORDER);
outputFileLocationTextBox.setLayoutData(gd);
- outputFileLocationTextBox.setText(settings.get(PREF_OUTPUT_LOCATION));
+ outputFileLocationTextBox.setText("");
outputFileLocationTextBox.addModifyListener(new ModifyListener(){
public void modifyText(ModifyEvent e){
handleLocationModification();
@@ -126,6 +127,7 @@
if (outputLocationText==null ||"".equals(outputLocationText.trim())){
this.updateStatus(ServiceArchiver.getResourceString("page4.error.location"));
}else{
+ isWizardComplete = true;
updateStatus(null);
}
}
@@ -147,4 +149,8 @@
pageBean.setOutputFileName(this.outputFileNameTextbox.getText().trim());
return pageBean;
}
+
+ protected boolean getWizardComplete() {
+ return isWizardComplete;
+ }
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.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/ServiceArchiveWizard.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceArchiveWizard.java Wed Nov 8 21:13:59 2006
@@ -36,7 +36,8 @@
public class ServiceArchiveWizard extends Wizard implements INewWizard {
- private ClassFileLocationPage classFileLocationPage;
+
+ private ClassFileLocationPage classFileLocationPage;
private WSDLFileSelectionPage wsdlFileSelectionPage;
private ServiceXMLFileSelectionPage serviceXMLFileSelectionPage;
private ServiceXMLGenerationPage serviceXMLGenerationPage;
@@ -86,6 +87,19 @@
setWindowTitle(ServiceArchiver.getResourceString("main.title"));
}
+ public boolean canFinish() {
+ IWizardPage[] pages = getPages();
+ AbstractServiceWizardPage wizardPage = null;
+ for (int i = 0; i < pages.length; i++) {
+ wizardPage = (AbstractServiceWizardPage) pages[i];
+ if (wizardPage.getName().equals("page4.name")){
+ if (!wizardPage.getWizardComplete() ) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
/* (non-Javadoc)
* @see org.eclipse.jface.wizard.IWizard#getNextPage(org.eclipse.jface.wizard.IWizardPage)
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.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/ServiceXMLFileSelectionPage.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLFileSelectionPage.java Wed Nov 8 21:13:59 2006
@@ -195,4 +195,8 @@
pageBean.setManualFileName(this.serviceXMLText.getText());
return pageBean;
}
+
+ protected boolean getWizardComplete() {
+ return false;
+ }
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.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/ServiceXMLGenerationPage.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/ServiceXMLGenerationPage.java Wed Nov 8 21:13:59 2006
@@ -297,4 +297,8 @@
}
return previousBean;
}
+
+ protected boolean getWizardComplete() {
+ return false;
+ }
}
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=472776&r1=472775&r2=472776
==============================================================================
--- 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 Wed Nov 8 21:13:59 2006
@@ -40,8 +40,9 @@
private Text wsdlTextBox;
private Label selectionLabel;
private Button browseButton;
- private Button autoGenerateWSDLCheckButton;
+ //private Button autoGenerateWSDLCheckButton;
private Button skipWSDLCheckButton;
+ private Button selectWSDLCheckButton;
public WSDLFileSelectionPage(){
super("page5");
@@ -52,8 +53,9 @@
*/
protected void initializeDefaultSettings() {
settings.put(PREF_WSDL_FILE_NAME,"");
- settings.put(PREF_CHECK_WSDL_GENERATE,false);
+ settings.put(PREF_CHECK_WSDL_GENERATE,true);
settings.put(PREF_CHECK_SKIP_WSDL,false);
+ settings.put(PREF_CHECK_SELECT_WSDL,false);
}
@@ -65,51 +67,28 @@
GridLayout layout = new GridLayout();
layout.numColumns=3;
container.setLayout(layout);
-
- selectionLabel= new Label(container,SWT.NULL);
- selectionLabel.setText(ServiceArchiver.getResourceString("page5.selectwsdl.caption"));
-
- GridData gd = new GridData(GridData.FILL_HORIZONTAL);
- wsdlTextBox = new Text(container,SWT.BORDER);
- wsdlTextBox.setLayoutData(gd);
- wsdlTextBox.setText(settings.get(PREF_WSDL_FILE_NAME));
- wsdlTextBox.addModifyListener(new ModifyListener(){
- public void modifyText(ModifyEvent e){
- handleModify();
- }
- });
-
- browseButton = new Button(container,SWT.PUSH);
- browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
- browseButton.addMouseListener(new MouseAdapter(){
- public void mouseUp(MouseEvent e) {
- handleBrowse();
- }
- });
-
- gd = new GridData();
- gd.horizontalSpan = 2;
- autoGenerateWSDLCheckButton = new Button(container,SWT.CHECK);
- autoGenerateWSDLCheckButton.setLayoutData(gd);
- autoGenerateWSDLCheckButton.setText(ServiceArchiver.getResourceString("page5.generateauto.caption"));
- autoGenerateWSDLCheckButton.setSelection(settings.getBoolean(PREF_CHECK_WSDL_GENERATE));
- autoGenerateWSDLCheckButton.addSelectionListener(new SelectionListener(){
- public void widgetSelected(SelectionEvent e){
- handleSelection();
- }
- public void widgetDefaultSelected(SelectionEvent e){}
- });
- autoGenerateWSDLCheckButton.setToolTipText(ServiceArchiver.getResourceString("page5.autogen.tooltip"));
+
+ GridData gd = new GridData();
+ //gd.horizontalSpan = 3;
+ //autoGenerateWSDLCheckButton = new Button(container,SWT.CHECK);
+ //autoGenerateWSDLCheckButton.setLayoutData(gd);
+ //autoGenerateWSDLCheckButton.setText(ServiceArchiver.getResourceString("page5.generateauto.caption"));
+ //autoGenerateWSDLCheckButton.setSelection(settings.getBoolean(PREF_CHECK_WSDL_GENERATE));
+ //autoGenerateWSDLCheckButton.addSelectionListener(new SelectionListener(){
+ // public void widgetSelected(SelectionEvent e){
+ // handleSelection();
+ // }
+ // public void widgetDefaultSelected(SelectionEvent e){}
+ //});
+ //autoGenerateWSDLCheckButton.setToolTipText(ServiceArchiver.getResourceString("page5.autogen.tooltip"));
////////////////////////////////////////
// enable the automatic generation box
- autoGenerateWSDLCheckButton.setEnabled(true);
+ //autoGenerateWSDLCheckButton.setEnabled(true);
///////////////////////////////////////
- //add an empty lable
- new Label(container,SWT.NONE);
gd = new GridData();
- gd.horizontalSpan = 2;
+ gd.horizontalSpan = 3;
skipWSDLCheckButton = new Button(container,SWT.CHECK);
skipWSDLCheckButton.setText(ServiceArchiver.getResourceString("page5.skipWSDL.caption"));
skipWSDLCheckButton.setLayoutData(gd);
@@ -125,39 +104,148 @@
public void widgetDefaultSelected(SelectionEvent e){}
});
+
+ //add an empty lable
+ new Label(container,SWT.NONE);
+
+ gd = new GridData();
+ gd.horizontalSpan = 3;
+ selectWSDLCheckButton = new Button(container,SWT.CHECK);
+ selectWSDLCheckButton.setText(ServiceArchiver.getResourceString("page5.selectWSDL.caption"));
+ selectWSDLCheckButton.setLayoutData(gd);
+ selectWSDLCheckButton.setSelection(settings.getBoolean(PREF_CHECK_SELECT_WSDL));
+ ////////////////////////////////////////
+ // enable the skip check box
+ selectWSDLCheckButton.setEnabled(true);
+ ///////////////////////////////////////
+ selectWSDLCheckButton.addSelectionListener(new SelectionListener(){
+ public void widgetSelected(SelectionEvent e){
+ handleSelect();
+ }
+ public void widgetDefaultSelected(SelectionEvent e){}
+
+ });
+
+ gd = new GridData(GridData.FILL_HORIZONTAL);
+ selectionLabel= new Label(container,SWT.NULL);
+ selectionLabel.setText(ServiceArchiver.getResourceString("page5.selectwsdl.caption"));
+
+ wsdlTextBox = new Text(container,SWT.BORDER);
+ wsdlTextBox.setLayoutData(gd);
+ wsdlTextBox.setText(settings.get(PREF_WSDL_FILE_NAME));
+ wsdlTextBox.addModifyListener(new ModifyListener(){
+ public void modifyText(ModifyEvent e){
+ handleModify();
+ }
+ });
+
+ browseButton = new Button(container,SWT.PUSH);
+ browseButton.setText(ServiceArchiver.getResourceString("general.browse"));
+ browseButton.addMouseListener(new MouseAdapter(){
+ public void mouseUp(MouseEvent e) {
+ handleBrowse();
+ }
+ });
+
+
setControl(container);
if (restoredFromPreviousSettings){
handleSkip();
if (!skipWSDLCheckButton.getSelection()){
- handleSelection();
+ handleSelect();
}
}
}
+
+ //private void handleSelection(){
+ // boolean selection = this.autoGenerateWSDLCheckButton.getSelection();
+ // settings.put(PREF_CHECK_WSDL_GENERATE,selection);
+ // if (selection){
+ // this.skipNextPage = false;
+ // updateStatus(null);
+ // updateRecommendation(ServiceArchiver.getResourceString("page5.recommendation"));
+ // this.skipWSDLCheckButton.setSelection(false);
+ // this.selectWSDLCheckButton.setSelection(false);
+ // changeManualSelectionStatus(false);
+ // }else{
+ // changeManualSelectionStatus(true);
+ // this.skipNextPage = true;
+ // handleModify();
+ // updateRecommendation("");
+ // this.skipWSDLCheckButton.setSelection(true);
+ // if (skipWSDLCheckButton.getSelection() || selectWSDLCheckButton.getSelection()){
+ // //you should not come here
+ //
+ // }else {
+ // autoGenerateWSDLCheckButton.setSelection(true);
+ // this.skipNextPage = false;
+ // updateStatus(null);
+ // updateRecommendation(ServiceArchiver.getResourceString("page5.recommendation"));
+ // this.skipWSDLCheckButton.setSelection(false);
+ // this.selectWSDLCheckButton.setSelection(false);
+ // changeManualSelectionStatus(false);
+ // }
+ // }
+ //}
private void handleSkip(){
if (skipWSDLCheckButton.getSelection()){
//disable other widgtets
- setStatus(false);
+ changeManualSelectionStatus(false);
//enable next
this.updateStatus(null);
settings.put(PREF_CHECK_SKIP_WSDL,true);
-
+ this.selectWSDLCheckButton.setSelection(false);
}else{
- setStatus(true);
- //call this to update the status
- handleModify();
- settings.put(PREF_CHECK_SKIP_WSDL,false);
+// //call this to update the status
+// handleModify();
+// settings.put(PREF_CHECK_SKIP_WSDL,false);
+// this.autoGenerateWSDLCheckButton.setSelection(true);
+ if (selectWSDLCheckButton.getSelection()){
+ //you should not come here
+
+ }else {
+ skipWSDLCheckButton.setSelection(true);
+ //disable other widgtets
+ changeManualSelectionStatus(false);
+ //enable next
+ this.updateStatus(null);
+ settings.put(PREF_CHECK_SKIP_WSDL,true);
+ this.selectWSDLCheckButton.setSelection(false);
+ }
}
}
- private void setStatus(boolean b){
- this.selectionLabel.setEnabled(b);
- this.browseButton.setEnabled(b);
- this.wsdlTextBox.setEnabled(b);
+ private void handleSelect(){
+ if (selectWSDLCheckButton.getSelection()){
+ changeManualSelectionStatus(true);
+ //enable next
+ this.updateStatus(null);
+ this.skipWSDLCheckButton.setSelection(false);
+
+ }else{
+// setStatus(true);
+// //call this to update the status
+// handleModify();
+// settings.put(PREF_CHECK_SKIP_WSDL,false);
+// this.autoGenerateWSDLCheckButton.setSelection(true);
+ if (skipWSDLCheckButton.getSelection()){
+ //you should not come here
+
+ }else {
+ selectWSDLCheckButton.setSelection(true);
+ //disable other widgtets
+ changeManualSelectionStatus(true);
+ //enable next
+ this.updateStatus(null);
+ this.skipWSDLCheckButton.setSelection(false);
+ }
+ }
}
- private void handleBrowse(){
+
+ private void handleBrowse(){
FileDialog fileDialog = new FileDialog(this.getShell());
fileDialog.setFilterExtensions(new String[]{"*.wsdl"});
String returnFileName = fileDialog.open() ;
@@ -166,21 +254,7 @@
}
}
- private void handleSelection(){
- boolean selection = this.autoGenerateWSDLCheckButton.getSelection();
- settings.put(PREF_CHECK_WSDL_GENERATE,selection);
- if (selection){
- changeManualSelectionStatus(false);
- this.skipNextPage = false;
- updateStatus(null);
- updateRecommendation(ServiceArchiver.getResourceString("page5.recommendation"));
- }else{
- changeManualSelectionStatus(true);
- this.skipNextPage = true;
- handleModify();
- updateRecommendation("");
- }
- }
+
private void handleModify(){
String text = wsdlTextBox.getText();
@@ -207,7 +281,7 @@
}
public boolean isAutoGenerate(){
- return autoGenerateWSDLCheckButton.getSelection();
+ return false ;// autoGenerateWSDLCheckButton.getSelection();
}
/* (non-Javadoc)
@@ -220,9 +294,13 @@
public WSDLFileLocationBean getBean(){
WSDLFileLocationBean locationBean = new WSDLFileLocationBean();
- locationBean.setManual(!autoGenerateWSDLCheckButton.getSelection());
+ locationBean.setManual(!isAutoGenerate());
locationBean.setWSDLFileName(wsdlTextBox.getText());
locationBean.setSkip(skipWSDLCheckButton.getSelection());
return locationBean;
}
+
+ protected boolean getWizardComplete() {
+ return false;
+ }
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.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/WSDLOptionsPage.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/ui/WSDLOptionsPage.java Wed Nov 8 21:13:59 2006
@@ -276,4 +276,8 @@
}
setPageComplete(!status);
}
+
+ protected boolean getWizardComplete() {
+ return false;
+ }
}
Modified: webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.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/util/SettingsConstants.java?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/axis2-eclipse-service-plugin/src/main/java/org/apache/axis2/tool/service/eclipse/util/SettingsConstants.java Wed Nov 8 21:13:59 2006
@@ -26,6 +26,7 @@
static final String PREF_WSDL_FILE_NAME="WSDL_FILE_NAME";
static final String PREF_CHECK_WSDL_GENERATE="WSDL_GEN";
static final String PREF_CHECK_SKIP_WSDL="SKIP_WSDL";
+ static final String PREF_CHECK_SELECT_WSDL="SELECT_WSDL";
// ####################################################
static final String PREF_WSDL_CLASS_NAME="WSDL_CLASS_NAME";
static final String PREF_WSDL_STYLE_INDEX="WSDL_STYLE";
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=472776&r1=472775&r2=472776
==============================================================================
--- 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 Wed Nov 8 21:13:59 2006
@@ -79,6 +79,7 @@
page5.error.wsdlnameempty=WSDL file name is empty
page5.error.wsdlnamewrong=WSDL file name is invalid
page5.skipWSDL.caption=Skip WSDL
+page5.selectWSDL.caption=Select WSDL
##################################################################################
#Sixth page
page6.name=page6
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/build.properties Wed Nov 8 21:13:59 2006
@@ -22,6 +22,7 @@
lib/wstx-@stax.impl.version@.jar,\
lib/xbean-@xbean.version@.jar,\
lib/XmlSchema-@XmlSchema.version@.jar,\
+ lib/woden-@woden.version@.jar,\
src.includes = icons/,\
plugin.xml,\
src/,\
Modified: webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/conf/codegen/plugin.xml Wed Nov 8 21:13:59 2006
@@ -56,6 +56,9 @@
<library name="lib/XmlSchema-@XmlSchema.version@.jar">
<export name="*"/>
</library>
+ <library name="lib/woden-@woden.version@.jar">
+ <export name="*"/>
+ </library>
</runtime>
<requires>
Modified: webservices/axis2/branches/java/1_1/modules/tool/create-project.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/1_1/modules/tool/create-project.xml?view=diff&rev=472776&r1=472775&r2=472776
==============================================================================
--- webservices/axis2/branches/java/1_1/modules/tool/create-project.xml (original)
+++ webservices/axis2/branches/java/1_1/modules/tool/create-project.xml Wed Nov 8 21:13:59 2006
@@ -53,6 +53,7 @@
<filter token="XmlSchema.version" value="${XmlSchema.version}" />
<filter token="log4j.version" value="${log4j.version}" />
<filter token="wsdl4j.version" value="${wsdl4j.version}" />
+ <filter token="woden.version" value="${woden.version}" />
<!--Codegen wizard libraries -->
@@ -72,6 +73,7 @@
<include name="wstx-${stax.impl.version}.jar" />
<include name="xbean-${xbean.version}.jar" />
<include name="XmlSchema-${XmlSchema.version}.jar" />
+ <include name="woden-${woden.version}.jar" />
</fileset>
<!--Service wizard libraries -->
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org