This commit was manufactured by cvs2svn to create tag 'v20050705_1650'.
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
deleted file mode 100644
index 862f49c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project b/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
deleted file mode 100644
index 846a394..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/.project
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.core</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env.core</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
deleted file mode 100644
index c9ce80b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc-axis.jar
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.internal.axis.consumption.core.command,
- org.eclipse.jst.ws.internal.axis.consumption.core.common,
- org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder
-Require-Bundle: org.apache.ant,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.j2ee.web,
- org.apache.axis11
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
deleted file mode 100644
index 9e02a69..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.wsc-axis.jar = src/
-bin.includes = wsc-axis.jar,\
- plugin.properties,\
- plugin.xml,\
- readme.html,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
deleted file mode 100644
index 5e9ff7c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web service Axis Consumption Core
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
deleted file mode 100644
index c911fbf..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/plugin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension point="org.eclipse.jst.ws.consumption.wsfinder">
- <wsfinder
- id="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- name="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- description="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis"
- class="org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder.WSFinderAxis">
- </wsfinder>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
deleted file mode 100644
index 0038ec5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/axis/consumption/core/consumption.properties
+++ /dev/null
@@ -1,46 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages for AxisDeployCommand
-#
-MSG_ERROR_PROJECT_URL_PARAM_NOT_SET=IWAB0054E Web project URL for deployment of Web service is not set in AxisDeployCommand
-MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET=IWAB0488E Location of Axis deployment file is not set in AxisDeployCommand
-MSG_ERROR_AXIS_DEPLOY=IWAB0489E Error when deploying Web service to Axis runtime
-MSG_AXIS_DEPLOY=Deploying Web service to Axis run-time environment
-MSG_AXIS_DEPLOY_OK=Web service successfuly deployed to Axis run-time environment
-
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-#
-# Messages for Java2WSDLCommand
-#
-TASK_LABEL_JAVA_WSDL_COMMAND=Java2WSDLCommand
-TASK_DESC_JAVA_WSDL_COMMAND=Calls to AXIS Java2WSDLCommand.
-MSG_GENERATE_WSDL=Generating WSDL file: {0}
-MSG_ERROR_JAVA_WSDL_GENERATE=IWAB0398E Error in generating WSDL from Java
-
-#
-# Messages for WSDL2JavaCommand
-#
-TASK_LABEL_WSDL_JAVA_COMMAND=WSDL2JavaCommand
-TASK_DESC_WSDL_JAVA_COMMAND=Calls to AXIS WSDL2JavaCommand.
-MSG_PARSING_WSDL=Parsing WSDL file: {0}
-MSG_ERROR_WSDL_JAVA_GENERATE=IWAB0399E Error in generating Java from WSDL
-
-#
-# Messages common for all
-#
-MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET=IWAB0397E JavaWSDLParam not set
-
-#
-# Messages common for Java2WSDLCommand and WSDL2JavaCommand
-#
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
deleted file mode 100644
index 46cb492..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/AxisDeployCommand.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.ResourceBundle;
-
-import org.apache.axis.tools.ant.axis.AdminClientTask;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * Commands are executable, undoable, redoable objects. Every Command has a name and a description.
- */
-
-public class AxisDeployCommand extends SimpleCommand
-{
- private static final String SERVICE_EXT = "/services/AdminService"; //$NON-NLS-1$
-
- private JavaWSDLParameter javaWSDLParam;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
- /**
- * Constructor for AxisDeployCommand.
- * @param String description
- * @param String name
- *
- */
- public AxisDeployCommand()
- {
- super("org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand");
- }
-
- public Status execute(Environment environment)
- {
- if (javaWSDLParam == null)
- {
- return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- }
-
- if (javaWSDLParam.getProjectURL() == null || javaWSDLParam.getProjectURL().equals(""))
- { //$NON-NLS-1$
- return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_PROJECT_URL_PARAM_NOT_SET"), Status.ERROR);
- }
-
- if (javaWSDLParam.getDeploymentFiles() == null || javaWSDLParam.getDeploymentFiles().length == 0)
- {
- return new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_DEPLOY_FILE_PARAM_NOT_SET"), Status.ERROR);
- }
-
- environment.getProgressMonitor().report(getMessage("MSG_AXIS_DEPLOY"));
-
- Status status = executeAntTask();
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
- protected Status executeAntTask()
- {
- final class DeployTask extends AdminClientTask
- {
- public DeployTask()
- {
- project = new Project();
- project.init();
- taskType = "axis"; //$NON-NLS-1$
- taskName = "axis-admin"; //$NON-NLS-1$
- target = new Target();
- }
- }
-
- DeployTask adminClient = new DeployTask();
- String url = javaWSDLParam.getProjectURL() + SERVICE_EXT;
- adminClient.setUrl(url);
- adminClient.setXmlFile(new File(javaWSDLParam.getDeploymentFiles()[0]));
-
- // Since the admin server may not be available right away we will try
- // several times to execute it.
- try
- {
- BuildException lastException = null;
-
- for( int index = 0; index < 20; index++ )
- {
- try
- {
- lastException = null;
- adminClient.execute();
- }
- catch( BuildException exc )
- {
- lastException = exc;
-
- try
- {
- Thread.sleep( 200 );
- }
- catch( InterruptedException threadException )
- {
- }
- }
-
- // If no exception occured then we should break out of the loop.
- if( lastException == null ) break;
- }
-
- // If after many tries we still get an exception, then we will re throw it.
- if( lastException != null ) throw lastException;
- }
- catch (BuildException e)
- {
- e.printStackTrace();
- String message = e.getMessage();
- if (e.getCause() != null)
- {
- message = e.getCause().toString();
- }
-
- Status[] childStatus = new Status[1];
- childStatus[0] = new SimpleStatus("AxisDeployCommand", message, Status.ERROR);
- return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_AXIS_DEPLOY"), childStatus);
- }
- return new SimpleStatus("AxisDeployCommand", //$NON-NLS-1$
- getMessage("MSG_AXIS_DEPLOY_OK"), Status.OK);
-
- }
-
- private String getMessage(String messageId, String parm1)
- {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[] { parm1 });
- }
-
- /**
- * Returns the message string identified by the given key from plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key)
- {
- return resource.getString(key);
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
deleted file mode 100644
index cdf8cf5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/Java2WSDLCommand.java
+++ /dev/null
@@ -1,201 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.ResourceBundle;
-
-import org.apache.axis.tools.ant.wsdl.Java2WsdlAntTask;
-import org.apache.axis.tools.ant.wsdl.NamespaceMapping;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.Target;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * Commands are executable, undoable, redoable objects.
- * Every Command has a name and a description.
- */
-
-public class Java2WSDLCommand extends SimpleCommand {
-
- private JavaWSDLParameter javaWSDLParam_;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
-
- private String LABEL = "TASK_LABEL_JAVA_WSDL_COMMAND";
- private String DESCRIPTION = "TASK_DESC_JAVA_WSDL_COMMAND";
-
- public Java2WSDLCommand() {
- super();
- setName (getMessage(LABEL));
- setDescription(getMessage(DESCRIPTION));
- }
- /**
- * Constructor for Java2WSDLCommand.
- */
- public Java2WSDLCommand(JavaWSDLParameter javaWSDLParam) {
- super();
- setName (getMessage(LABEL));
- setDescription(getMessage(DESCRIPTION));
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public Status execute(Environment environment) {
- Status status;
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaWSDLParam_.getBeanName() == null) {
- status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- environment.getProgressMonitor().report(
- getMessage("MSG_GENERATE_WSDL", javaWSDLParam_.getBeanName() ) );
-
- return executeAntTask(environment);
- }
-
- protected Status executeAntTask(Environment environment) {
-
- final class Emitter extends Java2WsdlAntTask {
- public Emitter() {
- project = new Project();
- project.init();
- taskType = "axis"; //$NON-NLS-1$
- taskName = "axis-java2wsdl"; //$NON-NLS-1$
- target = new Target();
- }
- }
-
- Emitter emitter = new Emitter();
- emitter.createClasspath().setPath(javaWSDLParam_.getClasspath());
- environment.getLog().log(Log.INFO, 5008, this, "executeAntTask", "Class Path = "+ javaWSDLParam_.getClasspath());
-
- emitter.setPortTypeName(javaWSDLParam_.getPortTypeName());
- environment.getLog().log(Log.INFO, 5009, this, "executeAntTask", "Port Type Name = "+ javaWSDLParam_.getPortTypeName());
-
- emitter.setServiceElementName(javaWSDLParam_.getServiceName());
- environment.getLog().log(Log.INFO, 5010, this, "executeAntTask", "Service Name = "+ javaWSDLParam_.getServiceName());
-
- emitter.setLocation(javaWSDLParam_.getUrlLocation());
- environment.getLog().log(Log.INFO, 5011, this, "executeAntTask", "URL Location = "+ javaWSDLParam_.getUrlLocation());
-
- emitter.setMethods(javaWSDLParam_.getMethodString());
- environment.getLog().log(Log.INFO, 5012, this, "executeAntTask", "Methods = "+ javaWSDLParam_.getMethodString());
-
- emitter.setStyle(javaWSDLParam_.getStyle());
- environment.getLog().log(Log.INFO, 5013, this, "executeAntTask", "Style = "+ javaWSDLParam_.getStyle());
-
- emitter.setUse(javaWSDLParam_.getUse());
- environment.getLog().log(Log.INFO, 5014, this, "executeAntTask", "Use = "+ javaWSDLParam_.getUse());
-
- emitter.setOutput(new File(javaWSDLParam_.getOutputWsdlLocation()));
- environment.getLog().log(Log.INFO, 5015, this, "executeAntTask", "WSDL Location = "+ javaWSDLParam_.getOutputWsdlLocation());
-
- emitter.setNamespace(javaWSDLParam_.getNamespace());
- environment.getLog().log(Log.INFO, 5016, this, "executeAntTask", "Name Space = "+ javaWSDLParam_.getNamespace());
-
- emitter.setClassName(javaWSDLParam_.getBeanName());
- environment.getLog().log(Log.INFO, 5017, this, "executeAntTask", "Bean name = "+ javaWSDLParam_.getBeanName());
-
- emitter.setImplClass(javaWSDLParam_.getBeanName());
-
- HashMap mappings = javaWSDLParam_.getMappings();
- if(mappings != null){
- Iterator keys = mappings.keySet().iterator();
- while(keys.hasNext()){
- String pakage = (String)keys.next();
- String namespace = (String)mappings.get(pakage);
- NamespaceMapping map = new NamespaceMapping();
- map.setPackage(pakage);
- map.setNamespace(namespace);
- emitter.addMapping(map);
- }
- }
-
-
- try {
- emitter.execute();
- } catch (BuildException e) {
- environment.getLog().log(Log.ERROR, 5018, this, "executeAntTask", e);
- Status status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_GENERATE") + " " //$NON-NLS-1$
- +e.getCause().toString(), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus( "" );
-
- }
-
- public Status undo(Environment environment) {
- return null;
- }
-
- public Status redo(Environment environment) {
- return null;
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- private String getMessage(String messageId, String parm1) {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[] { parm1 });
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public String getMessage(String key) {
- return resource.getString(key);
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParm) {
- this.javaWSDLParam_ = javaWSDLParm;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
deleted file mode 100644
index a7b7abd..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/command/WSDL2JavaCommand.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.command;
-
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.ResourceBundle;
-
-import org.apache.axis.wsdl.toJava.Emitter;
-import org.apache.axis.wsdl.toJava.GeneratedFileInfo;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class WSDL2JavaCommand extends SimpleCommand {
-
- private final String DEPLOY_TYPE = "deploy"; //$NON-NLS-1$
- private final String UNDEPLOY_TYPE = "undeploy"; //$NON-NLS-1$
- private JavaWSDLParameter javaWSDLParam;
- private String wsdlURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private ResourceBundle resource = ResourceBundle.getBundle("org.eclipse.jst.ws.axis.consumption.core.consumption"); //$NON-NLS-1$
- private String LABEL = "TASK_LABEL_WSDL_JAVA_COMMAND";
- private String DESCRIPTION = "TASK_DESC_WSDL_JAVA_COMMAND";
-
-
- public WSDL2JavaCommand() {
- super();
- setName(getMessage(LABEL));
- setDescription(getMessage(DESCRIPTION));
- }
-
- public Status execute(Environment environment) {
- Status status;
- if (javaWSDLParam == null) {
- status = new SimpleStatus("WSDL2JavaCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- if (wsdlURI != null) //bottom up case has already has the correct WSDL on javaWSDLParam
- {
- javaWSDLParam.setInputWsdlLocation(wsdlURI);
- }
- javaWSDLParam.setHTTPUsername(httpBasicAuthUsername);
- javaWSDLParam.setHTTPPassword(httpBasicAuthPassword);
-
- Emitter wsdl2Java = new Emitter();
- if (environment.getLog().isEnabled("emitter")) {
- wsdl2Java.setVerbose(true);
- } else {
- wsdl2Java.setVerbose(false);
- }
- boolean serverSide = javaWSDLParam.getServerSide() == JavaWSDLParameter.SERVER_SIDE_BEAN;
- wsdl2Java.setServerSide(serverSide);
- if (serverSide) {
- wsdl2Java.setSkeletonWanted(javaWSDLParam.isSkeletonDeploy());
- }
- if (javaWSDLParam.isMetaInfOnly()) {
- // for the case Java2WSDL-WSDL2Java
- wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getOutput()));
- HashMap pck2nsMap = javaWSDLParam.getMappings();
- if (pck2nsMap != null) {
- HashMap ns2pckMap = new HashMap();
- Iterator keys = pck2nsMap.keySet().iterator();
- while (keys.hasNext()) {
- String pakage = (String) keys.next();
- String namespace = (String) pck2nsMap.get(pakage);
- ns2pckMap.put(namespace, pakage);
- }
- wsdl2Java.setNamespaceMap(ns2pckMap);
- }
- } else {
- // for the case WSDL2Java
- wsdl2Java.setOutputDir(removeFileProtocol(javaWSDLParam.getJavaOutput()));
- if (javaWSDLParam.getMappings() != null) {
- wsdl2Java.setNamespaceMap(javaWSDLParam.getMappings());
- }
- }
- environment.getLog().log(Log.INFO, 5019, this, "execute", "Java output = " + javaWSDLParam.getJavaOutput());
- if (javaWSDLParam.getHTTPPassword() != null) {
- wsdl2Java.setPassword(javaWSDLParam.getHTTPPassword());
- environment.getLog().log(Log.INFO, 5081, this, "execute", "password: " + javaWSDLParam.getHTTPPassword());
- }
- if (javaWSDLParam.getHTTPUsername() != null) {
- wsdl2Java.setUsername(javaWSDLParam.getHTTPUsername());
- environment.getLog().log(Log.INFO, 5082, this, "execute", "username: " + javaWSDLParam.getHTTPUsername());
- }
- environment.getLog().log(Log.INFO, 5020, this, "execute", "WSDL Location = " + javaWSDLParam.getInputWsdlLocation());
- environment.getProgressMonitor().report(getMessage("MSG_PARSING_WSDL", javaWSDLParam.getInputWsdlLocation() ) );
- try {
- wsdl2Java.run(javaWSDLParam.getInputWsdlLocation());
- if (serverSide) {
- // set deployment files
- List deploymentFiles1 = wsdl2Java.getGeneratedFileInfo().findType(DEPLOY_TYPE);
- List deploymentFiles2 = wsdl2Java.getGeneratedFileInfo().findType(UNDEPLOY_TYPE);
- ArrayList deplFiles = new ArrayList();
- if (deploymentFiles1 != null && deploymentFiles2 != null) {
- deploymentFiles1.addAll(deploymentFiles2);
- for (int i = 0; i < deploymentFiles1.size(); i++) {
- GeneratedFileInfo.Entry entry = (GeneratedFileInfo.Entry) deploymentFiles1.get(i);
- deplFiles.add(entry.fileName);
- }
- String[] deplFilesArray = new String[deplFiles.size()];
- deplFiles.toArray(deplFilesArray);
- javaWSDLParam.setDeploymentFiles(deplFilesArray);
- }
- // set java files
- List javaFiles = wsdl2Java.getGeneratedFileNames();
- javaFiles.removeAll(deplFiles);
- String[] javaFileNames = new String[javaFiles.size()];
- javaFiles.toArray(javaFileNames);
- javaWSDLParam.setJavaFiles(javaFileNames);
- }
-
- } catch (Exception e) {
- environment.getLog().log(Log.ERROR, 5021, this, "execute", e);
- status = new SimpleStatus("Java2WSDLCommand", //$NON-NLS-1$
- getMessage("MSG_ERROR_WSDL_JAVA_GENERATE") + " " //$NON-NLS-1$
- + e.toString(), Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- /*
- * Hack: Axis doesn't like file URLs
- */
- private String removeFileProtocol(String s) {
- if (s.startsWith("file:")) {
- String newS = s.substring(5, s.length());
- int i = newS.indexOf(':');
- if (i != -1) {
- String protocol = newS.substring(0, i);
- int j = protocol.indexOf('/');
- int k = protocol.indexOf('\\');
- int max = Math.max(j, k);
- if (max != -1)
- newS = newS.substring(max + 1, newS.length());
- }
- return newS;
- }
- return s;
- }
-
- public Status undo(Environment environment) {
- return null;
- }
-
- public Status redo(Environment environment) {
- return null;
- }
-
- private String getMessage(String messageId, String parm1) {
- String message = resource.getString(messageId);
- return MessageFormat.format(message, new String[]{parm1});
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- *
- * @return The String message.
- */
- public String getMessage(String key) {
- return resource.getString(key);
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * @param httpBasicAuthPassword
- * The httpBasicAuthPassword to set.
- */
- public void setHttpBasicAuthPassword(String httpBasicAuthPassword) {
- this.httpBasicAuthPassword = httpBasicAuthPassword;
- }
-
- /**
- * @param httpBasicAuthUsername
- * The httpBasicAuthUsername to set.
- */
- public void setHttpBasicAuthUsername(String httpBasicAuthUsername) {
- this.httpBasicAuthUsername = httpBasicAuthUsername;
- }
-
- public void setWsdlURI(String wsdlURI) {
- this.wsdlURI = wsdlURI;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
deleted file mode 100644
index c3da781..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/common/JavaWSDLParameter.java
+++ /dev/null
@@ -1,448 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.core.common;
-
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-
-public class JavaWSDLParameter {
-
- public static final byte SERVER_SIDE_NONE = 0;
- public static final byte SERVER_SIDE_BEAN = 1;
- public static final byte SERVER_SIDE_EJB = 2;
-
- public static final String STYLE_RPC = "RPC"; //$NON-NLS-1$
- public static final String STYLE_DOCUMENT = "DOCUMENT"; //$NON-NLS-1$
- public static final String STYLE_WRAPPED = "WRAPPED"; //$NON-NLS-1$
-
- public static final String USE_LITERAL = "LITERAL"; //$NON-NLS-1$
- public static final String USE_ENCODED = "ENCODED"; //$NON-NLS-1$
-
- private String beanName = null; // The name of the Java bean
- private String classpath = null;
- // The class path for loading the bean and command execution
- private String beanPackage = null; // The package location of the bean
- private String portTypeName = null; // The name of the port type element
- private String serviceName = null; // The name of the service element
- private String outputWsdlLocation = null;
- // The output location of the WSDL file
- private String inputWsdlLocation = null;
- // The input location of the WSDL file
- private String urlLocation = null; // The URL location of the web service
- private Hashtable methods = null; // The array of method names
- private String style = null;
- // The style (RPC | DOCUMENT | WRAPPED) attribute for the generated WSDL
- private String use = null;
- // The use (LITERAL | ENCODED) attribtue for the generated WSDL
- private String output = null;
- // The output location for deployment descriptors & Java code (output from WSDL2Java command)
- private String javaOutput = null;
- // The output location for Java code (output from WSDL2Java command)
- private boolean metaInfOnly = false; // META-INF-ONLY flag
- private byte serverSide = SERVER_SIDE_NONE;
- // server-side flag (SERVER_SIDE_NONE | SERVER_SIDE_BEAN | SERVER_SIDE_EJB)
- private String namespace = null;
- private boolean skeletonDeploy = true;
- private String container = null;
- private String[] deploymentFiles = null;
- private String[] javaFiles = null;
- private String projectURL = null;
- private HashMap mappingPairs;
- private String httpUsername_ = null;
- private String httpPassword_ = null;
-
- public void setContainer(String container) {
- this.container = container;
- }
-
- public String getContainer() {
- return container;
- }
-
- /**
- * Constructor for JavaWSDLParameter.
- */
- public JavaWSDLParameter() {
- }
-
- /**
- * Returns the beanName.
- * @return String
- */
- public String getBeanName() {
- return beanName;
- }
-
- public String getBeanPackage() {
- return beanPackage;
- }
-
- /**
- * Returns the portTypeName.
- * @return String
- */
- public String getPortTypeName() {
- return portTypeName;
- }
-
- /**
- * Returns the serviceName.
- * @return String
- */
- public String getServiceName() {
- return serviceName;
- }
-
- /**
- * Returns the output.
- * @return String
- */
- public String getOutput() {
- return output;
- }
-
- /**
- * Returns the methods.
- * @return String[]
- */
- public Hashtable getMethods() {
- return methods;
- }
-
- /**
- * Returns the comma seperated string represetation of the methods.
- * @return String
- */
- public String getMethodString() {
- String methodString = ""; //$NON-NLS-1$
- Enumeration e = methods.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
-
- String signature = (String) e.nextElement();
- if (((Boolean) methods.get(signature)).booleanValue()){
- int index = signature.indexOf('(');
- String name = signature.substring(0, index);
- methodString += name;
- }
- if (i != methods.size() -1) // this is not the last array item
- {
- methodString += ",";
- }
- }
- return methodString;
- }
-
- /**
- * Returns the style attribute.
- * @return String
- */
- public String getStyle() {
- return style;
- }
-
- /**
- * Returns the urlLocation.
- * @return String
- */
- public String getUrlLocation() {
- return urlLocation;
- }
-
- /**
- * Returns the use attribute.
- * @return String
- */
- public String getUse() {
- return use;
- }
-
- /**
- * Returns the outputWsdlLocation.
- * @return String
- */
- public String getOutputWsdlLocation() {
- return outputWsdlLocation;
- }
-
- /**
- * Sets the beanName.
- * @param beanName The beanName to set
- */
- public void setBeanName(String beanName) {
- this.beanName = beanName;
- }
-
- public void setBeanPackage(String beanPackage) {
- this.beanPackage = beanPackage;
- }
-
- /**
- * Sets the portTypeName.
- * @param portTypeName The portTypeName to set
- */
- public void setPortTypeName(String portTypeName) {
- this.portTypeName = portTypeName;
- }
-
- /**
- * Sets the serviceName.
- * @param serviceName The serviceName to set
- */
- public void setServiceName(String serviceName) {
- this.serviceName = serviceName;
- }
-
- /**
- * Sets the output.
- * @param output The output to set
- */
- public void setOutput(String output) {
- this.output = output;
- }
-
- /**
- * Sets the methods.
- * @param methods The methods to set
- */
- public void setMethods(Hashtable methods) {
- this.methods = methods;
- }
-
- /**
- * Sets the style.
- * @param style The style to set
- */
- public void setStyle(String style) {
- this.style = style;
- }
-
- /**
- * Sets the urlLocation.
- * @param urlLocation The urlLocation to set
- */
- public void setUrlLocation(String urlLocation) {
- this.urlLocation = urlLocation;
- }
-
- /**
- * Sets the use.
- * @param use The use to set
- */
- public void setUse(String use) {
- this.use = use;
- }
-
- /**
- * Sets the outputWsdlLocation.
- * @param outputWsdlLocation The outputWsdlLocation to set
- */
- public void setOutputWsdlLocation(String wsdlLocation) {
- this.outputWsdlLocation = wsdlLocation;
- }
-
- /**
- * Returns the metaInfOnly.
- * @return boolean
- */
- public boolean isMetaInfOnly() {
- return metaInfOnly;
- }
-
- /**
- * Sets the metaInfOnly.
- * @param metaInfOnly The metaInfOnly to set
- */
- public void setMetaInfOnly(boolean metaInfOnly) {
- this.metaInfOnly = metaInfOnly;
- }
-
- /**
- * Returns the serverSide.
- * @return byte
- */
- public byte getServerSide() {
- return serverSide;
- }
-
- /**
- * Sets the serverSide.
- * @param serverSide The serverSide to set
- */
- public void setServerSide(byte serverSide) {
- this.serverSide = serverSide;
- }
-
- /**
- * Returns the inputWsdlLocation.
- * @return String
- */
- public String getInputWsdlLocation() {
- return inputWsdlLocation;
- }
-
- /**
- * Sets the inputWsdlLocation.
- * @param inputWsdlLocation The inputWsdlLocation to set
- */
- public void setInputWsdlLocation(String inputWsdlLocation) {
- this.inputWsdlLocation = inputWsdlLocation;
- }
-
- /**
- * Returns the namespace.
- * @return String
- */
- public String getNamespace() {
- return namespace;
- }
-
- /**
- * Sets the namespace.
- * @param namespace The namespace to set
- */
- public void setNamespace(String namespace) {
- this.namespace = namespace;
- }
-
- /**
- * Returns the Java output.
- * @return String
- */
- public String getJavaOutput() {
- return javaOutput;
- }
-
- /**
- * Sets the javaOutput.
- * @param javaOutput The Java output to set
- */
- public void setJavaOutput(String javaOutput) {
- this.javaOutput = javaOutput;
- }
-
- /**
- * @return
- */
- public String getClasspath() {
- return classpath;
- }
-
- /**
- * @param string
- */
- public void setClasspath(String string) {
- classpath = string;
- }
-
- /**
- * @return
- */
- public boolean isSkeletonDeploy() {
- return skeletonDeploy;
- }
-
- /**
- * @param b
- */
- public void setSkeletonDeploy(boolean b) {
- skeletonDeploy = b;
- }
-
- /**
- * @return
- */
- public String[] getDeploymentFiles() {
- return deploymentFiles;
- }
-
- /**
- * @param strings
- */
- public void setDeploymentFiles(String[] strings) {
- deploymentFiles = strings;
- }
-
- /**
- * @return
- */
- public String[] getJavaFiles() {
- return javaFiles;
- }
-
- /**
- * @param strings
- */
- public void setJavaFiles(String[] strings) {
- javaFiles = strings;
- }
-
- /**
- * @return
- */
- public String getProjectURL() {
- return projectURL;
- }
-
- /**
- * @param string
- */
- public void setProjectURL(String string) {
- projectURL = string;
- }
-
- public HashMap getMappings()
- {
- return mappingPairs;
- }
-
- public void setMappings(HashMap map)
- {
- mappingPairs = map;
- }
-
- /**
- * Returns the user name for HTTP basic authentication
- * @return String
- */
- public String getHTTPUsername()
- {
- return httpUsername_;
- }
-
- /**
- * Sets the user name for HTTP basic authentication
- * @param String
- */
- public void setHTTPUsername(String httpUsername)
- {
- httpUsername_ = httpUsername;
- }
-
- /**
- * Returns the password for HTTP basic authentication
- * @return String
- */
- public String getHTTPPassword()
- {
- return httpPassword_;
- }
-
- /**
- * @param string
- */
- public void setHTTPPassword(String httpPassword) {
- httpPassword_ = httpPassword;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java b/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
deleted file mode 100644
index 84cd5f4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.core/src/org/eclipse/jst/ws/internal/axis/consumption/core/wsfinder/WSFinderAxis.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.core.wsfinder;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceVisitor;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.LiveWSDLFilter;
-import org.eclipse.jst.ws.internal.consumption.wsfinder.WSFinderCommon;
-
-public class WSFinderAxis extends WSFinderCommon
-{
- public WSFinderAxis()
- {
- super();
- }
-
- public List find()
- {
- final Vector wsdlURLs = new Vector();
- IProject[] projects = getWorkspaceProjects();
- for (int i = 0; i < projects.length; i++)
- {
- J2EEWebNatureRuntime webNature = getWebNature(projects[i]);
- if (webNature != null)
- {
- final String webProjectURL = ResourceUtils.getWebProjectURL(projects[i]);
- if (webProjectURL != null && webProjectURL.length() > 0)
- {
- final IFolder folderWSDL = getFolderRootPublishable(webNature).getFolder("wsdl");
- try
- {
- folderWSDL.accept(
- new IResourceVisitor()
- {
- public boolean visit(IResource resource)
- {
- if (resource.getType() == IResource.FILE)
- {
- String ext = resource.getFileExtension();
- if (ext != null && ext.equalsIgnoreCase("wsdl"))
- {
- String resPath = resource.getFullPath().toString();
- String folderPath = folderWSDL.getFullPath().toString();
- int index = resPath.indexOf(folderPath);
- if (index != -1)
- resPath = resPath.substring(index+folderPath.length(), resPath.length());
- StringBuffer sb = new StringBuffer(webProjectURL);
- sb.append("/wsdl");
- sb.append(resPath);
- wsdlURLs.add(sb.toString());
- }
- }
- return true;
- }
- }
- );
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- LiveWSDLFilter[] filters = new LiveWSDLFilter[wsdlURLs.size()];
- for (int i = 0; i < filters.length; i++)
- {
- filters[i] = new LiveWSDLFilter((String)wsdlURLs.get(i));
- filters[i].start();
- }
- for (int i = 0; i < filters.length; i++)
- {
- if (!filters[i].isFinish())
- {
- Thread.yield();
- i = -1;
- }
- }
- for (int i = 0; i < filters.length; i++)
- {
- if (!filters[i].isWSDLLive())
- wsdlURLs.remove(filters[i].getWSDLURL());
- }
- return wsdlURLs;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
deleted file mode 100644
index a21e9e0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project b/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
deleted file mode 100644
index cb0ee10..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/.project
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.consumption.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.axis.consumption.core</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index cecc076..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,47 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc-axis-ui.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.jst.ws.internal.axis.consumption.ui.command,
- org.eclipse.jst.ws.internal.axis.consumption.ui.env,
- org.eclipse.jst.ws.internal.axis.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.axis.consumption.ui.task,
- org.eclipse.jst.ws.internal.axis.consumption.ui.util,
- org.eclipse.jst.ws.internal.axis.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test,
- org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jem,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws,
- org.eclipse.wst.common.modulecore,
- org.wsdl4j,
- org.apache.axis11
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
deleted file mode 100644
index b3397df..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.wsc-axis-ui.jar = src/
-bin.includes = wsc-axis-ui.jar,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
deleted file mode 100644
index cb7a83d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Consumption UI
-PLUGIN_PROVIDER=Eclipse.org
-
-WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS=Java proxy
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
deleted file mode 100644
index 9bfda1a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Web Service Client Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceClientType">
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.32"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.40"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.41"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.50"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceServer>
-
- <webServiceRuntime
- label="%LABEL_RUNTIME_AXIS_11"
- description="%DESC_RUNTIME_AXIS_11"
- isDefault="false"
- j2eeversion="13 14"
- id="org.eclipse.jst.ws.runtime.axis11">
- </webServiceRuntime>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT32_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat32Local">
- </webServiceClientType>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT40_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat40Local">
- </webServiceClientType>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT41_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat41Local">
- </webServiceClientType>
-
- <webServiceClientType
- name="%WEBSERVICECLIENTTYPE_NAME_JAVA_AXIS"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- clientType="org.eclipse.jst.ws.client.type.java"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType"
- server="SERVER_ID_TOMCAT50_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType.axis11.Tomcat50Local">
- </webServiceClientType>
-
- </extension>
-
- <!-- J2EE Service Reference Generator -->
-
- <extension
- point="org.eclipse.jst.j2ee.WebServiceClientGenerator">
- <generator
- className="org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator">
- <runtime
- serverTarget="Generic J2EE Container">
- </runtime>
- </generator>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisClientConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand"
- class="org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisClientConfigWidgetFactory"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
deleted file mode 100644
index 5a9b0bb..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/axis/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,118 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_DEFAULT_BEAN=IWAB0491E Error encountered while setting up default values for Java bean
-MSG_ERROR_READ_WSDL=IWAB0494E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_DEFINITION=IWAB0495E WSDL file at {0} has no definition element
-MSG_ERROR_WSDL_NO_PORT=IWAB0496E WSDL file at {0} has no port element
-MSG_ERROR_WRITE_WSDL=IWAB0497E Error in writing WSDL file {0}
-
-
-
-#
-# Messages for CopyClientWSDLTask
-#
-MSG_ERROR_IMPORT_WSDL=IWAB0531E Error in resolving WSDL file {0}, import WSDL file must have absolute URL or relative URL in the same directory
-
-
-#
-#DefaultsForClientJavaWSDLCommand
-#
-TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS=DefaultsForClientJavaWSDL
-TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for client side.
-MSG_ERROR_WSDL_LOCATION_NOT_SET=IWAB0501E WSDL location not set.
-
-#
-#AddJarsToProjectBuildPathTask
-#
-TASK_LABEL_JARS_TO_PROJECT=AddJarsToProjectBuildPathTask
-TASK_DESC_JARS_TO_PROJECT=Add Jars to project build path.
-MSG_WARN_NO_JAVA_NATURE=IWAB0502W The project is not a Java project.
-MSG_ERROR_BAD_BUILDPATH=IWAB0503E Unable to update Java build path. Please check your system environment.
-
-#
-#CopyAxisJarCommand
-#
-TASK_DESC_COPY_JARS_TO_PROJECT=CopyAxisJarCommand
-TASK_LABEL_COPY_JARS_TO_PROJECT=Copy required Axis runtime jars from plugin to web project.
-PROGRESS_INFO_COPY_AXIS_CFG=IWAB0505I Copying Axis jar files to web project.
-MSG_ERROR_FILECOPY=IWAB0506E Error when copying Axis jar files to web project
-
-#
-#RefreshProjectTask
-#
-TASK_LABEL_REFESH_PROJECT=RefreshProjectTask
-TASK_DESC_REFESH_PROJECT=Refresh the files on the project with the local file system.
-MSG_ERROR_REFRESH_PROJECT=IWAB0508E Unable to refresh project.
-
-
-#
-#WebServiceAxisProxyFragment
-#
-
-#
-#WebServiceAxisProxyPage
-#
-TOOLTIP_PWJB_PAGE=Page
-TOOLTIP_PWJB_TEXT_FOLDER=Folder for proxy to be generated for the selected binding.
-TOOLTIP_PWJB_CHECKBOX_GENPROXY=Check to enable/disable the generation of a proxy.
-
-PAGE_TITLE_WS_AXIS_PROXY=Web Service Proxy Page
-PAGE_DESC_WS_AXIS_PROXY=Select generate proxy if you want to generate proxy for your service.
-CHECKBOX_GENPROXY=Generate proxy
-LABEL_FOLDER_NAME=Output folder
-
-#
-# CheckAxisDeploymentDescriptorsTask
-#
-CHECK_WS_DD_TASK_DESCRIPTION=CheckAxisDeploymentDescriptorsTask
-CHECK_WS_DD_TASK_LABEL=CheckAxisDeploymentDescriptorsTask
-
-#
-#ClasspathUtils
-#
-MSG_ERROR_CLASSPATH_UTILS_IOEXCEPTION=IWAB0509E IOException in ClasspathUtils
-
-#
-# Messages for WebSerivceAxisMappingsPage
-#
-PAGE_TITLE_WS_BEAN2XML=Web Service package to namespace mapping
-PAGE_TITLE_WS_XML2PROXY=Web Service Client namespace to package mapping
-PAGE_DESC_P2N_MAPPINGS=Define custom mapping for package to namespace.
-LABEL_MAPPING_PAIRS=Mapping pairs
-TABLE_COLUMN_LABEL_PACKAGE=package
-TABLE_COLUMN_LABEL_NAMESPACE=namespace
-LABEL_EXPLORE_MAPPINGS_XML2BEAN=Define custom mapping for namespace to package.
-TOOLTIP_N2P_SHOW_MAPPINGS=Define namespace to package mapping for customization.
-
-#
-# Messages for CheckAxisDeploymentDescriptorsTask
-#
-MSG_ERROR_XML_FILE_OVERWRITE_DISABLED=IWAB0532E Do you want to overwrite the Apache Axis deployment descriptor?
-
-#
-#Messages for CopyClientWSDLCommand
-#
-TASK_DESC_COPY_CLIENT_WSDL=Copies WSDL to Client project
-TASK_LABEL_COPY_CLIENT_WSDL=Copy WSDL to Client project
-
-#
-#AxisClientInputCommand and AxisClientOutputCommand
-#
-
-TASK_LABEL_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_DESC_AXIS_CLIENT_INPUT=Axis client input commmand
-TASK_LABEL_AXIS_CLIENT_OUTPUT=Axis client output commmand
-TASK_DESC_AXIS_CLIENT_OUTPUT=Axis client output commmand
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
deleted file mode 100644
index b4ed228..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AddAxisJARToBuildPathCommand.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Command to add axis.jar to the build path of a project as an external variable
- */
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class AddAxisJARToBuildPathCommand extends SimpleCommand
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils;
- private String jarPluginId = "org.apache.axis11";
- private String jarPluginRelPath = "lib";
- private String jarName = "axis.jar";
- private IProject project;
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment)
- {
- msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- Status status = new SimpleStatus("");
-
- //Add JARs to the classpath
- IClasspathEntry[] oldClasspath;
- IClasspathEntry[] newClasspath;
- IJavaProject javaProject;
-
- //Get the old classpath
- try
- {
- javaProject = JavaCore.create(project);
- if (javaProject == null)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
-
- oldClasspath = javaProject.getRawClasspath();
- }
- catch (JavaModelException e)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
-
- //Check if the axis.jar is already on the build path
- boolean found = false;
- for (int i=0; i<oldClasspath.length; i++)
- {
- found = found || oldClasspath[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
- }
-
- if (found)
- {
- return status;
- }
-
- //Add axis.jar to the build path
- newClasspath = new IClasspathEntry[oldClasspath.length + 1];
- int i = 0;
- for (i=0 ; i < oldClasspath.length; i++)
- {
- newClasspath[i] = oldClasspath[i];
- }
-
- IClasspathEntry newEntry = getClasspathEntry();
- if (newEntry==null)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
- newClasspath[i] = newEntry;
-
- try
- {
- javaProject.setRawClasspath(newClasspath,null);
- }
- catch (JavaModelException e)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NOT_COMPILE"), Status.WARNING);
- return wStatus;
- }
-
-
- return status;
-
- }
-
- private IClasspathEntry getClasspathEntry()
- {
- try
- {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(jarPluginId);
-
- StringBuffer theJar = new StringBuffer();
- theJar.append(jarPluginRelPath);
-
- if (jarPluginRelPath.length()>0)
- theJar.append(IPath.SEPARATOR);
-
- theJar.append(jarName);
-
- URL localURL = Platform.asLocalURL(new URL(pluginDescriptor.getInstallURL(),theJar.toString()));
- Path jarPath = new Path(localURL.getFile());
- IClasspathEntry cpEntry = JavaCore.newLibraryEntry(jarPath, null, null);
- return cpEntry;
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- catch (IOException e)
- {
- return null;
- }
-
- }
-
-
- /**
- * @param project The project to set.
- */
- public void setProject(IProject project)
- {
- this.project = project;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
deleted file mode 100644
index 0dbdba1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientDefaultingCommand.java
+++ /dev/null
@@ -1,273 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * AxisClientDefaultingCommand
- *
- */
-public class AxisClientDefaultingCommand extends SimpleCommand
-{
- private boolean isClientScenario_ = true;
- private boolean customizeMappings_ = false;
- private boolean generateProxy_ = true;
- private String clientRuntimeId_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_ = null;
- private IProject clientProjectEAR_ = null;
- private String wsdlURL_;
- private boolean testProxySelected_;
- private IServer clientExistingServer_;
- private String clientServer_;
- private String clientServerTypeId_;
- private boolean clientIsExistingServer_;
- private String proxyProjectFolder_;
- private WebServicesParser webServicesParser_;
- private String moduleName_;
-
-
- public AxisClientDefaultingCommand( String moduleName )
- {
- moduleName_ = moduleName;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment) {
- Status status = new SimpleStatus("");
-
- clientExistingServer_ = getServerFromServerLabel();
- if (clientExistingServer_ != null) {
- clientServerTypeId_ = clientExistingServer_.getServerType().getId();
- } else {
- //TODO get the factory id for the type.
- }
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
- // proxyProjectFolber_
-
- webServicesParser_ = WSDLParserFactory.getWSDLParser();
- return status;
- }
-
- public void setClientRuntimeID(String clientRuntimeId) {
- clientRuntimeId_ = clientRuntimeId;
- }
-
- public String getClientRuntimeID() {
- return this.clientRuntimeId_;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public IProject getClientProject() {
- return proxyProject_;
- }
-
- /**
- * @param clientProject
- * The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.proxyProject_ = clientProject;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public IProject getClientProjectEAR() {
- return clientProjectEAR_;
- }
-
- /**
- * @param clientProjectEAR
- * The clientProjectEAR to set.
- */
- public void setClientProjectEAR(IProject clientProjectEAR) {
- this.clientProjectEAR_ = clientProjectEAR;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public boolean getTestProxySelected() {
- return testProxySelected_;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestProxySelected(boolean testProxySelected) {
- this.testProxySelected_ = testProxySelected;
- }
-
- /**
- * @return Returns the wsdlURL.
- */
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
- /**
- * @param wsdlURL
- * The wsdlURL to set.
- */
- public void setWsdlURL(String wsdlURL) {
- this.wsdlURL_ = wsdlURL;
- }
-
- /**
- * @return Returns the clientServer.
- */
- public IServer getClientExistingServer() {
- return clientExistingServer_;
- }
-
- /**
- * @param clientServer
- * The clientServer to set.
- */
- public void setClientServer(String clientServer) {
- this.clientServer_ = clientServer;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer() {
- return clientIsExistingServer_;
- }
-
- /**
- * @param clientIsExistingServer
- * The clientIsExistingServer to set.
- */
- public void setClientIsExistingServer(boolean clientIsExistingServer) {
- this.clientIsExistingServer_ = clientIsExistingServer;
- }
-
- public boolean getCustomizeClientMappings() {
- return customizeMappings_;
- }
-
- public void setCustomizeClientMappings(boolean value) {
- customizeMappings_ = value;
- }
-
- private IServer getServerFromServerLabel() {
- if (true)
- // rsk revisit if (clientIsExistingServer_)
- {
- // Maybe this should be in WebServiceServerRuntimeTypeRegistry
- Vector serverIds = new Vector();
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- if ((server.getName()).equals(clientServer_))
- return server;
- }
- }
- }
- //
- } else {
- //TODO create the server
- }
- return null;
- }
- /**
- * @return Returns the proxyProjectFolder.
- */
- public String getProxyProjectFolder() {
- if (proxyProject_!=null) {
- proxyProjectFolder_ = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ ).toString();
- }
- return proxyProjectFolder_;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser_ = webServicesParser;
- }
- /**
- * @return Returns the generateProxy.
- */
- public boolean getGenerateProxy() {
- return generateProxy_;
- }
- /**
- * @param generateProxy The generateProxy to set.
- */
- public void setGenerateProxy(boolean generateProxy) {
- this.generateProxy_ = generateProxy;
- }
-
- /**
- * @return Returns the isClientScenario_.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
- /**
- * @param isClientScenario_ The isClientScenario_ to set.
- */
- public void setIsClientScenario(boolean isClientScenario)
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public String getSetEndpointMethod()
- {
- return "setEndpoint";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
deleted file mode 100644
index f1d53ac..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientGenerator.java
+++ /dev/null
@@ -1,327 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservices.WebServiceClientGenerator;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.env.J2EEEnvironment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class AxisClientGenerator extends WebServiceClientGenerator
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- public IStatus genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
- {
- //get info from the model
- String wsdlURL = dataModel.getWSDLUrl();
- String project = dataModel.getProjectName();
- String outputWSDLFilePathName = dataModel.getOutputWSDLFileName();
- String serviceQName = dataModel.getServiceQName();
- boolean shouldDeploy = dataModel.shouldDeploy();
-
-
- //Generate the artifacts
- Status status = new SimpleStatus("");
- //AxisClientDefaultingCommand
- AxisClientDefaultingCommand axisClientDefaultingCommand = new AxisClientDefaultingCommand("");
- axisClientDefaultingCommand.setWsdlURL(wsdlURL);
- axisClientDefaultingCommand.setWebServicesParser(new WebServicesParserExt());
- axisClientDefaultingCommand.setClientProject(ProjectUtilities.getProject(project));
- axisClientDefaultingCommand.setTestProxySelected(false);
- axisClientDefaultingCommand.setIsClientScenario(true);
- axisClientDefaultingCommand.setGenerateProxy(true);
- J2EEEnvironment j2eeEnvironment = new J2EEEnvironment();
- status = axisClientDefaultingCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
-// Figure out if this is a Web, EJB, or AppClient project
- boolean isWebProject = ResourceUtils.isWebProject(axisClientDefaultingCommand.getClientProject());
-
- //DefaultsForHTTPBasicAuthCommand
- DefaultsForHTTPBasicAuthCommand httpCommand = new DefaultsForHTTPBasicAuthCommand();
- httpCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- httpCommand.setWsdlServiceURL(axisClientDefaultingCommand.getWsdlURL());
- httpCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
- status = httpCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //CopyAxisJarCommand
- //The code generated by the Axis WSDL2Java emitter requires axis.jar in order to compile.
- //In the case of a Web project, we add it to the lib directory.
- //In the case of an EJB or App Client project, we add it as an external JAR. This breaks
- //the team environment scenario. We will have to think of a better way to deal with this
- //in the future.
- if (isWebProject)
- {
- CopyAxisJarCommand axjCommand = new CopyAxisJarCommand("");
- axjCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = axjCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
- }
- else
- {
- AddAxisJARToBuildPathCommand addAxisCommand = new AddAxisJARToBuildPathCommand();
- addAxisCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = addAxisCommand.execute(j2eeEnvironment);
- if (status.getSeverity() != Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
- }
-
- //AddJarsToProjectBuildPathTask
- AddJarsToProjectBuildPathTask addJarsCommand = new AddJarsToProjectBuildPathTask();
- addJarsCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = addJarsCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //DefaultsForClientJavaWSDLCommand
- DefaultsForClientJavaWSDLCommand defClientCommand = new DefaultsForClientJavaWSDLCommand("");
- defClientCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- defClientCommand.setProxyProject(axisClientDefaultingCommand.getClientProject());
- defClientCommand.setWSDLServiceURL(axisClientDefaultingCommand.getWsdlURL());
- status = defClientCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //ValidateWSDLCommand
- ValidateWSDLCommand valWSDLCommand = new ValidateWSDLCommand();
- valWSDLCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
- valWSDLCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
- status = valWSDLCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //WSDL2JavaCommand
- WSDL2JavaCommand w2jCommand = new WSDL2JavaCommand();
- w2jCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- w2jCommand.setWsdlURI(axisClientDefaultingCommand.getWsdlURL());
- status = w2jCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //RefreshProjectCommand
- RefreshProjectCommand refreshCommand = new RefreshProjectCommand();
- refreshCommand.setProject(axisClientDefaultingCommand.getClientProject());
- status = refreshCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- Stub2BeanCommand s2bCommand = new Stub2BeanCommand();
- s2bCommand.setJavaWSDLParam(axisClientDefaultingCommand.getJavaWSDLParam());
- s2bCommand.setWebServicesParser(axisClientDefaultingCommand.getWebServicesParser());
- s2bCommand.setClientProject(axisClientDefaultingCommand.getClientProject());
- status = s2bCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //CopyClientWSDLCommand
- CopyClientWSDLCommand copyCommand = new CopyClientWSDLCommand();
- copyCommand.setWsdlURL(axisClientDefaultingCommand.getWsdlURL());
- copyCommand.setClientWSDLPathName(outputWSDLFilePathName);
- copyCommand.setWsParser(axisClientDefaultingCommand.getWebServicesParser());
- status = copyCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
-
- //BuildProjectCommand
- BuildProjectCommand buildCommand = new BuildProjectCommand();
- buildCommand.setProject(axisClientDefaultingCommand.getClientProject());
- buildCommand.setForceBuild(true);
- status = buildCommand.execute(j2eeEnvironment);
- if (status.getSeverity()!=Status.OK)
- {
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- //Calculate the service interface and service endpoint interface names
- InterfaceNames interfaceNames = calculateSIandSEIName(axisClientDefaultingCommand.getWsdlURL(), serviceQName, axisClientDefaultingCommand.getWebServicesParser());
- String siName = interfaceNames.getSiName();
- String[] seiNames = interfaceNames.getSeiNames();
- if (siName==null || siName.length()==0 || seiNames==null || seiNames.length==0)
- {
- return new org.eclipse.core.runtime.Status(IStatus.ERROR,pluginId_,0,"Problems!!",null);
- }
-
- //Set info on the dataModel
- dataModel.setServiceInterfaceName(siName);
- dataModel.setServiceEndpointInterfaceNames(seiNames);
- dataModel.setDidGenDescriptors(false);
-
- return EnvironmentUtils.convertStatusToIStatus(status, pluginId_);
- }
-
- private InterfaceNames calculateSIandSEIName(String wsdlURL, String serviceQName, WebServicesParser wsParser)
- {
- InterfaceNames iNames = new InterfaceNames();
- String serviceLocalPart = serviceQName.substring(serviceQName.lastIndexOf(':')+1);
- Map pkg2nsMapping = null;
- Definition def = wsParser.getWSDLDefinition(wsdlURL);
-
- Map services = def.getServices();
- Service service = null;
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- service = (Service)it.next();
- if (serviceLocalPart.equals(service.getQName().getLocalPart()))
- break;
- }
-
- if (service!=null)
- {
- String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
- String serviceClassName = service.getQName().getLocalPart();
- String jndiName = serviceClassName;
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- if (serviceClassName.equals(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart()))
- {
- serviceClassName = serviceClassName + "_Service";
- break;
- }
- }
- ArrayList seiNames = new ArrayList();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- SOAPAddress soapAddress = null;
- List extensibilityElements = port.getExtensibilityElements();
- if (extensibilityElements != null)
- {
- for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
- {
- Object object = it3.next();
- if (object instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)object;
- break;
- }
- }
- }
- if (soapAddress != null)
- {
- PortType portType = port.getBinding().getPortType();
- QName portTypeQName = portType.getQName();
- String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
- String portTypeClassName = portTypeQName.getLocalPart();
- if (jndiName.equals(portTypeClassName))
- portTypeClassName = portTypeClassName + "_Port";
- seiNames.add(portTypePkgName+"."+portTypeClassName);
- }
- }
- iNames.setSiName(servicePkgName+"."+serviceClassName);
- iNames.setSEINames(convertToStringArray(seiNames.toArray()));
- }
- return iNames;
- }
-
- private String[] convertToStringArray(Object[] a)
- {
- if (a==null) return new String[0];
-
- int length = a.length;
- String[] sa = new String[length];
- for (int i=0; i<length; i++)
- {
- Object obj = a[i];
- if (obj instanceof String)
- {
- sa[i] = (String)obj;
- }
- }
- return sa;
- }
- private class InterfaceNames
- {
- private String siName_;
- private String[] seiNames_;
-
- public String getSiName()
- {
- return siName_;
- }
-
- public String[] getSeiNames()
- {
- return seiNames_;
- }
-
-
- public void setSiName(String siName)
- {
- siName_ = siName;
- }
-
- public void setSEINames(String[] seiNames)
- {
- seiNames_ = seiNames;
- }
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
deleted file mode 100644
index dd77be0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientInputCommand.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientInputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_AXIS_CLIENT_INPUT";
- private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_INPUT";
-
- private IWebServiceClient wsc_;
- private String serverProject_;
- private String serverModule_;
- private IContext context_;
-
- private String serviceServerTypeID_;
-
- private boolean generateProxy_ = true;
- private JavaWSDLParameter javaWSDLParam_;
- private String clientProject_ = null;
- private String clientModule_ = null;
- private String wsdlURL_;
- private IServer clientExistingServer_;
- private String clientServer_;
- private WebServicesParser webServicesParser_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public AxisClientInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisClientInputCommand(IWebServiceClient wsc, IContext context, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- wsc_ = wsc;
- context_ = context;
- clientProject_ = project;
- clientModule_ = module;
- }
-
- public Status execute(Environment env)
- {
-
- generateProxy_ = context_.getClient();
- wsdlURL_ = wsc_.getWebServiceClientInfo().getWsdlURL();
- clientServer_ = wsc_.getWebServiceClientInfo().getServerInstanceId();
-
- return new SimpleStatus("");
- }
-
- public String getClientServer() {
- return clientServer_;
- }
-
- public String getClientProject() {
- return clientProject_;
- }
-
- public WebServicesParser getWebServicesParser() {
- return webServicesParser_;
- }
-
- public String getWsdlURL() {
- return wsdlURL_;
- }
-
- public String getClientModule() {
- return clientModule_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
deleted file mode 100644
index 12b9ac1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/AxisClientOutputCommand.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-
-public class AxisClientOutputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_AXIS_CLIENT_OUTPUT";
- private static String DESCRIPTION = "TASK_DESC_AXIS_CLIENT_OUTPUT";
-
- private IWebServiceClient wsc_;
- private String proxyBean_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public AxisClientOutputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisClientOutputCommand(IWebServiceClient wsc, IContext context, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- wsc_ = wsc;
- }
-
- public Status execute(Environment env)
- {
- wsc_.getWebServiceClientInfo().setImplURL(proxyBean_);
- return new SimpleStatus("");
- }
-
- public void setProxyBean(String proxyBean) {
- this.proxyBean_ = proxyBean;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
deleted file mode 100644
index 4515739..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/CopyClientWSDLCommand.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.xml.WSDLWriter;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- *
- */
-public class CopyClientWSDLCommand extends SimpleCommand
-{
- private String DESCRIPTION = "TASK_DESC_COPY_CLIENT_WSDL";
- private String LABEL = "TASK_LABEL_COPY_CLIENT_WSDL";
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils_;
- private String wsdlURL_;
- private String clientWSDLPathName_;
- private WebServicesParser wsParser_;
-
- public CopyClientWSDLCommand()
- {
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
- Definition def = wsParser_.getWSDLDefinition(wsdlURL_);
- if(def==null)
- {
- status = new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION",new String[]{wsdlURL_}),Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- IPath clientWSDLPath = new Path(clientWSDLPathName_);
- IWorkspaceRoot workspaceRoot = FileResourceUtils.getWorkspaceRoot();
- status = resolveWSDL(workspaceRoot, def, clientWSDLPath,env);
- return status;
- }
-
- private Status resolveWSDL(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- Environment env) {
- try {
- writeWSDLFile(workspace, wsdlDef, wsdlPath, env);
- Map importDefs = wsdlDef.getImports();
- Set keysSet = importDefs.keySet();
- for (Iterator e = keysSet.iterator(); e.hasNext();) {
- Object keyName = e.next();
- Vector vector = (Vector) importDefs.get(keyName);
- for (int i = 0; i < vector.size(); i++) {
- Import importDef = (Import) vector.get(i);
- Definition def = importDef.getDefinition();
- String newPathString =
- wsdlPath.toString().substring(
- 0,
- wsdlPath.toString().lastIndexOf("/") + 1); //$NON-NLS-1$
- if (isInvalidImportWSDL(importDef.getLocationURI())) {
- return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_IMPORT_WSDL",new String[]{importDef.getLocationURI()}), Status.ERROR);
- }
- IPath newPath =
- new Path(newPathString + importDef.getLocationURI());
- Status status = resolveWSDL(workspace, def, newPath, env);
- if (status != null
- && status.getSeverity() == Status.ERROR) {
- return status;
- }
- }
- }
- } catch (Exception e) {
- return new SimpleStatus(pluginId_, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL",new String[] { wsdlPath.toString() }), Status.ERROR, e);
- }
- return new SimpleStatus("");
- }
-
- private boolean isInvalidImportWSDL(String wsdlPath) {
-
- // relative url
- if (!wsdlPath.toLowerCase().startsWith("http://")) { //$NON-NLS-1$
-
- if (wsdlPath.indexOf("/") != -1) { //$NON-NLS-1$
- if (!wsdlPath.startsWith("./")) { //$NON-NLS-1$
- return true;
- }
- }
-
- }
- return false;
- }
-
- private void writeWSDLFile(
- IWorkspaceRoot workspace,
- Definition wsdlDef,
- IPath wsdlPath,
- Environment env)
- throws Exception {
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- //WSDLFactory wsdlFactory = WSDLFactory.newInstance();
- //WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- WSDLWriter wsdlWriter = (new org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl()).newWSDLWriter();
- wsdlWriter.writeWSDL(wsdlDef, baos);
- byte[] b = baos.toByteArray();
- ByteArrayInputStream bais = new ByteArrayInputStream(b);
-
- ResourceContext context =
- WebServicePlugin.getInstance().getResourceContext();
- FileResourceUtils.createFile(
- context,
- wsdlPath.makeAbsolute(),
- bais,
- env.getProgressMonitor(),
- env.getStatusHandler());
-
- baos.close();
- bais.close();
-
- }
-
- /**
- * @param clientWSDLPathName_ The clientWSDLPathName_ to set.
- */
- public void setClientWSDLPathName(String clientWSDLPathName)
- {
- this.clientWSDLPathName_ = clientWSDLPathName;
- }
- /**
- * @param wsdlURL_ The wsdlURL_ to set.
- */
- public void setWsdlURL(String wsdlURL)
- {
- this.wsdlURL_ = wsdlURL;
- }
- /**
- * @param wsParser_ The wsParser_ to set.
- */
- public void setWsParser(WebServicesParser wsParser)
- {
- this.wsParser_ = wsParser;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
deleted file mode 100644
index bdd9d35..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/command/DefaultsForClientJavaWSDLCommand.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.command;
-
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DefaultsForClientJavaWSDLCommand extends SimpleCommand {
-
- private JavaWSDLParameter javaWSDLParam_;
- private IProject proxyProject_;
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private String moduleName_;
-
- private String LABEL = "TASK_LABEL_CLIENT_JAVA_WSDL_DEFAULTS";
- private String DESCRIPTION = "TASK_DESC_CLIENT_JAVA_WSDL_DEFAULTS";
-
- public DefaultsForClientJavaWSDLCommand( String moduleName ) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
-
- moduleName_ = moduleName;
- }
-
- /**
- * Constructor for DefaultsForClientJavaWSDLCommand.
- */
- public DefaultsForClientJavaWSDLCommand(
- JavaWSDLParameter javaWSDLParam,
- Model model) {
- //super();
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public Status execute(Environment environment) {
- Status status;
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
- coreMsgUtils_.getMessage(
- "MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"),
- Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- javaWSDLParam_.setMetaInfOnly(false);
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_NONE);
-
- IPath webModuleServerRoot = ResourceUtils.getJavaSourceLocation(proxyProject_, moduleName_ );
- //String output = PlatformUtils.getPlatformURL(webModuleServerRoot);
- String output = ResourceUtils.findResource(webModuleServerRoot).getLocation().toString();
-// String output = ResourceUtils.getWorkspaceRoot().getFolder(webModuleServerRoot).getLocation().toString();
- javaWSDLParam_.setJavaOutput(output);
-
-
- IFolder webModuleContainer = ResourceUtils.getWebComponentServerRoot(proxyProject_, moduleName_);
- if (webModuleContainer !=null)
- {
- IPath webModulePath = webModuleContainer.getFullPath();
- //output = PlatformUtils.getPlatformURL(webModulePath);
- IResource res = ResourceUtils.findResource(webModulePath);
- if (res!=null){
- output = res.getLocation().toString();
- }
- javaWSDLParam_.setOutput(output);
- }
-
-
- if (WSDLServicePathname_ == null) {
-
- if (WSDLServiceURL_ == null) {
- status = new SimpleStatus("DefaultsForClientJavaWSDLCommand", //$NON-NLS-1$
- msgUtils_.getMessage(
- "MSG_ERROR_WSDL_LOCATION_NOT_SET"),
- Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- } else {
- WSDLServiceURL_ = PlatformUtils.getFileFromPlatform(WSDLServicePathname_);
- }
-
- javaWSDLParam_.setInputWsdlLocation(WSDLServiceURL_);
-
- return new SimpleStatus( "" );
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- /**
- * @param proxyProject_ The proxyProject_ to set.
- */
- public void setProxyProject(IProject proxyProject) {
- this.proxyProject_ = proxyProject;
- }
- /**
- * @param serviceURL_ The wSDLServiceURL_ to set.
- */
- public void setWSDLServiceURL(String serviceURL) {
- WSDLServiceURL_ = serviceURL;
- }
- /**
- * @param servicePathname_ The wSDLServicePathname_ to set.
- */
- public void setWSDLServicePathname(String servicePathname) {
- WSDLServicePathname_ = servicePathname;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
deleted file mode 100644
index 63e0ff4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EECommandManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
- *
- */
-public class J2EECommandManager implements CommandManager
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.CommandManager#isUndoEnabled()
- */
- public boolean isUndoEnabled()
- {
- return false;
- }
-
-public DataMappingRegistry getMappingRegistry() {
- return null;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
deleted file mode 100644
index d0536f4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEEnvironment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.CommandManager;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.JavaCompiler;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.SimpleURIFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.URIFactory;
-
-
-/**
-*
-*/
-public class J2EEEnvironment implements Environment
-{
- J2EELog j2eeLog_;
- J2EEProgressMonitor j2eeProgressMonitor_;
- J2EEStatusHandler j2eeStatusHandler_;
- SimpleURIFactory simpleURIFactory_;
- J2EECommandManager j2eeCommandManager_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getLog()
- */
- public Log getLog()
- {
- if (j2eeLog_ == null)
- {
- j2eeLog_ = new J2EELog();
- }
- return j2eeLog_;
-
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getProgressMonitor()
- */
- public ProgressMonitor getProgressMonitor()
- {
- if (j2eeProgressMonitor_==null)
- {
- j2eeProgressMonitor_ = new J2EEProgressMonitor();
-
- }
- return j2eeProgressMonitor_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getStatusHandler()
- */
- public StatusHandler getStatusHandler()
- {
- if (j2eeStatusHandler_==null)
- {
- j2eeStatusHandler_ = new J2EEStatusHandler();
- }
- return j2eeStatusHandler_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getURIFactory()
- */
- public URIFactory getURIFactory()
- {
- if (simpleURIFactory_ == null)
- {
- simpleURIFactory_ = new SimpleURIFactory();
- }
- return simpleURIFactory_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getJavaCompiler()
- */
- public JavaCompiler getJavaCompiler()
- {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Environment#getCommandManager()
- */
- public CommandManager getCommandManager()
- {
- if(j2eeCommandManager_ == null)
- {
- j2eeCommandManager_ = new J2EECommandManager();
- }
- return j2eeCommandManager_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
deleted file mode 100644
index cbe455d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EELog.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
-*
-*/
-public class J2EELog implements Log
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#isEnabled()
- */
- public boolean isEnabled() {
- // TODO Auto-generated method stub
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#isEnabled(java.lang.String)
- */
- public boolean isEnabled(String option) {
- // TODO Auto-generated method stub
- return false;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void log(int severity, int messageNum, Object caller, String method,
- Object object) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void log(int severity, int messageNum, Object caller, String method,
- Status status) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, int, java.lang.Object, java.lang.String, java.lang.Throwable)
- */
- public void log(int severity, int messageNum, Object caller, String method,
- Throwable throwable) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Object)
- */
- public void log(int severity, String option, int messageNum, Object caller,
- String method, Object object) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void log(int severity, String option, int messageNum, Object caller,
- String method, Status status) {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.Log#log(int, java.lang.String, int, java.lang.Object, java.lang.String, java.lang.Throwable)
- */
- public void log(int severity, String option, int messageNum, Object caller,
- String method, Throwable throwable) {
- // TODO Auto-generated method stub
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
deleted file mode 100644
index fec15b9..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEProgressMonitor.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class J2EEProgressMonitor implements ProgressMonitor
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#report(java.lang.String)
- */
- public void report(String progress)
- {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#getChildProgressMonitor()
- */
- public ProgressMonitor getChildProgressMonitor()
- {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor#isCancelRequested()
- */
- public boolean isCancelRequested()
- {
- // TODO Auto-generated method stub
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
deleted file mode 100644
index 9a891ab..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/env/J2EEStatusHandler.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.env;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-/**
- *
- */
-public class J2EEStatusHandler implements StatusHandler
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#report(org.eclipse.wst.command.internal.provisional.env.core.common.Status, org.eclipse.wst.command.internal.provisional.env.core.common.Choice[])
- */
- public Choice report(Status status, Choice[] choices)
- {
- // TODO Auto-generated method stub
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#report(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void report(Status status) throws StatusException
- {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#reportError(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void reportError(Status status)
- {
- // TODO Auto-generated method stub
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler#reportInfo(org.eclipse.wst.command.internal.provisional.env.core.common.Status)
- */
- public void reportInfo(Status status)
- {
- // TODO Auto-generated method stub
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
deleted file mode 100644
index 233ba12..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/plugin/WebServiceAxisConsumptionUIPlugin.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisConsumptionUIPlugin extends Plugin
-{
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID =
- "org.eclipse.jst.ws.axis.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisConsumptionUIPlugin instance_;
- private Log log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisConsumptionUIPlugin(IPluginDescriptor descriptor) {
- super(descriptor);
- if (instance_ == null) {
- instance_ = this;
- }
- log_ = new EclipseLog();
-
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp");
- * @return The WebServiceWasConsumptionPlugin singleton.
- */
- static public WebServiceAxisConsumptionUIPlugin getInstance() {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void startup() throws CoreException {
- log_.log(Log.INFO, 5066, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.consumption.ui");
- super.startup();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void shutdown() throws CoreException {
- log_.log(Log.INFO, 5067, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.consumption.ui");
- super.shutdown();
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
- public static String getMessage(String key) {
- return instance_.getDescriptor().getResourceString(key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See java.text.MessageFormat for
- * further details on substitution.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args The substitution values for the message
- * as required by the message in plugin.properties and
- * by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage(String key, Object[] args) {
- return MessageFormat.format(getMessage(key), args);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
deleted file mode 100644
index b4eeff8..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/AddJarsToProjectBuildPathTask.java
+++ /dev/null
@@ -1,355 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class AddJarsToProjectBuildPathTask extends SimpleCommand {
-
- private String DESCRIPTION = "TASK_DESC_JARS_TO_PROJECT";
- private String LABEL = "TASK_LABEL_JARS_TO_PROJECT";
-
- private IJavaProject javaProject_;
- private IClasspathEntry[] oldClasspath_;
- private IClasspathEntry[] newClasspath_;
- private JavaWSDLParameter javaWSDLParam_;
- private boolean isJ2EE_13 = true;
- private MessageUtils msgUtils_;
-
- private IProject project;
- private String module_;
-
- public AddJarsToProjectBuildPathTask()
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- module_ = J2EEUtils.getFirstWebModuleName(project);
- }
-
- public AddJarsToProjectBuildPathTask(String module)
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- module_ = module;
- }
-
- /**
- * Execute AddJarsToProjectBuildPathTask
- */
- public Status execute(Environment env) {
-// try {
-// if (project.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-// J2EEWebNatureRuntime webNatureRuntime =
-// (J2EEWebNatureRuntime) project.getNature(
-// IWebNatureConstants.J2EE_NATURE_ID);
-// isJ2EE_13 = webNatureRuntime.isJ2EE1_3();
-// }
-// } catch (Exception e) {
-// }
-// Status status = new SimpleStatus("");
-// if (!isJ2EE_13)
-// {
-// // AddJar(project, null, "XERCES_API_JAR", status, environment);
-// }
-// return status;
-
- Status status = new SimpleStatus("");
-// TODO: workaround for 90515
- //
- // Get the current classpath.
- //
- javaProject_ = null;
- oldClasspath_ = null;
- try
- {
- javaProject_ = JavaCore.create(project);
- if (javaProject_ != null)
- {
- oldClasspath_ = javaProject_.getRawClasspath();
- }
- else
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- try {
-
- ArrayList aList = new ArrayList();
- String classpathEntry = null;
- IVirtualComponent component = ComponentCore.createComponent(project, module_);
- if (component != null) {
-
- IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
- "/WEB-INF/lib"));
- if (webInfLib != null) {
- IVirtualResource[] resources = webInfLib.members();
- IResource aResource = null;
-
- for (int i = 0; i < resources.length; i++) {
- aResource = resources[i].getUnderlyingResource();
- classpathEntry = aResource.getLocation().toString();
- if (!FoundClasspathEntry(classpathEntry)) {
- aList.add(classpathEntry);
- }
- }
- }
- }
-
- int newListSize = aList.size();
-
- if (newListSize == 0) {
- return status;
- }
-
- // Update classpath
- newClasspath_ = new IClasspathEntry[oldClasspath_.length + newListSize];
- Iterator iter = aList.iterator();
-
- int j=0;
- while (iter.hasNext()) {
- newClasspath_[j] = JavaCore.newLibraryEntry(new Path((String)iter.next()), null, null);
- j++;
- }
- for (int i=0; i<oldClasspath_.length; i++) {
- newClasspath_[j+i] = oldClasspath_[i];
- }
-
- ProgressMonitor monitor = env.getProgressMonitor();
- IProgressMonitor eclipseMonitor = null;
- if (monitor instanceof EclipseProgressMonitor)
- {
- eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
- }
- javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("", "User aborted", Status.ERROR);
- }
- }
- catch (CoreException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-// end of workaround
- return status;
- }
-
-
- private boolean FoundClasspathEntry(String classpathEntry) {
-
-
- boolean found = false;
- for (int i=0; i<oldClasspath_.length && !found; i++)
- {
- if (oldClasspath_[i].getPath().toString().toLowerCase().equals(classpathEntry.toLowerCase())) {
- found=true;
- }
- }
- return found;
- }
-
- private void AddJar(IProject webProject, String pluginId, String jarName, Status status, Environment env) {
- //
- // Get the current classpath.
- //
- javaProject_ = null;
- oldClasspath_ = null;
- try
- {
- javaProject_ = JavaCore.create(webProject);
- if (javaProject_ != null)
- {
- oldClasspath_ = javaProject_.getRawClasspath();
- }
- else
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return;
- }
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_NO_JAVA_NATURE"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return;
- }
-
- boolean found = false;
- for (int i=0; i<oldClasspath_.length; i++)
- {
- found = found || oldClasspath_[i].getPath().toString().toLowerCase().endsWith(jarName.toLowerCase());
- }
-
- if (found)
- {
- return;
- }
-
- newClasspath_ = new IClasspathEntry[oldClasspath_.length + 1];
- int i=0;
- while (i<oldClasspath_.length)
- {
- newClasspath_[i] = oldClasspath_[i];
- i++;
- }
-
- try
- {
- if(pluginId!=null)
- {
- newClasspath_[i++] = JavaCore.newLibraryEntry(getTheJarPath(pluginId,jarName), null, null);
- }
- else
- {
- newClasspath_[i++] = JavaCore.newVariableEntry(getTheJarPath(pluginId,jarName), null, null);
- }
- }
- catch (CoreException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("","User aborted",Status.ERROR);
- }
- return;
- }
-
- //
- // Then update the project classpath.
- //
- try
- {
- ProgressMonitor monitor = env.getProgressMonitor();
- IProgressMonitor eclipseMonitor = null;
- if (monitor instanceof EclipseProgressMonitor)
- {
- eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
- }
- javaProject_.setRawClasspath(newClasspath_,eclipseMonitor);
- }
- catch (JavaModelException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_BUILDPATH"), Status.WARNING, e);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("", "User aborted", Status.ERROR);
- }
- return;
- }
- }
-
- //
- // Returns the local native pathname of the jar.
- //
- private IPath getTheJarPath(String pluginId, String theJar)
- throws CoreException {
- try {
- if (pluginId != null) {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor =
- pluginRegistry.getPluginDescriptor(pluginId);
- URL localURL =
- Platform.asLocalURL(
- new URL(pluginDescriptor.getInstallURL(), theJar));
- return new Path(localURL.getFile());
- } else {
- return new Path(theJar);
- }
- } catch (MalformedURLException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisConsumptionUIPlugin.ID,
- 0,
- msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
- e));
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisConsumptionUIPlugin.ID,
- 0,
- msgUtils_.getMessage("MSG_BAD_AXIS_JAR_URL"),
- e));
- }
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
deleted file mode 100644
index 7edd10a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CheckAxisDeploymentDescriptorsTask.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-
-public class CheckAxisDeploymentDescriptorsTask extends SimpleCommand {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serverProject;
- private String moduleName_;
-
- public CheckAxisDeploymentDescriptorsTask( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage("CHECK_WS_DD_TASK_DESCRIPTION"));
- setName(msgUtils_.getMessage("CHECK_WS_DD_TASK_LABEL"));
-
- moduleName_ = moduleName;
- }
-
- public Status execute(Environment env) {
- Status status = new SimpleStatus( "" );
- if(EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
- return status;
- }
-
- IPath filePath = null;
- IProject project = serverProject;
-
-
- filePath = J2EEUtils.getWebInfPath( project, moduleName_ );
- filePath = filePath.append("/server-config.wsdd");
-
- if(filePath==null || filePath.isEmpty())
- {
- status = new SimpleStatus("", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(filePath);
- if (file.exists() && !EnvironmentUtils.getResourceContext(env).isOverwriteFilesEnabled()) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_XML_FILE_OVERWRITE_DISABLED"), Status.WARNING);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("", "User aborted",Status.ERROR);
- }
-
- return status;
- }
- return status;
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
deleted file mode 100644
index 70cc60b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/CopyAxisJarCommand.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-
-
-public class CopyAxisJarCommand extends SimpleCommand {
-
- public static String AXIS_RUNTIME_PLUGIN_ID = "org.apache.axis11"; //$NON-NLS-1$
- public static String[] JARLIST = new String[] {
- "axis-ant.jar",
- "axis.jar",
- "commons-discovery.jar",
- "commons-logging.jar",
- "jaxrpc.jar",
- "log4j-1.2.8.jar",
- "saaj.jar",
- "wsdl4j.jar"
-
- };
-
- private String DESCRIPTION = "TASK_DESC_COPY_JARS_TO_PROJECT";
- private String LABEL = "TASK_LABEL_COPY_JARS_TO_PROJECT";
-
- private MessageUtils msgUtils_;
- private MessageUtils baseConMsgUtils_;
- private IProject project;
- private Boolean projectRestartRequired_ = Boolean.FALSE;
- private String moduleName_;
-
- /**
- * Default CTOR;
- */
- public CopyAxisJarCommand( String moduleName ) {
- String pluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- baseConMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
- env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_COPY_AXIS_CFG"));
- copyAxisJarsToProject(project, status, env);
- return status;
-
- }
-
- private void copyAxisJarsToProject(IProject project, Status status, Environment env) {
-// IPath webModulePath = ResourceUtils.getWebModuleServerRoot(project).getFullPath();
- IPath webModulePath = J2EEUtils.getWebContentPath( project, moduleName_ );
- if (webModulePath == null) {
- status = new SimpleStatus("", baseConMsgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return;
- }
-
- for (int i=0; i<JARLIST.length; ) {
- copyIFile("lib/"+JARLIST[i], webModulePath, "WEB-INF/lib/"+JARLIST[i++], status, env);
- if (status.getSeverity() == Status.ERROR)
- return;
- }
- return;
- }
-
- /**
- *
- */
- private void copyIFile(String source, IPath targetPath, String targetFile, Status status, Environment env) {
- IPath target = targetPath.append(new Path(targetFile));
- env.getProgressMonitor().report(baseConMsgUtils_.getMessage("PROGRESS_INFO_COPYING_FILE"));
-
- try {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor = pluginRegistry.getPluginDescriptor(AXIS_RUNTIME_PLUGIN_ID);
- Plugin axisrt_plugin = pluginDescriptor.getPlugin();
- IFile resource = ResourceUtils.getWorkspaceRoot().getFile(target);
- if (!resource.exists()) {
- IFile file = FileResourceUtils.createFile(context, target, axisrt_plugin.openStream(new Path(source)), env.getProgressMonitor(), env
- .getStatusHandler());
- if (projectRestartRequired_.booleanValue() == false && file.exists()) {
- projectRestartRequired_ = Boolean.TRUE;
- }
-
- }
- }
- catch (Exception e) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_FILECOPY"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
-
- }
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-
- public boolean getProjectRestartRequired() {
- return projectRestartRequired_.booleanValue();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
deleted file mode 100644
index 1ffb7d0..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/DefaultsForHTTPBasicAuthCommand.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class DefaultsForHTTPBasicAuthCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private String wsdlServiceURL;
- private JavaWSDLParameter javaWSDLParam;
- private Model model;
-
- public DefaultsForHTTPBasicAuthCommand()
- {
- super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand");
- }
-
- public Status execute(Environment env)
- {
- //WebServiceElement wse = WebServiceElement.getWebServiceElement(model);
- //setWebServicesParser((WebServicesParser)wse.getWSParser());
- //setWsdlServiceURL(wse.getWSDLServiceURL());
- //if (wsdlServiceURL == null || wsdlServiceURL.length() <= 0)
- // setWsdlServiceURL((new Utils()).toFileSystemURI(wse.getWSDLServicePathname()));
-
- if (wsdlServiceURL != null && wsdlServiceURL.length() > 0)
- {
- if (webServicesParser == null)
- {
- webServicesParser = new WebServicesParserExt();
- //wse.setWSParser(webServicesParser);
- }
- WebServiceEntity wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
- if (wsEntity == null || !wsEntity.isEntityResolved())
- {
- webServicesParser.setURI(wsdlServiceURL);
- try
- {
- webServicesParser.parse(WebServicesParser.PARSE_NONE);
- }
- catch (WWWAuthenticationException wwwae)
- {
- DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- dialog.handleWWWAuthentication(wwwae);
- String username = dialog.getUsername();
- String password = dialog.getPassword();
- if (username != null && password != null)
- {
- webServicesParser.setHTTPBasicAuthUsername(username);
- webServicesParser.setHTTPBasicAuthPassword(password);
- try
- {
- webServicesParser.parse(WebServicesParser.PARSE_NONE);
- }
- catch (Throwable t)
- {
- }
- webServicesParser.setHTTPBasicAuthUsername(null);
- webServicesParser.setHTTPBasicAuthPassword(null);
- }
- }
- catch (Throwable t)
- {
- }
- wsEntity = webServicesParser.getWebServiceEntityByURI(wsdlServiceURL);
- }
- if (wsEntity != null && wsEntity.getType() == WebServiceEntity.TYPE_WSDL)
- {
- String httpUsername = wsEntity.getHTTPUsername();
- String httpPassword = wsEntity.getHTTPPassword();
- if (httpUsername != null && httpPassword != null)
- {
- javaWSDLParam.setHTTPUsername(httpUsername);
- javaWSDLParam.setHTTPPassword(httpPassword);
- }
- }
- }
- return new SimpleStatus("");
- }
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param model The model to set.
- */
- public void setModel(Model model) {
- this.model = model;
- }
-
- /**
- * @param wsdlServiceURL The wsdlServiceURL to set.
- */
- public void setWsdlServiceURL(String wsdlServiceURL) {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
deleted file mode 100644
index ae95c0f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/RefreshProjectCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.plugin.WebServiceAxisConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-public class RefreshProjectCommand extends SimpleCommand
-{
- private static final String LABEL = "TASK_LABEL_REFESH_PROJECT";
- private static final String DESCRIPTION = "TASK_DESC_REFESH_PROJECT";
-
- private IProject project;
- private MessageUtils msgUtils_;
-
- public RefreshProjectCommand()
- {
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
- setName( msgUtils_.getMessage( LABEL ) );
- setDescription( msgUtils_.getMessage( DESCRIPTION ));
- }
-
- /**
- * Execute RefreshProjectTask
- */
- public Status execute(Environment env)
- {
- try
- {
- if (project!=null)
- project.refreshLocal(IProject.DEPTH_INFINITE, new NullProgressMonitor());
- }
- catch (CoreException e)
- {
- Status status = new SimpleStatus(WebServiceAxisConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_REFRESH_PROJECT"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- public IProject getProject() {
- return project;
- }
-
- public void setProject(IProject project) {
- this.project = project;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
deleted file mode 100644
index 8cba8ba..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanCommand.java
+++ /dev/null
@@ -1,263 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.xml.namespace.QName;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class Stub2BeanCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam_;
- private String discoveredWsdlPortElementName;
- private Vector portTypes_;
- private String proxyBean_;
-
- private String module_ = "";
-
- private IProject clientProject_;
-
- public Stub2BeanCommand()
- {
- super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
- portTypes_ = new Vector();
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Stub2BeanCommand(String moduleName){
- super("org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand", "org.eclipse.jst.ws.was.creation.ui.task.Stub2BeanCommand");
- portTypes_ = new Vector();
- module_ = moduleName;
- }
-
- /**
- * Execute
- */
- public Status execute(Environment env)
- {
- String inputWsdlLocation = javaWSDLParam_.getInputWsdlLocation();
- Definition def = webServicesParser.getWSDLDefinition(inputWsdlLocation);
- /*
- * Hack: Axis is not using a proper java.net.URL as its inputWsdlLocation.
- * We need to convert it to a proper file URL.
- */
- if (def == null)
- {
- File file = new File(inputWsdlLocation);
- if (file.exists())
- {
- try
- {
- def = webServicesParser.getWSDLDefinition(file.toURL().toString());
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- Map pkg2nsMapping = javaWSDLParam_.getMappings();
- Map services = def.getServices();
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- String servicePkgName = WSDLUtils.getPackageName(service, pkg2nsMapping);
- String serviceClassName = computeClassName(service.getQName().getLocalPart());
- String jndiName = serviceClassName;
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- if (serviceClassName.equals(computeClassName(((Port)it2.next()).getBinding().getPortType().getQName().getLocalPart())))
- {
- serviceClassName = serviceClassName + "_Service";
- break;
- }
- }
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- if (discoveredWsdlPortElementName != null && !discoveredWsdlPortElementName.equals(port.getName()))
- continue;
- SOAPAddress soapAddress = null;
- List extensibilityElements = port.getExtensibilityElements();
- if (extensibilityElements != null)
- {
- for (Iterator it3 = extensibilityElements.iterator(); it3.hasNext();)
- {
- Object object = it3.next();
- if (object instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)object;
- break;
- }
- }
- }
- if (soapAddress != null)
- {
- PortType portType = port.getBinding().getPortType();
- QName portTypeQName = portType.getQName();
- StringBuffer portTypeID = new StringBuffer();
- portTypeID.append(portTypeQName.getNamespaceURI());
- portTypeID.append("#");
- portTypeID.append(portTypeQName.getLocalPart());
- if (!portTypes_.contains(portTypeID.toString()))
- {
- portTypes_.add(portTypeID.toString());
- Stub2BeanInfo stub2BeanInfo = new Stub2BeanInfo();
- stub2BeanInfo.setClientProject(clientProject_);
- stub2BeanInfo.setClientModuleName(module_);
- String portTypePkgName = WSDLUtils.getPackageName(portType, pkg2nsMapping);
- String portTypeClassName = computeClassName(portTypeQName.getLocalPart());
- stub2BeanInfo.setPackage(portTypePkgName);
- stub2BeanInfo.setClass(portTypeClassName + "Proxy");
- proxyBean_ = portTypePkgName+"."+portTypeClassName+"Proxy";
- if (jndiName.equals(portTypeClassName))
- portTypeClassName = portTypeClassName + "_Port";
- stub2BeanInfo.addSEI(portTypePkgName, portTypeClassName, servicePkgName, serviceClassName, jndiName, port.getName());
- try
- {
- stub2BeanInfo.write( env.getProgressMonitor(), env.getStatusHandler() );
- if (discoveredWsdlPortElementName != null)
- {
- // The discovered port was processed. Ignore all other ports and services.
- return new SimpleStatus("");
- }
- }
- catch (CoreException ce)
- {
- }
- catch (IOException ioe)
- {
- }
- }
- }
- }
- }
- return new SimpleStatus("");
- }
-
- private final char UNDERSCORE = '_';
-
- private String computeClassName(String className)
- {
- String classNameCopy = className;
- int i = classNameCopy.indexOf(UNDERSCORE);
- while (i != -1)
- {
- char c = classNameCopy.charAt(i+1);
- if (Character.isLowerCase(c))
- {
- StringBuffer sb = new StringBuffer();
- sb.append(classNameCopy.substring(0, i+1));
- sb.append(Character.toUpperCase(c));
- sb.append(classNameCopy.substring(i+2, classNameCopy.length()));
- classNameCopy = sb.toString();
- }
- i = classNameCopy.indexOf(UNDERSCORE, i+1);
- }
- char[] cArray = new char[classNameCopy.length()];
- boolean foundDigit = false;
- for (int j = 0; j < cArray.length; j++)
- {
- char c = classNameCopy.charAt(j);
- if (Character.isDigit(c))
- {
- cArray[j] = c;
- foundDigit = true;
- }
- else
- {
- if (foundDigit)
- cArray[j] = Character.toUpperCase(c);
- else
- cArray[j] = c;
- foundDigit = false;
- }
- }
- return new String(cArray);
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
-
- /**
- * @param discoveredWsdlPortElementName The discoveredWsdlPortElementName to set.
- */
- public void setDiscoveredWsdlPortElementName(String discoveredWsdlPortElementName) {
- this.discoveredWsdlPortElementName = discoveredWsdlPortElementName;
- }
-
- /**
- * @param clientProject The clientProject to set.
- */
- public void setClientProject(IProject clientProject) {
- this.clientProject_ = clientProject;
- }
-
- /**
- * @return Returns the proxyBean.
- */
- public String getProxyBean() {
- return proxyBean_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
deleted file mode 100644
index 04b3ab1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/Stub2BeanInfo.java
+++ /dev/null
@@ -1,678 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.util.Iterator;
-import java.util.List;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-public class Stub2BeanInfo
-{
- private final String NEW_LINE = System.getProperty("line.separator");
-
- private int indentCount;
-
- private String package_;
- private StringBuffer imports_;
- private StringBuffer seis_;
- private StringBuffer services_;
- private StringBuffer jndiNames_;
- private StringBuffer ports_;
- private String class_;
- private Vector usedNames;
-
- private IProject clientProject_;
- private String moduleName_;
-
- public Stub2BeanInfo()
- {
- indentCount = 0;
- package_ = null;
- imports_ = new StringBuffer();
- seis_ = new StringBuffer();
- services_ = new StringBuffer();
- jndiNames_ = new StringBuffer();
- ports_ = new StringBuffer();
- class_ = "SEIBean";
- usedNames = new Vector();
- }
-
- public void setClientProject(IProject clientProject) {
- this.clientProject_ = clientProject;
- }
-
- public void setClientModuleName(String moduleName) {
- this.moduleName_ = moduleName;
- }
-
- public void setPackage(String pkgName)
- {
- if (pkgName != null && pkgName.length() > 0)
- package_ = manglePackageName(pkgName);
- }
-
- public void addImports(String pkgName, String className)
- {
- imports_.append(toFullyQualifiedClassName(pkgName, className));
- imports_.append(";");
- }
-
- public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String portName)
- {
- addSEI(seiPkgName, seiClassName, servicePkgName, serviceClassName, serviceClassName, portName);
- }
-
- public void addSEI(String seiPkgName, String seiClassName, String servicePkgName, String serviceClassName, String jndiName, String portName)
- {
- seis_.append(toFullyQualifiedClassName(seiPkgName, seiClassName));
- seis_.append(";");
- services_.append(toFullyQualifiedClassName(servicePkgName, serviceClassName));
- services_.append(";");
- jndiNames_.append(jndiName);
- jndiNames_.append(";");
- ports_.append(portName);
- ports_.append(";");
- }
-
- public void setClass(String className)
- {
- if (className != null && className.length() > 0)
- class_ = mangleClassName(className);
- }
-
- private String toFullyQualifiedClassName(String pkgName, String className)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(manglePackageName(pkgName));
- sb.append(".");
- sb.append(mangleClassName(className));
- return sb.toString();
- }
-
- private String getPackageName(String qname)
- {
- int index = qname.lastIndexOf(".");
- if (index != -1)
- return qname.substring(0, index);
- else
- return qname;
- }
-
- private String getClassName(String qname)
- {
- int index = qname.lastIndexOf(".");
- if (index != -1)
- return qname.substring(index+1, qname.length());
- else
- return qname;
- }
-
- private String manglePackageName(String s)
- {
- return replaceInvalidJavaChars(s);
- }
-
- private String mangleClassName(String s)
- {
- s = firstCharToUpperCase(WSDLUtils.resolveDotInPortName(s));
- return replaceInvalidJavaChars(s);
- }
-
- private String replaceInvalidJavaChars(String s)
- {
- char[] c = s.toCharArray();
- for (int i = 0; i < c.length; i++)
- {
- if (!Character.isJavaIdentifierPart(c[i]))
- c[i] = '.';
- }
- return new String(c);
- }
-
- private String firstCharToUpperCase(String s)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(s.substring(0, 1).toUpperCase());
- sb.append(s.substring(1, s.length()));
- return sb.toString();
- }
-
- private String firstCharToLowerCase(String s)
- {
- StringBuffer sb = new StringBuffer();
- sb.append(s.substring(0, 1).toLowerCase());
- sb.append(s.substring(1, s.length()));
- return sb.toString();
- }
-
- private String trimArraySymbol(String s)
- {
- int index = s.indexOf("[");
- if (index != -1)
- return s.substring(0, index);
- else
- return s;
- }
-
- private String getFullyQualifiedName(JavaHelpers javaHelpers)
- {
- if (javaHelpers.isPrimitive())
- return javaHelpers.getJavaName();
- else
- return javaHelpers.getQualifiedName();
- }
-
- public void write(ProgressMonitor progressMonitor, StatusHandler statusMonitor) throws CoreException, IOException
- {
- StringWriter sw = new StringWriter(2048);
- writePackage(sw);
- writeImports(sw);
- writeClass(sw);
- sw.close();
- byte[] bytes = sw.getBuffer().toString().getBytes();
- StringBuffer sb = new StringBuffer();
- if (package_ != null && package_.length() > 0)
- {
- sb.append(package_);
- sb.append(".");
- }
- sb.append(class_);
- sb = new StringBuffer(sb.toString().replace('.', '/'));
- sb.append(".java");
-
- JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
- ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
- IPath sourceFolderPath = ResourceUtils.getJavaSourceLocation(clientProject_, moduleName_);
- IFolder sourceFolder = (IFolder)ResourceUtils.findResource(sourceFolderPath);
- IPath filePath = sourceFolder.getFile(new Path(sb.toString())).getFullPath();
- FileResourceUtils.createFile(WebServicePlugin.getInstance().getResourceContext(), filePath, bais, progressMonitor, statusMonitor);
- }
-
- private void writePackage(Writer w) throws IOException
- {
- if (package_ != null && package_.length() > 0)
- {
- w.write("package ");
- w.write(package_);
- w.write(";");
- newLine(w);
- }
- }
-
- private void writeImports(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(imports_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write("import ");
- w.write(st.nextToken());
- w.write(";");
- newLine(w);
- }
- }
-
- private void writeClass(Writer w) throws IOException, CoreException
- {
- newLine(w);
- w.write("public class ");
- w.write(class_);
- w.write(" ");
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- if (st.hasMoreTokens())
- w.write("implements ");
- while (st.hasMoreTokens())
- {
- w.write(st.nextToken());
- if (st.hasMoreTokens())
- w.write(", ");
- }
- w.write(" {");
- incrementIndent();
- newLine(w);
- writeFieldsDeclarations(w);
- writeConstructor(w);
- writeInit(w);
- /*
- * Cannot use JNDI lookup for AXIS
- *
- writeUseJNDI(w);
- */
- writeGetSetEndpoint(w);
- writeSEIGetters(w);
- writeSEIMethods(w);
- decrementIndent();
- newLine(w);
- w.write("}");
- }
-
- private void writeFieldsDeclarations(Writer w) throws IOException
- {
- /*
- * Cannot use JNDI lookup for AXIS
- *
- w.write("private boolean _useJNDI = true;");
- newLine(w);
- */
- w.write("private String _endpoint = null;");
- usedNames.add("_endpoint");
- newLine(w);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write("private ");
- String sei = st.nextToken();
- w.write(sei);
- w.write(" ");
- String stubName = firstCharToLowerCase(getClassName(sei));
- w.write(stubName);
- usedNames.add(stubName);
- w.write(" = null;");
- newLine(w);
- }
- }
-
- private void writeConstructor(Writer w) throws IOException
- {
- newLine(w);
- w.write("public ");
- w.write(class_);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeInit(Writer w) throws IOException
- {
- newLine(w);
- w.write("private void _init");
- w.write(class_);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("try {");
- incrementIndent();
- newLine(w);
- /*
- * Cannot use JNDI lookup for AXIS
- *
- w.write("if (_useJNDI) {");
- incrementIndent();
- newLine(w);
- */
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- StringTokenizer serviceTokens = new StringTokenizer(services_.toString(), ";");
- StringTokenizer jndiNameTokens = new StringTokenizer(jndiNames_.toString(), ";");
- StringTokenizer portTokens = new StringTokenizer(ports_.toString(), ";");
- /*
- if (st.hasMoreTokens())
- {
- w.write("javax.naming.InitialContext ctx = new javax.naming.InitialContext();");
- newLine(w);
- }
- while (st.hasMoreTokens())
- {
- w.write(firstCharToLowerCase(getClassName(st.nextToken())));
- w.write(" = ((");
- w.write(serviceTokens.nextToken());
- w.write(")ctx.lookup(\"java:comp/env/service/");
- w.write(jndiNameTokens.nextToken());
- w.write("\")).get");
- w.write(mangleClassName(portTokens.nextToken()));
- w.write("();");
- newLine(w);
- }
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- w.write("else {");
- incrementIndent();
- newLine(w);
- st = new StringTokenizer(seis_.toString(), ";");
- serviceTokens = new StringTokenizer(services_.toString(), ";");
- portTokens = new StringTokenizer(ports_.toString(), ";");
- */
- while (st.hasMoreTokens())
- {
- String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
- w.write(seiName);
- w.write(" = (new ");
- w.write(serviceTokens.nextToken());
- w.write("Locator()).get");
- w.write(replaceInvalidJavaChars(WSDLUtils.resolveDotInPortName(portTokens.nextToken())));
- w.write("();");
- newLine(w);
- w.write("if (");
- w.write(seiName);
- w.write(" != null) {");
- incrementIndent();
- newLine(w);
- w.write("if (_endpoint != null)");
- incrementIndent();
- newLine(w);
- w.write("((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
- decrementIndent();
- newLine(w);
- w.write("else");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = (String)((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._getProperty(\"javax.xml.rpc.service.endpoint.address\");");
- decrementIndent();
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
- /*
- decrementIndent();
- newLine(w);
- w.write("}");
- */
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- /*
- w.write("catch (javax.naming.NamingException namingException) {}");
- newLine(w);
- */
- w.write("catch (javax.xml.rpc.ServiceException serviceException) {}");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeSetPropertyEndpoint(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String seiName = firstCharToLowerCase(getClassName(st.nextToken()));
- w.write("if (");
- w.write(seiName);
- w.write(" != null)");
- incrementIndent();
- newLine(w);
- w.write("((javax.xml.rpc.Stub)");
- w.write(seiName);
- w.write(")._setProperty(\"javax.xml.rpc.service.endpoint.address\", _endpoint);");
- decrementIndent();
- newLine(w);
- }
- }
-
- private void writeUseJNDI(Writer w) throws IOException
- {
- newLine(w);
- w.write("public void useJNDI(boolean useJNDI) {");
- incrementIndent();
- newLine(w);
- w.write("_useJNDI = useJNDI;");
- newLine(w);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- w.write(firstCharToLowerCase(getClassName(st.nextToken())));
- w.write(" = null;");
- newLine(w);
- }
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void writeSEIGetters(Writer w) throws IOException
- {
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- String seiClassName = getClassName(sei);
- String seiFieldName = firstCharToLowerCase(seiClassName);
- newLine(w);
- w.write("public ");
- w.write(sei);
- w.write(" get");
- w.write(seiClassName);
- w.write("() {");
- incrementIndent();
- newLine(w);
- w.write("if (");
- w.write(seiFieldName);
- w.write(" == null)");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- w.write("return ");
- w.write(seiFieldName);
- w.write(";");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
- }
-
- private void writeSEIMethods(Writer w) throws IOException, CoreException
- {
- newLine(w);
- //WebServiceElement wse = WebServiceElement.getWebServiceElement(model_);
- if (clientProject_ == null) return;//wse.getProxyProject();
- JavaEMFNature javaMOF = (JavaEMFNature)JavaEMFNature.createRuntime(clientProject_);
- StringTokenizer st = new StringTokenizer(seis_.toString(), ";");
- while (st.hasMoreTokens())
- {
- String sei = st.nextToken();
- JavaClass javaClass = (JavaClass)JavaClassImpl.reflect(getPackageName(sei), getClassName(sei), javaMOF.getResourceSet());
- if (javaClass != null)
- {
- List methods = javaClass.getMethods();
- for (Iterator it = methods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor() && !method.isNative() && method.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
- writeSEIMethods(w, javaClass, method);
- }
- }
- }
- }
-
- private void writeSEIMethods(Writer w, JavaClass javaClass, Method method) throws IOException
- {
- w.write("public ");
- // isVoid
- if (method.isVoid())
- w.write("void ");
- else
- {
- w.write(getFullyQualifiedName(method.getReturnType()));
- w.write(" ");
- }
- // method name
- w.write(method.getName());
- w.write("(");
- // input parameters
- JavaParameter[] inputParams = method.listParametersWithoutReturn();
- for (int i = 0; i < inputParams.length; i++)
- {
- if (i > 0)
- w.write(", ");
- JavaHelpers javaHelpers = inputParams[i].getJavaType();
- w.write(getFullyQualifiedName(javaHelpers));
- w.write(" ");
- String paramName = getClassName(inputParams[i].getQualifiedName());
- w.write(getUnusedName(paramName));
- }
- w.write(")");
- // exceptions
- List exceptions = method.getJavaExceptions();
- if (!exceptions.isEmpty())
- w.write(" throws ");
- for (Iterator it = exceptions.iterator(); it.hasNext();)
- {
- JavaClass exception = (JavaClass)it.next();
- w.write(exception.getQualifiedNameForReflection());
- if (it.hasNext())
- w.write(", ");
- }
- // method body
- w.write("{");
- incrementIndent();
- newLine(w);
- String stubName = firstCharToLowerCase(javaClass.getName());
- w.write("if (");
- w.write(stubName);
- w.write(" == null)");
- incrementIndent();
- newLine(w);
- w.write("_init");
- w.write(class_);
- w.write("();");
- decrementIndent();
- newLine(w);
- if (!method.isVoid())
- w.write("return ");
- w.write(stubName);
- w.write(".");
- w.write(method.getName());
- w.write("(");
- for (int i = 0; i < inputParams.length; i++)
- {
- if (i > 0)
- w.write(", ");
- String paramName = getClassName(inputParams[i].getQualifiedName());
- w.write(getUnusedName(paramName));
- }
- w.write(");");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- newLine(w);
- }
-
- private void writeGetSetEndpoint(Writer w) throws IOException
- {
- newLine(w);
- w.write("public String getEndpoint() {");
- incrementIndent();
- newLine(w);
- w.write("return _endpoint;");
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- newLine(w);
- w.write("public void setEndpoint(String endpoint) {");
- incrementIndent();
- newLine(w);
- w.write("_endpoint = endpoint;");
- newLine(w);
- writeSetPropertyEndpoint(w);
- decrementIndent();
- newLine(w);
- w.write("}");
- newLine(w);
- }
-
- private void createParentFolder(IResource res) throws CoreException
- {
- IResource parent = res.getParent();
- if (parent != null && parent != res && parent instanceof IFolder)
- {
- IFolder folder = (IFolder)parent;
- if (!folder.exists())
- {
- createParentFolder(folder);
- folder.create(true, true, null);
- }
- }
- }
-
- private void incrementIndent()
- {
- indentCount++;
- }
-
- private void decrementIndent()
- {
- indentCount--;
- }
-
- private void indent(Writer w) throws IOException
- {
- for (int i = 0; i < indentCount; i++)
- w.write(" ");
- }
-
- private void newLine(Writer w) throws IOException
- {
- w.write(NEW_LINE);
- indent(w);
- }
-
- private String getUnusedName(String name)
- {
- if (usedNames.contains(name))
- {
- for (int i = 0; i < 100; i++)
- {
- String newName = (new StringBuffer(name)).append(String.valueOf(i)).toString();
- if (!usedNames.contains(newName))
- return newName;
- }
- }
- return name;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
deleted file mode 100644
index 8b973b2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/task/ValidateWSDLCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.task;
-
-import javax.wsdl.Definition;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-
-public class ValidateWSDLCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
-
- public ValidateWSDLCommand()
- {
- super("org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand", "org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand");
- }
-
- public Status execute(Environment env)
- {
- MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
-
- if (wsdlURI != null && wsdlURI.length() > 0)
- {
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- if (definition != null)
- {
- int numServices = definition.getServices().size();
- if (numServices < 1)
- {
- Status status = new SimpleStatus(WebServiceConsumptionUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT", new Object[] {wsdlURI}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return new SimpleStatus("");
- }
-
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
deleted file mode 100644
index 2c074cc..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/ClasspathUtils.java
+++ /dev/null
@@ -1,294 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class ClasspathUtils {
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
- private static ClasspathUtils instance_; //$NON-NLS-1$
- private static String DIR_CLASSES = "classes"; //$NON-NLS-1$
- private static String DIR_LIB = "lib"; //$NON-NLS-1$
- private static String DOT_JAR = ".jar"; //$NON-NLS-1$
- private static String JAR = "jar"; //$NON-NLS-1$
- private static String WEBINF_LIB = "/WEB-INF/lib"; //$NON-NLS-1$
- private static String WEBINF = "WEB-INF"; //$NON-NLS-1$
-
- private ClasspathUtils() {
- }
-
- public static ClasspathUtils getInstance() {
- if (instance_ == null)
- instance_ = new ClasspathUtils();
- return instance_;
- }
-
- public String getClasspathString(IProject project, String module) {
- StringBuffer classpath = new StringBuffer();
- String[] classpathEntries = getClasspath(project, false, module);
-
- Vector classpathVector = new Vector();
- for (int i = 0; i < classpathEntries.length; i++) {
- if (!classpathVector.contains(classpathEntries[i])) {
- classpathVector.add(classpathEntries[i]);
- classpath.append(classpathEntries[i]);
- classpath.append(";"); //$NON-NLS-1$
- }
- }
- return classpath.toString();
- }
-
-
- private String[] getClasspath(IProject project, boolean isDependent, String inputModule) {
-// inputModule is valid only if it's not a dependent project
- String[] moduleClasspath = new String[0];
- ArrayList projectClasspath = new ArrayList();
- boolean needJavaClasspath = false;
- StructureEdit mc = null;
- IFolder webModuleServerRoot = null;
- String resourceLocation = null;
- IFolder webModuleClasses = null;
-
- try {
- String module;
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- for (int i = 0; i < wbcs.length; i++) {
- module = wbcs[i].getName();
- // get the module's classpath
- if (J2EEUtils.isEARComponent(project, module)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- } else if (J2EEUtils.isWebComponent(project, module)) {
- webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[i]);
- if (webModuleServerRoot != null) {
- webModuleClasses = webModuleServerRoot.getFolder(WEBINF).getFolder(DIR_CLASSES);
- if (webModuleClasses != null)
- moduleClasspath = new String[] { webModuleClasses.getLocation().toOSString() };
- }
- } else if (J2EEUtils.isJavaComponent(project, module)) {
- needJavaClasspath = true;
- webModuleServerRoot = StructureEdit.getOutputContainerRoot(wbcs[i]);
- if (webModuleServerRoot != null) {
- moduleClasspath = new String[] { webModuleServerRoot.getLocation().toOSString() };
- }
- }
-
- // add module classpath to project classpath
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- }
- if (!isDependent) {
- if (J2EEUtils.isWebComponent(project, inputModule)) {
- needJavaClasspath = true;
- moduleClasspath = getWEBINFLib(project, inputModule);
- for (int j = 0; j < moduleClasspath.length; j++) {
- projectClasspath.add(moduleClasspath[j]);
- }
- }
- }
-
- // If there are Web or Java module in the project, get the project's Java classpath
- if (needJavaClasspath) {
- String[] javaClasspath;
- try {
- IJavaProject javaProj = (IJavaProject) project.getNature(JavaCore.NATURE_ID);
- if (javaProj != null) {
- javaClasspath = getClasspathForJavaProject(javaProj);
- for (int j = 0; j < javaClasspath.length; j++) {
- projectClasspath.add(javaClasspath[j]);
- }
- }
- } catch (CoreException e) {
- // not able to get Java classpath, just ignore
- }
- }
- } finally {
- if (mc != null)
- mc.dispose();
- }
- return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
- }
-
- // Need to get all modules in the project. If there's a EAR module, get the utility JARs
- private String[] getUtilityJarClasspath(IProject project) {
- String[] moduleClasspath = new String[0];
- ArrayList utilityJarsClasspath = new ArrayList();
- StructureEdit mc = null;
- try {
- String module;
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- for (int i = 0; i < wbcs.length; i++) {
- module = wbcs[i].getName();
- if (J2EEUtils.isEARComponent(project, module)) {
- moduleClasspath = getClasspathForEARProject(project, module);
- for (int j = 0; j < moduleClasspath.length; j++) {
- utilityJarsClasspath.add(moduleClasspath[j]);
- }
- }
- }
-
- } finally {
- if (mc != null)
- mc.dispose();
- }
- return (String[]) utilityJarsClasspath.toArray(new String[utilityJarsClasspath.size()]);
- }
-
- private String[] getClasspathForEARProject(IProject project, String module) {
- IPath projectPath =
- project.getProject().getLocation().addTrailingSeparator().append(module).addTrailingSeparator();
- return getDirectoryJarFiles(projectPath);
- }
-
- private String[] getDirectoryJarFiles(IPath iPath) {
- File dir = iPath.toFile();
- Vector jarsVector = new Vector();
- if (dir.exists() && dir.isDirectory()) {
- String[] filenames = dir.list();
- for (int i = 0; i < filenames.length; i++) {
- if (filenames[i].endsWith(DOT_JAR))
- jarsVector.add(path2String(iPath) + filenames[i]);
- }
- }
- String[] jars = new String[jarsVector.size()];
- jarsVector.copyInto(jars);
- return jars;
- }
-
- private String[] getWEBINFLib(IProject project, String module) {
- String[] webinfLibJars = new String[0];
- ArrayList anArrayList = new ArrayList();
- try {
- String resourceLocation = null;
- IVirtualComponent component = ComponentCore.createComponent(project, module);
- if (component != null) {
-
- IVirtualFolder webInfLib = component.getRootFolder().getFolder(new Path(
- WEBINF_LIB));
- if (webInfLib != null) {
- IVirtualResource[] resources = webInfLib.members();
- IResource aResource = null;
- for (int i = 0; i < resources.length; i++) {
- aResource = resources[i].getUnderlyingResource();
- if (JAR.equalsIgnoreCase(aResource.getFileExtension()))
- anArrayList.add( aResource.getLocation().toOSString());
- }
- if (anArrayList.size() != 0)
- webinfLibJars = (String[]) anArrayList.toArray(new String[anArrayList.size()]);
- }
- }
- } catch (CoreException e) {
- }
- return webinfLibJars;
- }
-
- private String[] getClasspathForJavaProject(IJavaProject javaProject) {
- ArrayList projectClasspath = new ArrayList();
- try {
- IClasspathEntry[] buildPath =
- javaProject.getResolvedClasspath(true);
- for (int i = 0; i < buildPath.length; i++) {
- String[] buildPathString =
- classpathEntry2String(
- buildPath[i],
- javaProject.getProject());
- for (int j = 0; j < buildPathString.length; j++) {
- projectClasspath.add(buildPathString[j]);
- }
- }
- } catch (JavaModelException jme) {
- }
-
- String[] utilityJarsClasspath;
- IProject project = javaProject.getProject();
- IProject[] referencingProjects = project.getReferencingProjects();
- for (int i = 0; i < referencingProjects.length; i++) {
- utilityJarsClasspath = getUtilityJarClasspath(referencingProjects[i]);
- for (int j = 0; j < utilityJarsClasspath.length; j++) {
- projectClasspath.add(utilityJarsClasspath[j]);
- }
- }
-
- return (String[]) projectClasspath.toArray(new String[projectClasspath.size()]);
- }
-
- private String[] classpathEntry2String(
- IClasspathEntry entry,
- IProject project)
- {
- switch (entry.getEntryKind()) {
- case IClasspathEntry.CPE_LIBRARY :
- {
- return new String[] { path2String(entry.getPath())};
- }
- case IClasspathEntry.CPE_PROJECT :
- {
- return getClasspath(
- ResourcesPlugin.getWorkspace().getRoot().getProject(
- entry.getPath().lastSegment()), true, "");
- }
- case IClasspathEntry.CPE_SOURCE :
- {
- IPath path = entry.getPath();
- if (path.segment(0).equals(project.getName()))
- path = path.removeFirstSegments(1);
- return new String[] {
- path2String(
- project
- .getLocation()
- .addTrailingSeparator()
- .append(
- path))};
- }
- case IClasspathEntry.CPE_VARIABLE :
- {
- return classpathEntry2String(
- JavaCore.getResolvedClasspathEntry(entry),
- project);
- }
- default :
- {
- return new String[] { path2String(entry.getPath())};
- }
- }
- }
-
- private String path2String(IPath path) {
- return path.toOSString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
deleted file mode 100644
index 68269d1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/FileUtil.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-
-public class FileUtil
-{
- public FileUtil()
- {
- super();
- }
-
- public static void copyFile(String src, String dest)
- {
- InputStream is = null;
- FileOutputStream fos = null;
- try
- {
- is = new FileInputStream(src);
- byte buff[] = new byte[1024];
- fos = new FileOutputStream(dest);
- int c = 0;
- byte[] array = new byte[1024];
- while ((c = is.read(array)) >= 0)
- {
- fos.write(array, 0, c);
- }
- }
- catch (Exception e)
- {
- }
- finally
- {
- try
- {
- fos.close();
- is.close();
- }
- catch (Exception e)
- {
- }
- }
- }
-
- public static File createFileAndParentDirectories(String fileName) throws Exception
- {
- File file = new File(fileName);
- File parent = file.getParentFile();
- if (!parent.exists())
- {
- parent.mkdirs();
- }
- file.createNewFile();
- return file;
- }
-
- public static void deleteDirectories(File dir) throws Exception
- {
- File[] children = dir.listFiles();
- for (int i = 0; i < children.length; i++)
- {
- if (children[i].list() != null && children[i].list().length > 0)
- {
- deleteDirectories(children[i]);
- }
- else
- {
- children[i].delete();
- }
- }
- dir.delete();
- }
-
- /**
- * Creates a folder and all parent folders if not existing Project must exist
- */
- public static void createFolder(IFolder folder, boolean force, boolean local) throws CoreException
- {
- if (!folder.exists())
- {
- IContainer parent = folder.getParent();
- if (parent instanceof IFolder)
- {
- createFolder((IFolder)parent, force, local);
- }
- folder.create(force, local, new NullProgressMonitor());
- }
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName) throws Exception
- {
- createTargetFile(sourceFileName, targetFileName, false);
- }
-
- public static void createTargetFile(String sourceFileName, String targetFileName, boolean overwrite) throws Exception
- {
- File idealResultFile = new File(targetFileName);
- if (overwrite || !idealResultFile.exists())
- {
- FileUtil.createFileAndParentDirectories(targetFileName);
- FileUtil.copyFile(sourceFileName, targetFileName);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
deleted file mode 100644
index cb652a1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/PlatformUtils.java
+++ /dev/null
@@ -1,177 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-
-public class PlatformUtils {
-
- public static final String PLATFORM_ROOT = "platform:/resource";
- public static final String WIN_FILE_PROTOCOL = "file:/";
- public static final String LNX_FILE_PROTOCOL = "file://";
- public static final String PLATFORM = "platform";
- public static final String RESOURCE = "/resource";
-
- private PlatformUtils() {
- }
-
- /**
- * Returns the string representation of platform URL given an IPath
- * @param IPath path
- * @return String platformURL
- */
- public static String getPlatformURL(IPath path) {
- String platformURL;
- platformURL = URI.createPlatformResourceURI(path.toString()).toString();
- // old method: file system representation
- // platformURL = ResourcesPlugin.getWorkspace().getRoot().getFile(path).getLocation().toString();
- return platformURL;
- }
-
- /**
- * Returns the URL representation of the Platform URL given an IPath
- * The PlatformResourceManager underdstands this format and therefore
- * this is suited for command URL's
- * @param IPath path
- * @return URL Platform URL
- */
- public static URL getCommandPlatformURL(IPath path) {
- URL url = null;
- try {
- url = new URL(PLATFORM, null, RESOURCE + path.toString());
- } catch (MalformedURLException e) {
- return url;
- }
- return url;
- }
-
- /**
- * Returns the string representation of path given platform URL string
- * @param String platform URL string
- * @return String path string
- */
- public static String getPathFromPlatform(String platformStr) {
- String pathStr = platformStr;
-
- String rootLocation;
- rootLocation = PLATFORM_ROOT;
- // old method: file system representation
- // rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- if (platformStr.startsWith(rootLocation))
- pathStr = platformStr.substring(rootLocation.length());
- return pathStr;
- }
-
- /**
- * Returns the string representation of platform URL given the path string
- * @param String path string
- * @return String platform URL string
- */
- public static String getPlatformFromPath(String pathStr) {
- String platformStr = pathStr;
-
- String rootLocation;
- rootLocation = PLATFORM_ROOT;
- // old method: file system representation
- // rootLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- platformStr = rootLocation + pathStr;
- return platformStr;
- }
-
- /**
- * Returns the string representation of the local file system file given platform URL string
- * @param String platform URL string
- * @return String file string
- */
- public static String getFileFromPlatform(String platformStr) {
- String fileStr = platformStr;
- String pathStr = getPathFromPlatform(platformStr);
-
- fileStr =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(new Path(pathStr))
- .getLocation()
- .toString();
-
- // old method: file system representation
- // Do nothing
-
- return fileStr;
- }
-
- /**
- * Returns the file protocol representation of the local file system file given platform URL string
- * @param String platform URL string
- * @return String the file protocol uri
- */
- public static String getFileURLFromPlatform(String platformStr) {
- String fileStr = platformStr;
- String pathStr = getPathFromPlatform(platformStr);
- try {
- fileStr =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(new Path(pathStr))
- .getLocation()
- .toFile()
- .toURL()
- .toString();
- } catch (MalformedURLException murle) {
- fileStr = getFileURLFromPath(new Path(pathStr));
- }
- return fileStr;
- }
-
- /**
- * Returns the file protocol representation of a local file
- * @param IPath the Path object representing the file
- * @return String the file protocol uri
- */
- public static String getFileURLFromPath(IPath path) {
-
- String file = null;
- if (path != null) {
- if (!path.isAbsolute()) {
- file =
- ResourcesPlugin
- .getWorkspace()
- .getRoot()
- .getFile(path)
- .getLocation()
- .toString();
- if (file.charAt(0) == IPath.SEPARATOR) {
- file = LNX_FILE_PROTOCOL + file;
- } else {
- file = WIN_FILE_PROTOCOL + file;
- }
- } else {
- file = path.toString();
- }
- if (file != null && file.charAt(0) == IPath.SEPARATOR) {
- file = LNX_FILE_PROTOCOL + file;
- } else {
- file = WIN_FILE_PROTOCOL + file;
- }
- }
- return file == null ? null : file;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
deleted file mode 100644
index 42afccb..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/util/WSDLUtils.java
+++ /dev/null
@@ -1,538 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.util;
-
-import java.text.Collator;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-
-import org.apache.axis.wsdl.toJava.Utils;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-
-public class WSDLUtils {
-
- private static final String DOT = ".";
- private static final String SLASH = "/";
- private static final String PROTOCOL_SUFFIX = "://";
-
- /**
- * Tokens in a namespace that are treated as package name part separators.
- * Used by normalizePackageName.
- */
- private static final char[] pkgSeparators = { ':', '\\', '/' };
-
- /**
- * These are java keywords as specified at the following URL (sorted alphabetically).
- * http://java.sun.com/docs/books/jls/second_edition/html/lexical.doc.html#229308
- * Note that false, true, and null are not strictly keywords; they are literal values,
- * but for the purposes of this array, they can be treated as literals.
- */
- static final String keywords[] =
- {
- "abstract", "boolean", "break", "byte", "case",
- "catch", "char", "class", "const", "continue",
- "default", "do", "double", "else", "extends",
- "false", "final", "finally", "float", "for",
- "goto", "if", "implements", "import", "instanceof",
- "int", "interface", "long", "native", "new",
- "null", "package", "private", "protected", "public",
- "return", "short", "static", "strictfp", "super",
- "switch", "synchronized", "this", "throw", "throws",
- "transient", "true", "try", "void", "volatile",
- "while"
- };
-
- /** Collator for comparing the strings */
- static final Collator englishCollator = Collator.getInstance(Locale.ENGLISH);
-
- /** Use this character as suffix */
- static final char keywordPrefix = '_';
-
- private WSDLUtils() {
- }
-
- /**
- * Returns the name of the first service element in the WSDL definition.
- * @return String service element name
- */
- public static String getServiceElementName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- return service.getQName().getLocalPart();
- }
-
- /**
- * Returns the name of the port type element points to by the first service and port element in the WSDL definition.
- * @return String port type element name
- */
- public static String getPortTypeName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress) {
- Binding binding = port.getBinding();
- return binding.getPortType().getQName().getLocalPart();
- }
- }
- }
- return "";
-
- }
-
- /**
- * Returns the name of the port element in the WSDL definition.
- * @return String port name
- */
- public static String getPortName(Definition definition) {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress)
- return port.getName();
- }
- }
- return "";
- }
-
-
-
- public static String makeNamespace (String clsName) {
- return makeNamespace(clsName, "http");
- }
-
- /**
- * Make namespace from a fully qualified class name
- * and the given protocol
- *
- * @param clsName fully qualified class name
- * @param protocol protocol String
- * @return namespace namespace String
- */
- public static String makeNamespace (String clsName, String protocol) {
- if (clsName.lastIndexOf('.') == -1)
- return protocol + "://" + "DefaultNamespace";
- String packageName = clsName.substring(0, clsName.lastIndexOf('.'));
- return makeNamespaceFromPackageName(packageName, protocol);
- }
-
-
- private static String makeNamespaceFromPackageName(String packageName, String protocol) {
- if (packageName == null || packageName.equals(""))
- return protocol + "://" + "DefaultNamespace";
- StringTokenizer st = new StringTokenizer( packageName, "." );
- String[] words = new String[ st.countTokens() ];
- for(int i = 0; i < words.length; ++i)
- words[i] = st.nextToken();
-
- StringBuffer sb = new StringBuffer(80);
- for(int i = words.length-1; i >= 0; --i) {
- String word = words[i];
- // seperate with dot
- if( i != words.length-1 )
- sb.append('.');
- sb.append( word );
- }
- return protocol + "://" + sb.toString();
- }
-
- /**
- * Return a Definition for the wsdl url given
- *
- */
- public static Definition getWSDLDefinition(String wsdlURL)
- {
- if(wsdlURL == null) return null;
-
- WSDLFactory wsdlFactory;
- Definition definition = null;
- String wsdlLocation = null;
- try {
- wsdlFactory = new WSDLFactoryImpl();
- WSDLReader wsdlReader = wsdlFactory.newWSDLReader();
- definition = wsdlReader.readWSDL(wsdlURL);
- }
- catch (Exception e) { // can be WSDLException or IOException
- return null;
- }
- return definition;
- }
-
- public static String getPackageName(Definition definition)
- {
- if (definition != null)
- {
- String namespace = definition.getTargetNamespace();
- return namespaceURI2PackageName(namespace);
- }
- return "";
- }
-
- public static String getPackageNameForBindingImpl(Port port, Map ns2pkgMap)
- {
- if (port != null && ns2pkgMap != null)
- {
- Binding binding = port.getBinding();
- QName bndQName = binding.getQName();
- String namespace = bndQName.getNamespaceURI();
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return getPackageNameForBindingImpl(port);
- }
-
- public static String getPackageNameForBindingImpl(Definition definition, Map ns2pkgMap)
- {
- if (definition != null && ns2pkgMap != null)
- {
- Service service = (Service) definition.getServices().values().iterator().next();
- Port port = (Port) service.getPorts().values().iterator().next();
- return getPackageNameForBindingImpl(port, ns2pkgMap);
- }
- return getPackageNameForBindingImpl(definition);
- }
-
- public static String getPackageNameForBindingImpl(Definition definition)
- {
- Port port = null;
- if (definition != null)
- {
- Service service = (Service)definition.getServices().values().iterator().next();
- port = (Port)service.getPorts().values().iterator().next();
- }
- return getPackageNameForBindingImpl(port);
- }
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the binding namespace as the package name
-// of the BindingImpl class.
-public static String getPackageNameForBindingImpl(Port port)
-{
- if (port != null)
- {
- Binding binding = port.getBinding();
-// PortType portType = binding.getPortType();
- QName bndQName = binding.getQName();
- String namespace = bndQName.getNamespaceURI();
- return namespaceURI2PackageName(namespace);
- }
- return "";
-}
-
-/**
-* Get the namespace for the Port Type
-*
-*/
-public static String getPortTypeNamespace(Definition definition)
-{
- String namespace = "";
- if (definition != null)
- {
- Service service = (Service) definition.getServices().values().iterator().next();
- Iterator iterator = service.getPorts().values().iterator();
- while(iterator.hasNext()){
- Port port = (Port) iterator.next();
- for (int i=0; i<port.getExtensibilityElements().size();i++) {
- if (port.getExtensibilityElements().get(i) instanceof SOAPAddress){
- PortType portType = port.getBinding().getPortType();
- QName bndQName = portType.getQName();
- namespace = bndQName.getNamespaceURI();
- }
- }
- }
- }
- return namespace;
-}
-
-// This is yet another naming algorithm based on webservices.jar
-// They always use the porttype namespace as the package name
-// of the Java class (in ejb).
-public static String getPackageNameForPortType(Definition definition)
-{
- if (definition != null)
- {
- String namespace = getPortTypeNamespace(definition);
- return namespaceURI2PackageName(namespace);
- }
- return "";
-}
-
- /**
- * checks if the input string is a valid java keyword.
- * @return boolean true/false
- */
- public static boolean isJavaKeyword(String keyword) {
- return (Arrays.binarySearch(keywords, keyword, englishCollator) >= 0);
- }
-
- /**
- * Turn a java keyword string into a non-Java keyword string. (Right now
- * this simply means appending an underscore.)
- */
- public static String makeNonJavaKeyword(String keyword){
- return keywordPrefix + keyword;
- }
-
- public static String getFullyQualifiedPortTypeName(Definition definition)
- {
- StringBuffer beanName = new StringBuffer();
- beanName.append(getPackageNameForPortType(definition));
- beanName.append(DOT);
- beanName.append(getPortTypeName(definition));
- return beanName.toString();
-
- }
-
- /**
- * getName
- * @param uri String
- * @return get the file name after the last \ and /
- */
- public static String getName(String uri) {
-
- // Get everything after last slash or backslash
- int bslash = uri.lastIndexOf("\\");
- int slash = uri.lastIndexOf("/");
- int i = bslash > slash ? bslash : slash;
- String fileName = uri.substring(i+1).replace('?', '.');
-
- return fileName;
- }
-
-
-/**
- * getWSDLName
- * @param uri String
- * @return get the file name after the last \ and /, trimmed, defaulted to
- * "default.wsdl" if there is no name, and ending with ".wsdl".
- */
- public static String getWSDLName(String uri) {
-
- // Get everything after last slash or backslash from input URI
- // with no whitespace.
- String WSDLName = getName(uri).trim();
-
- // if empty, return the default "default.wsdl"
- if ( WSDLName.equals( "" ) ) {
- WSDLName = "default.wsdl";
- }
-
- // make sure name ends with ".wsdl", lower case.
- else {
- if ( ! WSDLName.endsWith( ".wsdl" ) ) {
- if ( WSDLName.toLowerCase().endsWith( ".wsdl" ) ) {
- int lastDot = WSDLName.lastIndexOf(".");
- WSDLName = WSDLName.substring( 0, lastDot ) + ".wsdl";
- }
- else {
- WSDLName = WSDLName + ".wsdl";
- }
- }
- }
-
- return WSDLName;
- }
-
- /**
- * getPortTypeNameFromBeanName
- * @param beanname String
- * @return get the port type name based on the bean name
- */
- public static String getPortTypeNameFromBeanName(String beanName) {
- return beanName.substring(beanName.lastIndexOf('.') + 1);
- }
-
- public static String getPackageName(Service service, Map ns2pkgMap)
- {
- if (service != null)
- {
- String namespace = service.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- public static String getPackageName(Port port, Map ns2pkgMap)
- {
- if (port != null)
- return getPackageName(port.getBinding(), ns2pkgMap);
- else
- return "";
- }
-
- public static String getPackageName(Binding binding, Map ns2pkgMap)
- {
- if (binding != null)
- {
- String namespace = binding.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
- public static String getPackageName(PortType portType, Map ns2pkgMap)
- {
- if (portType != null)
- {
- String namespace = portType.getQName().getNamespaceURI();
- if (ns2pkgMap != null)
- {
- Object pkg = ns2pkgMap.get(namespace);
- if (pkg != null)
- return (String)pkg;
- }
- return namespaceURI2PackageName(namespace);
- }
- else
- return "";
- }
-
-
- /**
- * namespaceURI2PackageName
- * @param namespaceURI
- * @return package name based on namespace
- */
- public static String namespaceURI2PackageName(String namespaceURI)
- {
- /**
- * TODO: The makePackageName method from
- * org.apache.axis.wsdl.toJava.Utils in axis-1_1 is called to map namespace to package name.
- * This will be replaced with an extension point to plug in runtime emitter specific namespace to
- * package mapping algorithm
- */
- return Utils.makePackageName(namespaceURI);
-
-// StringBuffer sb = new StringBuffer(80);
-// if (namespaceURI != null && namespaceURI.length() > 0)
-// {
-// String hostname = null;
-// try
-// {
-// hostname = new URL(namespaceURI).getHost();
-// }
-// catch (MalformedURLException e)
-// {
-// int index = namespaceURI.indexOf(":");
-// if (index > -1)
-// {
-// hostname = namespaceURI.substring(index+1);
-// index = hostname.indexOf("/");
-// if (index > -1)
-// hostname = hostname.substring(0, index);
-// }
-// else
-// hostname = namespaceURI;
-// }
-//
-// // if we didn't file a hostname, bail
-// if (hostname == null) {
-// return null;
-// }
-//
-// //convert illegal java identifier
-// hostname = hostname.replace('-', '_');
-// // tokenize the hostname and reverse it
-// StringTokenizer st = new StringTokenizer(hostname, ".");
-// String[] words = new String[st.countTokens()];
-// for (int i = 0; i < words.length; ++i)
-// words[i] = st.nextToken();
-// for(int i = words.length-1; i >= 0; --i)
-// {
-// String word = words[i];
-// if (isJavaKeyword(word))
-// word = makeNonJavaKeyword(word);
-// // seperate with dot
-// if (i != words.length-1)
-// sb.append('.');
-// // convert digits to underscores
-// if (Character.isDigit(word.charAt(0)))
-// sb.append('_');
-// sb.append(word);
-// }
-// }
-// return normalizePackageName(sb.toString(), DOT.charAt(0));
- }
-
- /**
- * normalizePackageName
- * @param pkg
- * @param separator
- * @return normalize a String (package name) and repalcing
- * ':', '\\', '/' by separator (DOT).
- */
- private static String normalizePackageName(String pkg, char separator)
- {
- if (pkg == null) {
- return pkg;
- }
- for(int i=0; i<pkgSeparators.length; i++)
- pkg = pkg.replace(pkgSeparators[i], separator);
- return pkg;
- }
-
- public static String resolveDotInPortName(String name) {
- if(name.indexOf(".")<0)
- {
- return name;
- }
- StringBuffer sb = new StringBuffer();
- boolean afterDot = false;
- for(int i=0; i<name.length(); i++)
- {
- if(name.charAt(i)=='.')
- {
- afterDot = true;
- }
- else if(afterDot)
- {
- sb.append(name.substring(i,i+1).toUpperCase());
- afterDot=false;
- }
- else
- {
- sb.append(name.charAt(i));
- }
- }
- return sb.toString();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
deleted file mode 100644
index bf515af..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientCommandsFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class AxisClientCommandsFragment extends BooleanFragment
-{
- private boolean genProxy_;
-
- public AxisClientCommandsFragment()
- {
- SequenceFragment root = new SequenceFragment();
-
- root.add(new SimpleFragment(new DefaultsForHTTPBasicAuthCommand(), ""));
- //root.add(new SimpleFragment(new CopyAxisJarCommand(), ""));
- root.add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
- //root.add(new SimpleFragment(new DefaultsForClientJavaWSDLCommand(), ""));
- root.add(new SimpleFragment(new ValidateWSDLCommand(), ""));
- root.add(new SimpleFragment(new WSDL2JavaCommand(), ""));
- root.add(new SimpleFragment(new RefreshProjectCommand(), ""));
- root.add(new SimpleFragment(new Stub2BeanCommand(), ""));
- root.add(new SimpleFragment(new BuildProjectCommand(), ""));
-
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return genProxy_;
- }
- });
- setTrueFragment( root );
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
deleted file mode 100644
index 9048ea8..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisClientFragment.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class AxisClientFragment extends SequenceFragment
-{
-
- public AxisClientFragment()
- {
- //add(new SimpleFragment(new AxisClientDefaultingCommand(), ""));
- add(new SimpleFragment("AxisClientStart"));
- add(new MappingFragment());
- add(new AxisClientCommandsFragment());
- // TODO: Look into AddWSDLtoWSILCommand for the client scenario
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- // AxisClientDefaultingCommand
- registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
- new StringToIProjectTransformer());
- registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
- null);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
- "ClientProjectEAR", new StringToIProjectTransformer());
- registry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", AxisClientDefaultingCommand.class, "WsdlURL", null); // URI
- // to
- // URL
- // transformer
- // req'd??
- registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
- "TestProxySelected", null);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
- registry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
- // DefaultsForHTTPBasicAuthCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "CustomizeClientMappings", MappingFragment.class );
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "ServiceProject",
- // CreateWebProjectCommand.class);
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "EJBProjectName",
- // CreateWebProjectCommand.class);
- // CopyAxisJarCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
- // AddJarsToProjectBuildPathTask()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.class, "Project", null);
- // DefaultsForClientJavaWSDLCommand() // javaParam_, model_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
- null);
- // registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
- // DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
- // //
- // URL to URL??
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
- // to
- // URL??
- // ValidateWSDLCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- // WSDL2JavaCommand() // javaParam_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
- // to
- // URI??
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
- // BuildProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
- registry.addMapping(Stub2BeanCommand.class, "ProxyBean", ClientExtensionOutputCommand.class, "ProxyBean", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
- }
-
- public class MappingFragment extends BooleanFragment {
-
- private boolean showMappings_;
- public MappingFragment() {
-
- super();
- setTrueFragment(new SimpleFragment("AxisClientBeanMapping"));
- setCondition(new Condition() {
-
- public boolean evaluate() {
-
- return showMappings_;
- }
- });
- }
- public void setCustomizeClientMappings(boolean showMappings) {
-
- showMappings_ = showMappings;
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
deleted file mode 100644
index 2671563..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsFragment.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class AxisMappingsFragment extends BooleanFragment
-{
- private boolean showMappings_;
-
- public AxisMappingsFragment()
- {
- super();
- setTrueFragment( new SimpleFragment( "AxisMappingsWidget" ));
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return showMappings_;
- }
- } );
- }
-
- public void setShowMapping( boolean showMappings )
- {
- showMappings_ = showMappings;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
deleted file mode 100644
index adada38..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisMappingsWidget.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.TableViewerWidget;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class AxisMappingsWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- private TableViewerWidget mappings_;
-
- private byte mode_;
- private JavaWSDLParameter javaParameter_;
-
- public static final byte MODE_BEAN2XML = (byte)0;
- public static final byte MODE_XML2BEAN = (byte)1;
- public static final byte MODE_XML2PROXY = (byte)2;
- public static final byte MODE_XML2EJB = (byte)3;
- public static final byte MODE_EJB2XML = (byte)4;
-
- private final String DEFAULT_PACKAGE = "default.javapackage";
- private final String DEFAULT_NAMESPACE = "http://default.namespace";
-
- /*CONTEXT_ID PWJM0001 for the WSDL to Java Mappings Page*/
- private String INFOPOP_PWJM_PAGE = "PWJM0001"; //$NON-NLS-1$
-
- public AxisMappingsWidget( byte mode )
- {
- mode_ = mode;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- // TODO The TOOLTIP_PWJM_PAGE key doesn't seem to exist anywhere???
- //parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWJM_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJM_PAGE );
-
- Text mappingLabel = new Text( parent, SWT.READ_ONLY | SWT.WRAP );
- mappingLabel.setText( msgUtils.getMessage( "LABEL_MAPPING_PAIRS" ) );
-
- List initValues = new ArrayList();
-
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML)
- {
- String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE"),
- msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE" )};
- mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_PACKAGE, DEFAULT_NAMESPACE}, TableViewerWidget.MAP_ONE_TO_ONE); //$NON-NLS-1$
- }
- else
- {
- String[] columns = { msgUtils.getMessage("TABLE_COLUMN_LABEL_NAMESPACE"),
- msgUtils.getMessage("TABLE_COLUMN_LABEL_PACKAGE")};
- mappings_ = new TableViewerWidget( columns, initValues, new String[] {DEFAULT_NAMESPACE, DEFAULT_PACKAGE }, TableViewerWidget.MAP_MANY_TO_ONE); //$NON-NLS-1$
- }
-
- mappings_.addControls( parent, statusListener );
-
- return this;
- }
-
- public Status getStatus()
- {
- return mappings_.getStatus();
- }
-
- public void setJavaParameter( JavaWSDLParameter parameter )
- {
- javaParameter_ = parameter;
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
- if( mode_ == MODE_BEAN2XML || mode_ == MODE_EJB2XML || mode_ == MODE_XML2BEAN || mode_ == MODE_XML2PROXY)
- {
- //Set the mappings on javaParameter
- TableItem[] pairs = mappings_.getItems();
- HashMap map = new HashMap();
- for (int i=0; i<pairs.length; i++)
- {
- map.put(pairs[i].getText(0),pairs[i].getText(1));
- }
- javaParameter_.setMappings(map);
-
- //Set the namespace on the javaParameter
- String beanName = javaParameter_.getBeanName();
- if(beanName != null && !beanName.equals(""))
- {
- String packageName = beanName.substring(0, beanName.lastIndexOf('.'));
- if(map.containsKey(packageName))
- {
- String tns = (String)map.get(packageName);
- javaParameter_.setNamespace(tns);
- }
- }
-
- }
- return javaParameter_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
deleted file mode 100644
index ffe4c67..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/AxisProxyWidget.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class AxisProxyWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
-
- /*CONTEXT_ID PWJB0001 for the WSDL to Java Bindings Page*/
- private final String INFOPOP_PWJB_PAGE = "PWJB0001"; //$NON-NLS-1$
- private final String TOOLTIP_PWJB_PAGE = "TOOLTIP_PWJB_PAGE";
-
- private Text folderText_;
- /*CONTEXT_ID PWJB0003 for the Folder field of the WSDL to Java Bindings Page*/
- private final String INFOPOP_PWJB_TEXT_FOLDER = "PWJB0003"; //$NON-NLS-1$
- private final String TOOLTIP_PWJB_TEXT_FOLDER = "TOOLTIP_PWJB_TEXT_FOLDER";
-
- private Button genProxyCheckbox_;
- /*CONTEXT_ID PWJB0009 Indicates whether to generate a proxy or not. */
- private final String INFOPOP_PWJB_CHECKBOX_GENPROXY = "PWJB0009"; //$NON-NLS-1$
- private final String TOOLTIP_PWJB_CHECKBOX_GENPROXY = "TOOLTIP_PWJB_CHECKBOX_GENPROXY";
-
- private Button showMappingsCheckbox_;
- /*CONTEXT_ID PWJB0016 for the Show Mappings checkbox of the Bean Methods Page*/
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PWJB0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PWJB_PAGE ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWJB_PAGE);
-
- genProxyCheckbox_ = uiUtils.createCheckbox( parent, "CHECKBOX_GENPROXY",
- TOOLTIP_PWJB_CHECKBOX_GENPROXY,
- INFOPOP_PWJB_CHECKBOX_GENPROXY );
- genProxyCheckbox_.addListener( SWT.Selection, statusListener );
-
- genProxyCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleGenProxy();
- }
- });
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-
- folderText_ = uiUtils.createText( textGroup, "LABEL_FOLDER_NAME",
- TOOLTIP_PWJB_TEXT_FOLDER,
- INFOPOP_PWJB_TEXT_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- folderText_.addListener( SWT.Modify, statusListener );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
- "TOOLTIP_N2P_SHOW_MAPPINGS",
- INFOPOP_N2P_SHOW_MAPPINGS );
- // Since this widget affects whether the next page is shown or not we
- // need to add the statusListener.
- showMappingsCheckbox_.addListener( SWT.Selection, statusListener );
-
- return this;
- }
-
- private void handleGenProxy()
- {
- boolean enabled = genProxyCheckbox_.getSelection();
-
- folderText_.setEnabled( enabled );
- showMappingsCheckbox_.setEnabled( enabled );
- }
-
- public void setProxyFolder( String proxyFolder )
- {
- folderText_.setText( proxyFolder );
- }
-
- public String getProxyFolder()
- {
- return folderText_.getText();
- }
-
- public void setGenerateProxy( Boolean genProxy )
- {
- genProxyCheckbox_.setSelection( genProxy.booleanValue() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( genProxyCheckbox_.getSelection() );
- }
-
- public void setCustomizeClientMappings( boolean showMappings )
- {
- showMappingsCheckbox_.setSelection( showMappings );
- }
-
- public boolean getCustomizeClientMappings()
- {
- return showMappingsCheckbox_.getSelection() && genProxyCheckbox_.getSelection();
- }
-
- public void setIsClientScenario( boolean isClientScenario )
- {
- genProxyCheckbox_.setEnabled( !isClientScenario );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
deleted file mode 100644
index 05446c9..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/widgets/DefaultsForClient.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-public class DefaultsForClient extends SimpleCommand
-{
- private boolean customizeMappings_ = true;
-
- public boolean getCustomizeClientMappings()
- {
- return customizeMappings_;
- }
-
- public void setCustomizeClientMappings( boolean value )
- {
- customizeMappings_ = value;
- }
-
- public String getProxyFolder()
- {
- return "/proxyproject/myfolder";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
deleted file mode 100644
index a892c81..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/client/WebServiceClientAxisType.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- * Developers who are adding web service clients into the wizard should create
- * a class that implements this interface.
-**/
-public class WebServiceClientAxisType implements CommandWidgetBinding
-{
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // AxisClientDefaultingCommand
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "CustomizeClientMappings", AxisProxyWidget.class );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "ProxyProjectFolder", AxisProxyWidget.class, "ProxyFolder", null );
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "GenerateProxy", AxisProxyWidget.class);
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "IsClientScenario", AxisProxyWidget.class);
- dataRegistry.addMapping( AxisClientDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // AxisProxyWidget
- dataRegistry.addMapping( AxisProxyWidget.class, "CustomizeClientMappings", AxisClientFragment.MappingFragment.class );
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", AxisClientCommandsFragment.class );
- dataRegistry.addMapping( AxisProxyWidget.class, "GenerateProxy", ClientExtensionOutputCommand.class );
-
- //AxisMappingsWidget
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForHTTPBasicAuthCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", DefaultsForClientJavaWSDLCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", ValidateWSDLCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null); //OK
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Stub2BeanCommand.class, "JavaWSDLParam", null); //OK
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- String axisPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- MessageUtils axisMsgUtils = new MessageUtils( axisPluginId_ + ".plugin", this );
-
- widgetRegistry.add( "AxisClientStart",
- axisMsgUtils.getMessage("PAGE_TITLE_WS_AXIS_PROXY"),
- axisMsgUtils.getMessage("PAGE_DESC_WS_AXIS_PROXY"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisProxyWidget();
- }
- } );
-
- widgetRegistry.add( "AxisClientBeanMapping",
- axisMsgUtils.getMessage("PAGE_TITLE_WS_XML2PROXY"),
- msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2PROXY );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new AxisClientFragment();
- }
- };
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
deleted file mode 100644
index fb2a5e2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/TestWizardPage.java
+++ /dev/null
@@ -1,277 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.jst.j2ee.internal.webservices.WebServicesClientDataHelper;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientGenerator;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-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;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/*
- * Add the stuff below to the properties file to make this work.
-#
-#Test only - do not commit
-#
-wsdlURI=wsdlURI
-clientProject=clientProject
-serviceQName=serviceQName
-outputWSDLpath=outputWSDLpath
-GO=GO
-pop1=pop1
-pop2=pop2
-*/
-public class TestWizardPage extends WizardPage
-{
- private String pluginId_= "org.eclipse.jst.ws.axis.consumption.ui";
- private MessageUtils msgUtils_;
-
- private Text wsdlURIText_;
- private Text clientProjectText_;
- private Text serviceQNameText_;
- private Text outputWSDLPathText_;
- private Button goButton_;
- private Button pop1Button_;
- private Button pop2Button_;
-
- public TestWizardPage(String name)
- {
- super(name);
- setTitle("Test Page");
- setDescription("Test page description");
- }
-
- public void createControl(Composite parent)
- {
- Composite page = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- page.setLayout(gl);
- GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- page.setLayoutData(gd);
- page.setSize(500,500);
-
-
- //Composite outerGroup_ = new Composite(page,SWT.H_SCROLL | SWT.V_SCROLL);
- Composite outerGroup_ = new Composite(page,SWT.NONE);
- GridLayout gl2 = new GridLayout();
- gl2.numColumns = 2;
- gl2.marginHeight = 0;
- gl2.marginWidth = 0;
- outerGroup_.setLayout(gl2);
- //GridData gd2 = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- GridData gd2 = new GridData(GridData.FILL_BOTH);
- outerGroup_.setLayoutData(gd2);
-
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- wsdlURIText_ = uiUtils.createText(outerGroup_,"wsdlURI","wsdlURI","wsdlURI",SWT.SINGLE|SWT.BORDER);
- clientProjectText_ = uiUtils.createText(outerGroup_,"clientProject","clientProject","clientProject",SWT.SINGLE|SWT.BORDER);
- serviceQNameText_ = uiUtils.createText(outerGroup_,"serviceQName","serviceQName","",SWT.SINGLE|SWT.BORDER);
- outputWSDLPathText_ = uiUtils.createText(outerGroup_,"outputWSDLpath","outputWSDLpath","",SWT.SINGLE|SWT.BORDER);
- goButton_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"GO","GO","");
- goButton_.addSelectionListener(new SelectionListener()
- {
- public void widgetSelected(SelectionEvent e)
- {
- handleGOPushed();
- }
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handleGOPushed();
- }
- });
- pop1Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop1","pop1","");
- pop1Button_.addSelectionListener(new SelectionListener()
- {
- public void widgetSelected(SelectionEvent e)
- {
- handlePop1Pushed();
- }
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handlePop1Pushed();
- }
- });
- pop2Button_ = uiUtils.createButton(SWT.PUSH,outerGroup_,"pop2","pop2","");
- pop2Button_.addSelectionListener(new SelectionListener()
- {
- public void widgetSelected(SelectionEvent e)
- {
- handlePop2Pushed();
- }
- public void widgetDefaultSelected(SelectionEvent e)
- {
- handlePop2Pushed();
- }
- });
-
- setControl(page);
- }
-
- private void handlePop1Pushed()
- {
- wsdlURIText_.setText("http://www.xmethods.net/sd/2001/TemperatureService.wsdl");
- clientProjectText_.setText("cwp");
- serviceQNameText_.setText("http://www.xmethods.net/sd/TemperatureService.wsdl:TemperatureService");
- outputWSDLPathText_.setText("/cwp/Web Content/WEB-INF/wsdl/TemperatureService.wsdl");
- }
-
- private void handlePop2Pushed()
- {
- wsdlURIText_.setText("file:/D:/Eclipse/eclipse/runtime-workspace_t1/wp2/Web Content/Converters.wsdl");
- clientProjectText_.setText("cwp2");
- serviceQNameText_.setText("http://sample.converters:ConvertDistanceService");
- outputWSDLPathText_.setText("/cwp2/Web Content/WEB-INF/wsdl/Converters.wsdl");
- }
-
- private void handleGOPushed()
- {
- AxisClientGenerator generator = new AxisClientGenerator();
- TestWSCDataHelper dataModel = new TestWSCDataHelper();
- dataModel.populate(wsdlURIText_.getText(), serviceQNameText_.getText(), clientProjectText_.getText(), outputWSDLPathText_.getText(),false);
-
- generator.genWebServiceClientArtifacts(dataModel);
- System.out.println("Generated service interface= "+dataModel.getServiceInterfaceName());
- String[] seis = dataModel.getServiceEndpointInterfaceNames();
- System.out.println("Generated service endpoint interfaces:");
- for (int i=0;i<seis.length;i++)
- {
- System.out.println(seis[i]);
- }
- System.out.println("Touched descriptors? "+dataModel.shouldGenDescriptors());
- }
-
- private class TestWSCDataHelper implements WebServicesClientDataHelper
- {
- private String wsdlUrl_;
- private String serviceQName_;
- private String projectName_;
- private String outputWSDLFileName_;
- private String serviceInterfaceName_;
- private String[] serviceEndpointInterfaceNames_;
- private boolean shouldDeploy_;
- private boolean shouldGenDescriptors_;
-
- public void populate(String wsdlURL, String serviceQName, String projectName, String outputWSDLFileName, boolean shouldDeploy)
- {
- wsdlUrl_ = wsdlURL;
- serviceQName_ = serviceQName;
- projectName_ = projectName;
- outputWSDLFileName_ = outputWSDLFileName;
- shouldDeploy_ = shouldDeploy;
- }
- /**
- * @return the URL for the associated original WSDL file referenced by the client
- */
- public String getWSDLUrl()
- {
- return wsdlUrl_;
- }
-
- /**
- * @return the QName for the associated web service for the client
- */
- public String getServiceQName()
- {
- return serviceQName_;
- }
-
- /**
- * @return the name of the target project for the web service client
- */
- public String getProjectName()
- {
- return projectName_;
- }
-
- /**
- * @return the fileName location for the copied WSDL file into the client project
- */
- public String getOutputWSDLFileName()
- {
- return outputWSDLFileName_;
- }
-
- /**
- * @return the qualified classname of the generated Service Interface
- */
- public String getServiceInterfaceName()
- {
- return serviceInterfaceName_;
- }
-
- /**
- * @return the qualified classname of the generated Service Endpoint Interface
- */
- public String[] getServiceEndpointInterfaceNames()
- {
- return serviceEndpointInterfaceNames_;
- }
-
- /**
- * @return should generate code for deployment?
- */
- public boolean shouldDeploy()
- {
- return shouldDeploy_;
- }
-
- /**
- * @return whether the extension generated the descriptors or not
- */
- public boolean shouldGenDescriptors()
- {
- return shouldGenDescriptors_;
- }
-
- /**
- * Set the SI classname for the web service client
- */
- public void setServiceInterfaceName(String name)
- {
- serviceInterfaceName_ = name;
- }
-
- /**
- * Set the SEI classnames for the web service client
- */
- public void setServiceEndpointInterfaceNames(String[] names)
- {
- serviceEndpointInterfaceNames_ = names;
- }
-
- /**
- * Set whether descriptors were generated
- */
- public void setDidGenDescriptors(boolean b)
- {
- shouldGenDescriptors_ = b;
- }
-
- /**
- * This method will invoke any operations required to set up web services client, SI, and SEI
- */
- public void genWebServiceClientArtifacts(WebServicesClientDataHelper dataModel)
- {
- // Do nothing. This shouldn't be on the interface!
- }
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
deleted file mode 100644
index 551c8d2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wizard/test/WebServiceTestWizard.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.test;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.INewWizard;
-import org.eclipse.ui.IWorkbench;
-
-public class WebServiceTestWizard extends Wizard implements INewWizard
-{
-
- public WebServiceTestWizard()
- {
- super();
-
- TestWizardPage page = new TestWizardPage("Test page");
- }
-
-
-
- /**
- * Initializes this "New" wizard.
- * @param workbench The workbench that launched this wizard.
- * @param selection The selection context of this wizard.
- * @return This wizard.
- */
- public void init ( IWorkbench workbench, IStructuredSelection selection )
- {
- //Do nothing
- }
-
-
- public void addPages()
- {
-
- TestWizardPage page = new TestWizardPage("Test page");
- addPage(page);
- }
-
- public boolean performFinish()
- {
- //Always allow finish
- return true;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
deleted file mode 100644
index dbb43b6..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisClientConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisProxyWidget;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wizard.client.WebServiceClientAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisClientConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor proxyConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private AxisProxyWidget proxyWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisClientConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WebServiceClientAxisType() );
-
- proxyConfigWidget_ = adapter_.getWidget( "AxisClientStart" );
- proxyWidget_ = (AxisProxyWidget)proxyConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisClientBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return proxyConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == proxyConfigWidget_ && proxyWidget_.getCustomizeClientMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java b/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
deleted file mode 100644
index 33b674c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.consumption.ui/src/org/eclipse/jst/ws/internal/axis/consumption/ui/wsrt/AxisWebServiceClient.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientInputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.AxisClientOutputCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.command.DefaultsForClientJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.DefaultsForHTTPBasicAuthCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.Stub2BeanCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientCommandsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisClientFragment.MappingFragment;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class AxisWebServiceClient extends AbstractWebServiceClient
-{
-
- public AxisWebServiceClient(WebServiceClientInfo info)
- {
- super(info);
- // TODO Auto-generated constructor stub
- }
-
- public ICommandFactory assemble(Environment env, IContext ctx,
- ISelection sel, String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- registerDataMappings( env.getCommandManager().getMappingRegistry());
-
- Vector commands = new Vector();
- commands.add(new AxisClientInputCommand(this, ctx, project, module));
- commands.add(new AxisClientDefaultingCommand(module));
-// commands.add(new SimpleFragment("AxisClientStart"));
-// commands.add(new SimpleFragment("AxisClientBeanMapping"));
- commands.add(new DefaultsForHTTPBasicAuthCommand());
- commands.add(new CopyAxisJarCommand(module));
- commands.add(new AddJarsToProjectBuildPathTask(module));
- commands.add(new DefaultsForClientJavaWSDLCommand(module));
- commands.add(new ValidateWSDLCommand());
- commands.add(new WSDL2JavaCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new Stub2BeanCommand(module));
- commands.add(new AxisClientOutputCommand(this,ctx,module));
- commands.add(new BuildProjectCommand());
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- // AxisClientDefaultingCommand
- registry.addMapping(AxisClientInputCommand.class, "ClientProject", AxisClientDefaultingCommand.class, "ClientProject",
- new StringToIProjectTransformer());
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientRuntime", AxisClientDefaultingCommand.class, "ClientRuntimeID",
-// null);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "WebServicesParser", AxisClientDefaultingCommand.class);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", AxisClientDefaultingCommand.class,
-// "ClientProjectEAR", new StringToIProjectTransformer());
- registry.addMapping(AxisClientInputCommand.class, "WsdlURL", AxisClientDefaultingCommand.class); // URI
- // to
- // URL
- // transformer
- // req'd??
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "TestProxySelected", AxisClientDefaultingCommand.class,
-// "TestProxySelected", null);
- registry.addMapping(AxisClientInputCommand.class, "ClientServer", AxisClientDefaultingCommand.class);
-// registry.addMapping(ClientExtensionDefaultingCommand.class, "IsClientScenario", AxisClientDefaultingCommand.class);
- registry.addMapping(AxisClientInputCommand.class, "GenerateProxy", AxisClientDefaultingCommand.class);
- // DefaultsForHTTPBasicAuthCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForHTTPBasicAuthCommand.class); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForHTTPBasicAuthCommand.class, "WsdlServiceURL", null); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", DefaultsForHTTPBasicAuthCommand.class); //OK
- registry.addMapping(AxisClientDefaultingCommand.class, "CustomizeClientMappings", MappingFragment.class );
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "ServiceProject",
- // CreateWebProjectCommand.class);
- //registry.addMapping(AxisClientDefaultingCommand.class,
- // "EJBProjectName",
- // CreateWebProjectCommand.class);
- // CopyAxisJarCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", CopyAxisJarCommand.class, "Project", null);
- // AddJarsToProjectBuildPathTask()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", AddJarsToProjectBuildPathTask.class, "Project", null);
- // DefaultsForClientJavaWSDLCommand() // javaParam_, model_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", DefaultsForClientJavaWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", DefaultsForClientJavaWSDLCommand.class, "ProxyProject",
- null);
- // registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL",
- // DefaultsForClientJavaWSDLCommand.class,"WSDLServicePathname",null);
- // //
- // URL to URL??
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", DefaultsForClientJavaWSDLCommand.class, "WSDLServiceURL", null); // URI
- // to
- // URL??
- // ValidateWSDLCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlServiceURL", ValidateWSDLCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- // WSDL2JavaCommand() // javaParam_
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WsdlURL", WSDL2JavaCommand.class, "WsdlURI", null); // URL
- // to
- // URI??
- // RefreshProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", RefreshProjectCommand.class, "Project", null);
- // Stub2BeanCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "JavaWSDLParam", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "WebServicesParser", Stub2BeanCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", Stub2BeanCommand.class);
- // BuildProjectCommand()
- registry.addMapping(AxisClientDefaultingCommand.class, "ClientProject", BuildProjectCommand.class, "Project", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(AxisClientDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- registry.addMapping(Stub2BeanCommand.class, "ProxyBean", AxisClientOutputCommand.class, "ProxyBean", null);
- registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", AxisClientCommandsFragment.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-// registry.addMapping(AxisClientDefaultingCommand.class, "SetEndpointMethod", ClientExtensionOutputCommand.class);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
deleted file mode 100644
index 8bb59e1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-axis-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project b/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
deleted file mode 100644
index 0a3d1e9..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/.project
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.axis.creation.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.axis.consumption.core</project>
- <project>org.eclipse.jst.ws.axis.consumption.ui</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.creation.ui</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 632f6d6..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,45 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.axis.creation.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wss-axis-ui.jar
-Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.axis.creation.ui,
- org.eclipse.jst.ws.internal.axis.creation.ui.command,
- org.eclipse.jst.ws.internal.axis.creation.ui.plugin,
- org.eclipse.jst.ws.internal.axis.creation.ui.task,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean,
- org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans,
- org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl,
- org.eclipse.jst.ws.internal.axis.creation.ui.wsrt
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.wst.ws.parser,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.axis.consumption.core,
- org.eclipse.jst.ws.axis.consumption.ui,
- org.eclipse.core.runtime.compatibility,
- org.eclipse.jem.workbench,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.server.core,
- org.eclipse.wst.ws,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.wsdl4j,
- org.eclipse.jst.common.frameworks,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
-Plugin-Class: org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html b/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
deleted file mode 100644
index ee13046..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.wss-axis-ui.jar = src/
-bin.includes = wss-axis-ui.jar,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- deploy.xsl,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl b/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
deleted file mode 100644
index 3fdf164..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/deploy.xsl
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
- version="1.0"
- xmlns:xalan="http://xml.apache.org/xslt"
- xmlns:ns1="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
- <xsl:output method="xml" encoding="UTF-8"/>
-
- <xsl:param name="newClassName" select="ss"/>
-
- <xsl:template match="/ns1:deployment/ns1:service/ns1:parameter[@name='className']">
- <xsl:copy>
- <xsl:attribute name="name">className</xsl:attribute>
- <xsl:attribute name="value">
- <xsl:value-of select="$newClassName"/>
- </xsl:attribute>
- <xsl:apply-templates/>
- </xsl:copy>
- </xsl:template>
-
- <xsl:template match="@*|node()">
- <xsl:copy>
- <xsl:apply-templates select="@*|node()"/>
- </xsl:copy>
- </xsl:template>
-</xsl:stylesheet>
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
deleted file mode 100644
index 4d4dd70..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.properties
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Webservice Axis Creation UI
-PLUGIN_PROVIDER=Eclipse.org
-
-LABEL_RUNTIME_AXIS_11=Apache Axis 1.1
-DESC_RUNTIME_AXIS_11=Apache Axis 1.1
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-WS_NAME_BEANAXIS=Java bean Axis Web service
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
deleted file mode 100644
index 8d41aad..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/plugin.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Web Service Server Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceRuntime
- label="%LABEL_RUNTIME_AXIS_11"
- description="%DESC_RUNTIME_AXIS_11"
- isDefault="false"
- j2eeversion="13 14"
- id="org.eclipse.jst.ws.runtime.axis11">
- </webServiceRuntime>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.32"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.32.runtime"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.40"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.40.runtime"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.41"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.41.runtime"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceServer>
-
- <webServiceServer
- factoryId="org.eclipse.jst.server.tomcat.50"
- isDefault="false"
- runtimeTypeIds="org.eclipse.jst.server.tomcat.50.runtime"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceServer>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_BEANAXIS"
- type="org.eclipse.jst.ws.type.java"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
- server="SERVER_ID_TOMCAT50_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT50LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_WSDLAXIS"
- type="org.eclipse.jst.ws.type.wsdl"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
- server="SERVER_ID_TOMCAT50_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT50LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_BEANAXIS"
- type="org.eclipse.jst.ws.type.java"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
- server="SERVER_ID_TOMCAT41_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT41LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_WSDLAXIS"
- type="org.eclipse.jst.ws.type.wsdl"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
- server="SERVER_ID_TOMCAT41_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT41LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_BEANAXIS"
- type="org.eclipse.jst.ws.type.java"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType"
- server="SERVER_ID_TOMCAT40_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType.TOMCAT40LOCAL">
- </webServiceServerRuntimeType>
-
- <webServiceServerRuntimeType
- requireEJBModule="false"
- requireWebModule="true"
- name="%WS_NAME_WSDLAXIS"
- type="org.eclipse.jst.ws.type.wsdl"
- runtime="org.eclipse.jst.ws.runtime.axis11"
- assemblyBinding="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType"
- server="SERVER_ID_TOMCAT40_LOCAL"
- id="org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType.TOMCAT40LOCAL">
- </webServiceServerRuntimeType>
-
- </extension>
-
- <!-- Server Defaulters -->
-
- <extension point="org.eclipse.jst.ws.consumption.serverDefaulter">
- <serverDefaulter
- class="org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisServerDefaulter">
- </serverDefaulter>
- </extension>
-
- <extension point="org.eclipse.jst.ws.consumption.ui.webServiceRuntime">
- <webServiceRuntime
- id="org.eclipse.jst.ws.axis.creation.axisWebServiceRT"
- label="%LABEL_RUNTIME_AXIS_11"
- serviceTypes="org.eclipse.jst.ws.serviceType.java"
- clientTypes="org.eclipse.jst.ws.clientType.java.webOnly"
- servletLevels="23 24"
- j2eeLevels="13 14"
- servers="org.eclipse.jst.server.tomcat.40 org.eclipse.jst.server.tomcat.41 org.eclipse.jst.server.tomcat.50 org.eclipse.jst.server.tomcat.55 org.eclipse.jst.server.geronimo.10"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceRuntime">
- </webServiceRuntime>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisBeanConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisBeanConfigWidgetFactory"/>
- </extension>
-
- <extension point="org.eclipse.wst.command.env.ui.widgetRegistry">
- <widgetFactory
- id="AxisSkeletonConfig"
- insertBeforeCommandId="org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors"
- class="org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisSkeletonConfigWidgetFactory"/>
- </extension>
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
deleted file mode 100644
index 07b7fc5..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/axis/creation/ui/plugin.properties
+++ /dev/null
@@ -1,170 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-#
-# Error messages used in this plugin
-#
-MSG_ERROR_INTERAL=IWAB0512E Internal error
-MSG_ERROR_PROJECT_URL=IWAB0514E Unable to get URL for project {0}
-MSG_ERROR_READ_WSDL=IWAB0516E Error in reading WSDL file {0}
-MSG_ERROR_WSDL_NO_PORT=IWAB0518E WSDL file at {0} has no port element
-MSG_ERROR_CANNOT_NO_JAVA_BEAN=IWAB0015E A Java bean was not selected
-MSG_ERROR_NO_PROJECT=IWAB0016E A project was not selected
-MSG_ERROR_CANNOT_LOAD_JAVA_BEAN=IWAB0017E The Java bean, {0}, cannot be loaded from {1}
-MSG_ERROR_JAVA_MOF_REFLECT_FAILED=IWAB0521E Failed to analyze the Java bean: {0}.
-MSG_ERROR_READ_BEAN=IWAB0522E Error in reading methods from Java bean.
-MSG_ERROR_MOVE_RESOURCE=IWAB0523E Error moving resource
-MSG_ERROR_UPDATE_AXIS_WSDD=IWAB0524E Error updating Axis deploy.wsdd file
-MSG_ERROR_LITERAL_SUPPORT_MESSAGE=IWAB0536E Axis 1.1 support for Document/Literal and Document/Literal (Wrapped) is minimal, thus the generated code may contain errors. RPC/Encoded is the recommended style and encoding selection.
-MSG_ERROR_INITIAL_SELECTION=IWAB0018E Error getting initial selection.
-
-
-#
-#JavaToWSDLMethodCommand
-#
-TASK_LABEL_JAVA_TO_WSDL=Create deployment descriptor document model from Java bean.
-TASK_DESC_JAVA_TO_WSDL=Creating deployment descriptor document model from Java bean.
-MSG_ERROR_JAVA_TO_METHOD=IWAB0019E Error in getting method from Java bean.
-
-#
-#DefaultsForServerJavaWSDLTask
-#
-TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS=DefaultsForJavaWSDLServer
-TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS=Builds the JavaWSDLParameter for server side.
-
-#
-#UpdateWEBXMLCommand
-#
-TASK_LABEL_UPDATE_WEB_XML=UpdateWEBXMLCommand
-TASK_DESC_UPDATE_WEB_XML=Update project's web.xml file with Axis servlets
-MSG_ERROR_UPDATE_WEB_XML=IWAB0020E Error in adding servlet in web.xml.
-
-#
-#DefaultsForWSDL2SkeletonTask
-#
-
-#
-#MoveDeploymentFilesTask
-#
-TASK_LABEL_MOVE_DEPLOYMENT_FILES=MoveDeploymentFilesTask
-TASK_DESC_MOVE_DEPLOYMENT_FILES=Move deploy.wsdd and undeploy.wsdd from Java Source to Web Content/WEB-INF
-
-#
-#MoveJavaFilesTask
-#
-TASK_LABEL_MOVE_JAVA_FILES=MoveJavaFilesTask
-TASK_DESC_MOVE_JAVA_FILES=Move server side java files
-
-#
-#Skeleton2WSDLTask
-#
-TASK_LABEL_SKELETON_WSDL=DefaultsForSkeleton2WSDLTask
-TASK_DESC_SKELETON_WSDL=Creates WSDL for a Java bean skeleton.
-
-#
-#UpdateAxisWSDDFileTask
-#
-TASK_LABEL_UPDATE_AXIS_WSDD=UpdateAxisWSDDFileTask
-TASK_DESC_UPDATE_AXIS_WSDD=Update Axis deploy.wsdd with actual service implementation class name
-MSG_PLUGIN_FILE_URL=Problem locating plugin file
-
-#
-#WebServiceWSDLAxisSelectionPage
-#
-PAGE_MSG_NO_FILE_SPECIFIED=No file specified.
-PAGE_MSG_NO_METHOD_SELECTED=No methods selected.
-
-#
-#WebServiceSkeletonAxisConfigFragment
-#
-
-#
-#WebServiceSkeletonAxisConfigPage
-#
-TOOLTIP_PBSC_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBCF_TEXT_WSDL_FOLDER=The folder of the WSDL file.
-TOOLTIP_PBCF_TEXT_WSDL_FILE=The name of the WSDL file.
-LABEL_URI=Web service URI:
-LABEL_OUTPUT_FOLDER_NAME=WSDL Folder:
-LABEL_OUTPUT_FILE_NAME=WSDL File:
-
-
-#
-#WSWSDLAxisType
-#
-WS_NAME_WSDLAXIS=Skeleton Java bean Axis Web service
-WS_DESC_WSDLAXIS=Skeleton Java bean Axis Web service
-
-#
-#WSBeanAxisType
-#
-
-#
-#WebServiceAxisBeanClassFragment
-#
-
-#
-#WebServiceAxisBeanClassPage
-#
-PAGE_TITLE_WSBEAN_CLASS=Web Service Java Bean Selection
-PAGE_DESC_WSBEAN_CLASS=Select a Java bean
-LABEL_EXPLORE_MAPPINGS_BEAN2XML=Define custom mapping for package to namespace.
-TOOLTIP_P2N_SHOW_MAPPINGS=Define package to namespace mapping for customization.
-
-#
-#WebServiceAxisBeanConfigFragment
-#
-
-#
-#WebServiceAxisBeanConfigPage
-#
-TOOLTIP_PBCF_PAGE=
-TOOLTIP_PBCF_TEXT_URI=The SOAP body namespace and unique identifier of the Web service.
-TOOLTIP_PBME_TREE_METHODS=Java bean methods to include.
-PAGE_TITLE_WSBEAN_CONFIG=Web Service Java Bean Identity
-PAGE_DESC_WSBEAN_CONFIG=Configure the Java bean as a Web service.
-LABEL_STYLE_USE=Style and Use
-STYLE_RPC_LITERAL=Document/ Literal
-STYLE_DOC_LITERAL=Document/ Literal (Wrapped)
-STYLE_RPC_ENCODED=RPC/ Encoded
-
-#
-#WSDLConsumptionTaskFactory
-#
-
-#
-#CopyAxisServerConfigTask
-#
-
-TASK_LABEL_COPY_SERVER_CONFIG_FILES=Copy server-config.wsdd from the server location to the Web Project
-TASK_DESC_COPY_SERVER_CONFIG_FILES=Coping server-config.wsdd from the server location to the Web Project
-
-
-#
-#LiteralSupportMessageTask
-#
-TASK_LABEL_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-TASK_DESC_LITERAL_SUPPORT_MESSAGE=Axis support for Literal encoding message task
-
-#
-#BUAxisInputCommand and BUAxisOutputCommand
-#
-
-TASK_LABEL_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_DESC_BU_AXIS_INPUT=Bottom up Axis input commmand
-TASK_LABEL_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-TASK_DESC_BU_AXIS_OUTPUT=Bottom up Axis output commmand
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
deleted file mode 100644
index a65876c..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisOutputCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebServiceInfo;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class AxisOutputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_BU_AXIS_OUTPUT";
- private static String DESCRIPTION = "TASK_DESC_BU_AXIS_OUTPUT";
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
-
- private String wsdlURI_;
-
- private boolean isWebProjectStartupRequested_ = false;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public AxisOutputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisOutputCommand(AxisWebService ws) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- }
-
- public Status execute(Environment env){
-
- Status status = new SimpleStatus("");
- ws_.getWebServiceInfo().setWsdlURL(wsdlURI_);
- AxisWebServiceInfo axisWSInfo = new AxisWebServiceInfo();
- axisWSInfo.setJavaWSDLParameter(javaWSDLParam_);
- ws_.setAxisWebServiceInfo(axisWSInfo);
-
- return status;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setJavaWSDLParam (JavaWSDLParameter javaWSDLParam_) {
- this.javaWSDLParam_ = javaWSDLParam_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
deleted file mode 100644
index de3a515..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisRunInputCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wsrt.AxisWebService;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class AxisRunInputCommand extends SimpleCommand{
-
- private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
- private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-
- private AxisWebService ws_;
- private JavaWSDLParameter javaWSDLParam_;
- private String serverProject_;
- private String serverModule_;
-
- private MessageUtils msgUtils_;
-
- public AxisRunInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public AxisRunInputCommand(AxisWebService ws, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- serverProject_ = project;
- serverModule_ = module;
- }
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- javaWSDLParam_ = ws_.getAxisWebServiceInfo().getJavaWSDLParameter();
-
- return new SimpleStatus("");
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
deleted file mode 100644
index b378b6b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/AxisServerDefaulter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-
-
-
-public class AxisServerDefaulter implements IServerDefaulter
-{
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter#recommendDefaultServer(org.eclipse.core.resources.IProject)
- */
- public ServerInfo recommendDefaultServer(IProject project)
- {
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
deleted file mode 100644
index 316fa71..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/BUAxisInputCommand.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class BUAxisInputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_BU_AXIS_INPUT";
- private static String DESCRIPTION = "TASK_DESC_BU_AXIS_INPUT";
-
- private IWebService ws_;
- private String serverProject_;
- private String serverModule_;
- private String javaBeanName_;
-
- private String serviceServerTypeID_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public BUAxisInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public BUAxisInputCommand(IWebService ws, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- serverProject_ = project;
- serverModule_ = module; }
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- String serverInstanceId = ws_.getWebServiceInfo().getServerInstanceId();
- String serverFactoryId = ws_.getWebServiceInfo().getServerFactoryId();
- javaBeanName_ = ws_.getWebServiceInfo().getImplURL();
-
- IServer serviceExistingServer=null;
-
- if (serverInstanceId != null) { // server exists
- serviceExistingServer = ServerCore.findServer(serverInstanceId);
- if (serviceExistingServer != null)
- {
- serviceServerTypeID_ = serviceExistingServer.getServerType().getId();
- }
- }
- else
- {
- serviceServerTypeID_ = serverFactoryId;
- }
-
- return new SimpleStatus("");
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServiceServerTypeID()
- {
- return serviceServerTypeID_;
- }
-
- public String getServerModule() {
- return serverModule_;
- }
-
- public String getJavaBeanName() {
- return javaBeanName_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
deleted file mode 100644
index 1007507..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/ComputeAxisSkeletonBeanCommand.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ComputeAxisSkeletonBeanCommand extends SimpleCommand
-{
- private List classNames;
- //private String wsdlURI;
- //private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParameter;
-
- public ComputeAxisSkeletonBeanCommand()
- {
- }
-
- public Status execute(Environment environment)
- {
- classNames = new Vector();
- if (javaWSDLParameter != null)
- {
- String beanName = javaWSDLParameter.getBeanName();
- if (beanName != null)
- classNames.add(beanName);
- }
- return new SimpleStatus("");
- }
-
- public List getClassNames()
- {
- return classNames;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- //this.webServicesParser = webServicesParser;
- }
-
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- //this.wsdlURI = wsdlURI;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParameter)
- {
- this.javaWSDLParameter = javaWSDLParameter;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
deleted file mode 100644
index 7aa3ad2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/JavaToWSDLMethodCommand.java
+++ /dev/null
@@ -1,229 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class JavaToWSDLMethodCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_JAVA_TO_WSDL";
- private static String DESCRIPTION = "TASK_DESC_JAVA_TO_WSDL";
- private static String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private static String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
-
- private Hashtable fMethodNames;
- private String fClassName;
- private String fBeanName;
- private String fbeanBaseName;
- private IProject fProject;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
- /**
- * Default CTOR
- */
- public JavaToWSDLMethodCommand(
- JavaWSDLParameter javaParameter,
- IProject serviceProject) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- javaWSDLParam_ = javaParameter;
- serviceProject_ = serviceProject;
-
- }
-
- /**
- * JavaToToWSDLMethod execute
- */
- public Status execute(Environment environment) {
- fbeanBaseName = javaWSDLParam_.getBeanName();
- environment.getLog().log(Log.INFO, 5070, this, "execute", "beanBaseName = "+fbeanBaseName);
- Status status;
- try {
- //Get the qualified bean name; my.package.MyClass
- fMethodNames = new Hashtable();
- Hashtable oldMethodsNames = javaWSDLParam_.getMethods();
- String qName = fbeanBaseName;
-
- if (qName.toLowerCase().endsWith(JAVA_EXTENSION)
- || qName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qName = qName.substring(0, qName.lastIndexOf('.'));
- }
-
- JavaEMFNature jMOF =
- (JavaEMFNature) JavaEMFNature.createRuntime(
- serviceProject_);
- JavaClass javaClass =
- (JavaClass) JavaClassImpl.reflect(qName, jMOF.getResourceSet());
- if (!javaClass.isExistingType()) {
- environment.getLog().log(Log.ERROR, 5022, this, "execute", msgUtils_.getMessage(
- "MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
- new String[] { qName }));
-
- status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
- msgUtils_.getMessage(
- "MSG_ERROR_JAVA_MOF_REFLECT_FAILED",
- new String[] { qName }),
- Status.ERROR);
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
- // Get the qualified name
- fClassName = javaClass.getQualifiedName();
- fBeanName = fClassName;
- String beanName;
- if (fClassName.lastIndexOf('.') != -1) {
- beanName =
- fClassName.substring(
- fClassName.lastIndexOf('.') + 1,
- fClassName.length());
- } else
- beanName = fClassName;
-
- // Walk the java class and get the method names
- gatherMethods(javaClass, beanName, oldMethodsNames);
- /*
- Iterator m = javaClass.getPublicMethodsExtended().iterator();
- while (m.hasNext()) {
- Method method = (Method) m.next();
- if ( ! method.isConstructor()){
- if (!beanName.equals(method.getName())
- && !(isDuplicateMethodName(method
- .getMethodElementSignature()))
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("javax.ejb.EJBObject[]")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object")) //$NON-NLS-1$
- && !(method
- .getContainingJavaClass()
- .getJavaName()
- .equalsIgnoreCase("java.lang.Object[]"))) { //$NON-NLS-1$
- // add the method name to our list of method names
- String methodName =method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- }
- */
- javaWSDLParam_.setMethods(fMethodNames);
-
- return new SimpleStatus( "" );
-
- } catch (Exception e) {
- environment.getLog().log(Log.ERROR, 5023, this, "execute", msgUtils_.getMessage("MSG_ERROR_READ_BEAN"));
-
- status = new SimpleStatus("JavaToWSDLMethodCommand", //$NON-NLS-1$
- msgUtils_.getMessage(
- "MSG_ERROR_JAVA_TO_METHOD"),
- Status.ERROR, e);
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private void gatherMethods(JavaClass javaClass, String beanName, Hashtable oldMethodsNames)
- {
- String javaName = javaClass.getJavaName();
- if (!javaClass.isInterface()
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject[]")
- && !javaName.equalsIgnoreCase("javax.ejb.EJBObject")
- && !javaName.equalsIgnoreCase("java.lang.Object[]")
- && !javaName.equalsIgnoreCase("java.lang.Object"))
- {
- List publicMethods = javaClass.getPublicMethods();
- for (Iterator it = publicMethods.iterator(); it.hasNext();)
- {
- Method method = (Method)it.next();
- if (!method.isConstructor()
- && !beanName.equals(method.getName())
- && !(isDuplicateMethodName(method.getMethodElementSignature())))
- {
- // add the method name to our list of method names
- String methodName = method.getMethodElementSignature();
- Boolean isSelected = new Boolean(true);
- if (oldMethodsNames != null && oldMethodsNames.containsKey(methodName))
- isSelected = (Boolean)oldMethodsNames.get(methodName);
- fMethodNames.put(methodName, isSelected);
- }
- }
- gatherMethods(javaClass.getSupertype(), beanName, oldMethodsNames);
- }
- }
-
- //Returns true if the provided method name already exists in the
- //fMethodNames vector. This method is used to detect overloaded
- //methods in Beans and EJBs, which are currently unsupported.
- private boolean isDuplicateMethodName(String methodName) {
- return (fMethodNames == null ? false: fMethodNames.containsKey(methodName));
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
deleted file mode 100644
index 64b8975..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/TDAxisInputCommand.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-
-public class TDAxisInputCommand extends SimpleCommand {
-
- private static String LABEL = "TASK_LABEL_TD_AXIS_INPUT";
- private static String DESCRIPTION = "TASK_DESC_TD_AXIS_INPUT";
-
- private IWebService ws_;
- private String serverProject_;
- private String serverModule_;
-
- private String serverServer_;
- private String wsdlURI_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public TDAxisInputCommand() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
- public TDAxisInputCommand(IWebService ws, String project, String module) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- ws_ = ws;
- serverProject_ = project;
- serverModule_ = module;
- }
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- serverServer_ = ws_.getWebServiceInfo().getServerInstanceId();
- wsdlURI_ = ws_.getWebServiceInfo().getWsdlURL();
-
- return new SimpleStatus("");
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serverProject_;
- }
-
- public String getServerServer()
- {
- return serverServer_;
- }
-
- public String getWsdlURI() {
- return wsdlURI_;
- }
-
- public String getServerModule() {
- return serverModule_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
deleted file mode 100644
index 8ecc02f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/UpdateWEBXMLCommand.java
+++ /dev/null
@@ -1,200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.command;
-
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class UpdateWEBXMLCommand extends SimpleCommand {
-
- private String LABEL = "TASK_LABEL_UPDATE_WEB_XML";
- private String DESCRIPTION = "TASK_DESC_UPDATE_WEB_XML";
-
- private MessageUtils msgUtils_;
- private IProject serverProject;
- private String moduleName_;
-
- public UpdateWEBXMLCommand( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
-
- moduleName_ = moduleName;
- }
-
- public Status execute(Environment environment) {
- if (serverProject != null) {
- Status status = null;
- status = addServlet(serverProject, moduleName_, getAxisServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- addServlet(serverProject, moduleName_, getAdmintServletDescriptor());
- if (status.getSeverity() == Status.ERROR) {
- environment.getStatusHandler().reportError(status);
- return status;
- }
- }
- return new SimpleStatus( "" );
- }
-
- private ServletDescriptor getAxisServletDescriptor() {
-
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AxisServlet"; //$NON-NLS-1$
- sd._displayName = "Apache-Axis Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AxisServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AxisServlet", //$NON-NLS-1$
- "*.jws", //$NON-NLS-1$
- "/services/*" }; //$NON-NLS-1$
- return sd;
- }
-
- private ServletDescriptor getAdmintServletDescriptor() {
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "AdminServlet"; //$NON-NLS-1$
- sd._displayName = "Axis Admin Servlet"; //$NON-NLS-1$
- sd._className = "org.apache.axis.transport.http.AdminServlet"; //$NON-NLS-1$
- sd._mappings = new String[] { "/servlet/AdminServlet" }; //$NON-NLS-1$
- sd._loadOnStartup = new Integer(100);
- return sd;
- }
-
- private ServletDescriptor getSoapMonitorServletDescriptor() {
- ServletDescriptor sd = new ServletDescriptor();
- sd._name = "SOAPMonitorService"; //$NON-NLS-1$
- sd._displayName = "SOAPMonitorService"; //$NON-NLS-1$
- sd._className = "org.apache.axis.monitor.SOAPMonitorService"; //$NON-NLS-1$
- sd._mappings = new String[] { "/SOAPMonitor" }; //$NON-NLS-1$
- sd._loadOnStartup = new Integer(100);
- Map params = new HashMap();
- params.put("SOAPMonitorPort", //$NON-NLS-1$
- "5001"); //$NON-NLS-1$
- sd._params = params;
- return sd;
- }
-
- public Status addServlet(
- IProject webProject,
- String moduleName,
- ServletDescriptor servletDescriptor) {
-
- Object accessorKey = new Object();
- WebArtifactEdit webEdit = null;
- try {
- //
- WebApp webapp = null;
- IVirtualComponent vc = ComponentCore.createComponent(webProject, moduleName);
- webEdit = WebArtifactEdit.getWebArtifactEditForWrite(vc);
- if (webEdit != null)
- {
- webapp = (WebApp) webEdit.getDeploymentDescriptorRoot();
-
- boolean foundServlet = false;
-
- List theServlets = webapp.getServlets();
- for (int i = 0; i < theServlets.size(); i++) {
- Servlet aServlet = (Servlet) theServlets.get(i);
- if (aServlet.getServletName().equals(servletDescriptor._name)) {
- foundServlet = true;
- }
- }
-
- if (foundServlet) {
- return new SimpleStatus( "" );
- }
-
- WebapplicationFactory factory = WebapplicationFactory.eINSTANCE;
-
- Servlet servlet = factory.createServlet();
- ServletType servletType = factory.createServletType();
- servlet.setWebType(servletType);
- servlet.setServletName(servletDescriptor._name);
- servletType.setClassName(servletDescriptor._className);
- if(servletDescriptor._displayName != null){
- servlet.setDisplayName(servletDescriptor._displayName);
- }
- if(servletDescriptor._loadOnStartup != null){
- servlet.setLoadOnStartup(servletDescriptor._loadOnStartup);
- }
- if(servletDescriptor._params != null){
- Properties properties = servlet.getParamsAsProperties();
- properties.putAll(servletDescriptor._params);
- }
- webapp.getServlets().add(servlet);
-
- if(servletDescriptor._mappings != null){
- for(int i=0; i<servletDescriptor._mappings.length; i++){
- ServletMapping servletMapping = factory.createServletMapping();
- servletMapping.setServlet(servlet);
- servletMapping.setUrlPattern(servletDescriptor._mappings[i]);
- webapp.getServletMappings().add(servletMapping);
- }
- }
-
- webEdit.save(new NullProgressMonitor());
- }
-
- return new SimpleStatus( "" );
- } catch (Exception e) {
-
- return new SimpleStatus(
- "UpdateWEBXMLCommand.addServlet", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_UPDATE_WEB_XML"),
- Status.ERROR, e);
- }
- finally{
- if (webEdit != null)
- webEdit.dispose();
- }
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public class ServletDescriptor {
- String _name;
- String _className;
- String _displayName;
- Map _params;
- String[] _mappings;
- Integer _loadOnStartup;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
deleted file mode 100644
index 3608367..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/plugin/WebServiceAxisCreationUIPlugin.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.plugin;
-
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceAxisCreationUIPlugin extends AbstractUIPlugin
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2003."; //$NON-NLS-1$
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.axis.creation.ui"; //$NON-NLS-1$
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceAxisCreationUIPlugin instance_;
- private Log log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.ui.plugin.WebServicePlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceAxisCreationUIPlugin ( IPluginDescriptor descriptor )
- {
- super(descriptor);
- if (instance_ == null)
- {
- instance_ = this;
- }
- log_ = new EclipseLog();
-
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceWasCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.was.v5.tp.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceAxisCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Called once by the platform when this plugin is first loaded.
- * @throws CoreException If this plugin fails to start.
- */
- public void startup () throws CoreException
- {
- log_.log(Log.INFO, 5068, this, "startup", "Starting plugin org.eclipse.jst.ws.axis.creation.ui");
- super.startup();
- setPreferences();
- }
-
- /**
- * Called once by the platform when this plugin is unloaded.
- * @throws CoreException If this plugin fails to shutdown.
- */
- public void shutdown () throws CoreException
- {
- log_.log(Log.INFO, 5069, this, "shutdown", "Shutting plugin org.eclipse.jst.ws.axis.creation.ui");
- super.shutdown();
- }
-
-
- /**
- * Sets the general preferences to the values in the preferences store.
- **/
- public void setPreferences()
- {
- // setDialogsPreferences();
- }
-
- /**
- * @see AbstractUIPlugin#initializeDefaultPreferences
- */
- protected void initializeDefaultPreferences(IPreferenceStore preferenceStore) {
-
- // Set the defaults Preference
-// ActionDialogsPreferenceHelper.initializeDefaults(preferenceStore);
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
- public static String getMessage ( String key )
- {
- return instance_.getDescriptor().getResourceString(key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See java.text.MessageFormat for
- * further details on substitution.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args The substitution values for the message
- * as required by the message in plugin.properties and
- * by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL installURL = instance_.getDescriptor().getInstallURL();
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index 8676c3f..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/BUCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class BUCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask
-{
- public BUCheckAxisDeploymentDescriptors(String moduleName)
- {
- super(moduleName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
deleted file mode 100644
index c3ee802..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/DefaultsForServerJavaWSDLCommand.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import javax.wsdl.Definition;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.ClasspathUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Utils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class DefaultsForServerJavaWSDLCommand extends SimpleCommand {
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private MessageUtils conMsgUtils_;
-
- // rm private Model model_;
- private JavaWSDLParameter javaWSDLParam_ = null;
- private IProject serviceProject_;
- private String javaBeanName_; // this needs to be set by the extension with initial selection
- private String WSDLServiceURL_;
- private String WSDLServicePathname_;
- private WebServicesParser WSParser_;
- // rm private WebServiceElement wse_; // temporary
- private String moduleName_;
-
- private String LABEL = "TASK_LABEL_SERVER_JAVA_WSDL_DEFAULTS";
- private String DESCRIPTION = "TASK_DESC_SERVER_JAVA_WSDL_DEFAULTS";
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- public final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- public final byte MODE_BEAN = (byte) 0;
- public final String SERVICE_NAME_EXT = "Service"; //$NON-NLS-1$
-
- public DefaultsForServerJavaWSDLCommand( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- conMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.ui.plugin", this );
- moduleName_ = moduleName;
-
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
-
- public DefaultsForServerJavaWSDLCommand(
- JavaWSDLParameter javaWSDLParam,
- Model model) {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
-
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- //rm setModel(model);
- setJavaWSDLParam(javaWSDLParam);
-
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public Status execute( Environment env ) {
-
- Status status;
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- if (javaBeanName_ == null) { // either set by extension point or bean class page
- javaBeanName_ = javaWSDLParam_.getBeanName();
- if (javaBeanName_ == null) {
- //rm javaBeanName_ = isdElement.getJavaBeanName();
- javaWSDLParam_.setBeanName(javaBeanName_);
- }
- }
- // rm WSParser_ = (WebServicesParser) wse_.getWSParser();
-
- javaWSDLParam_.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam_.setSkeletonDeploy(false);
-
- javaWSDLParam_.setBeanName(javaBeanName_);
- String classpath = ClasspathUtils.getInstance().getClasspathString(serviceProject_, moduleName_);
- javaWSDLParam_.setClasspath(classpath);
-
- String simpleBeanName = javaBeanName_;
- String beanPackageName = null;
- if (javaBeanName_ != null) {
- int index = javaBeanName_.lastIndexOf('.');
- if (index != -1) {
- simpleBeanName = javaBeanName_.substring(index + 1);
- beanPackageName = javaBeanName_.substring(0, index);
- }
- }
- String namespace = WSDLUtils.makeNamespace(javaWSDLParam_.getBeanName());
- javaWSDLParam_.setNamespace(namespace);
-
- javaWSDLParam_.setPortTypeName(simpleBeanName);
- javaWSDLParam_.setServiceName(simpleBeanName + SERVICE_NAME_EXT);
-
- IPath moduleServerRoot = null;
-
- IPath modulePath = serviceProject_.getFullPath();
- IPath webinfPath = serviceProject_.getFullPath();
- try {
- //if ( ResourceUtils.isWebProject(serviceProject_)) {
- if (J2EEUtils.isWebComponent(serviceProject_, moduleName_)){
- moduleServerRoot = ResourceUtils.getJavaSourceLocation(serviceProject_, moduleName_);
-
- // should use ModuleCore.getSourceContainers();
-// IContainer container = ResourceUtils.getWebModuleServerRoot(serviceProject_);
-// if (container!=null) {
-// moduleServerRoot = container.getFullPath();
-// }
-
- modulePath = J2EEUtils.getWebContentPath(serviceProject_, moduleName_);
- webinfPath = J2EEUtils.getWebInfPath( serviceProject_, moduleName_ );
-
- }
-
- } catch (Exception e) {
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_DEFAULT_BEAN"), Status.ERROR, e );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IPath wsdlPath =
- modulePath.append(WSDL_FOLDER).append(simpleBeanName).addFileExtension(WSDL_EXT);
-
- try{
- IFolder folder = ResourceUtils.getWorkspaceRoot().getFolder(modulePath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
-
- }
- catch(CoreException e){
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", conMsgUtils_.getMessage("MSG_ERROR_WRITE_WSDL"), Status.ERROR, e );
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- String wsdlLocation = ResourceUtils.getWorkspaceRoot().getFile(wsdlPath).getLocation().toString();
-
- javaWSDLParam_.setOutputWsdlLocation(wsdlLocation);
- javaWSDLParam_.setInputWsdlLocation(wsdlLocation);
- WSDLServicePathname_ = wsdlPath.toString();
-
- if (wsdlPath != null) {
- String wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
- WSDLServiceURL_ = wsdlURL;
- // set parser
- if (wsdlURL == null || wsdlURL.length() <= 0) {
- IResource res =
- ResourceUtils.findResource(WSDLServicePathname_);
- if (res != null)
- wsdlURL = (new Utils()).toFileSystemURI(res);
- }
- Definition definition = null;
- if (wsdlURL != null && wsdlURL.length() > 0) {
- if (WSParser_ == null) {
- WSParser_ = new WebServicesParserExt();
- }
- definition = WSParser_.getWSDLDefinition(wsdlURL);
- }
- }
-
- javaWSDLParam_.setStyle(JavaWSDLParameter.STYLE_RPC);
- javaWSDLParam_.setUse(JavaWSDLParameter.USE_ENCODED);
-
- String projectURL = ServerUtils.getEncodedWebComponentURL(serviceProject_, moduleName_);
- if (projectURL == null) {
- status = new SimpleStatus( "DefaultsForServerJavaWSDLTask", msgUtils_.getMessage("MSG_ERROR_PROJECT_URL"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-// else {
-// javaWSDLParam_.setUrlLocation("http://localhost:8080/"+moduleName_);
-// }
-
- String serviceURL = projectURL + SERVICE_EXT + simpleBeanName;
- javaWSDLParam_.setUrlLocation(serviceURL);
-
- javaWSDLParam_.setMetaInfOnly(true);
- // String javaOutput = PlatformUtils.getPlatformURL(moduleServerRoot);
- // String output = PlatformUtils.getPlatformURL(modulePath);
-
- String javaOutput = ResourceUtils.findResource(moduleServerRoot).getLocation().toString();
-// String javaOutput = ResourceUtils.getWorkspaceRoot().getFolder(moduleServerRoot).getLocation().toString();
-
- String serviceName = javaWSDLParam_.getServiceName();
- IPath outputPath = ResourceUtils.findResource(webinfPath).getLocation();
- String output = serviceProject_.getFullPath().toString();
- if (outputPath!=null)
- output = outputPath.append(serviceName).toString();
-
- javaWSDLParam_.setJavaOutput(javaOutput);
- javaWSDLParam_.setOutput(output);
-
- return new SimpleStatus( "" );
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam_ = javaWSDLParam;
- }
-
- // rm
- /*
- public void setModel(Model model) {
- this.model_ = model;
- }
- */
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
- }
-
- public String getWSDLServiceURL() {
- return WSDLServiceURL_;
- }
-
- public String getWSDLServicePathname() {
- return WSDLServicePathname_;
- }
-
- public void setParser(WebServicesParser wsParser) {
- this.WSParser_ = wsParser;
- }
-
- public WebServicesParser getParser() {
- return WSParser_;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- setJavaBeanName((String)object);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
deleted file mode 100644
index 6e44bb2..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/LiteralSupportMessageTask.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-
-
-
-public class LiteralSupportMessageTask extends SimpleCommand {
-
- private final String LABEL = "TASK_LABEL_LITERAL_SUPPORT_MESSAGE";
- private final String DESCRIPTION =
- "TASK_DESC_LITERAL_SUPPORT_MESSAGE";
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
-
- private JavaWSDLParameter javaWSDLParam_;
-
- public LiteralSupportMessageTask() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId+".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- }
-
- public LiteralSupportMessageTask(JavaWSDLParameter javaWSDLParam) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId+".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- javaWSDLParam_ = javaWSDLParam;
-
- }
-
-
- /**
- * Execute LiteralSupportMessageTask
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- String use = javaWSDLParam_.getUse();
- if(use != null &&
- use.equals(JavaWSDLParameter.USE_LITERAL)){
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_LITERAL_SUPPORT_MESSAGE"), Status.WARNING);
- try
- {
- env.getStatusHandler().report(status);
- }
- catch(StatusException se)
- {
- status = new SimpleStatus("","User aborted",Status.ERROR);
- }
- }
-
- return status;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
deleted file mode 100644
index 2fe3eaa..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveDeploymentFilesTask.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class MoveDeploymentFilesTask extends SimpleCommand {
-
- private final String LABEL = "TASK_LABEL_MOVE_DEPLOYMENT_FILES";
- private final String DESCRIPTION = "TASK_DESC_MOVE_DEPLOYMENT_FILES";
- private final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
- private final String META_INF = "META-INF"; //$NON-NLS-1$
-
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serverProject;
- private String moduleName_;
-
- private JavaWSDLParameter javaWSDLParam_;
-
- public MoveDeploymentFilesTask( String moduleName )
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject project = serverProject;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
-
- if (projectURL == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] { project.toString()}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
-
- try {
-// if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// return status;
-// } catch (Exception ex) {
-// status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
- String[] deployFiles = javaWSDLParam_.getDeploymentFiles();
- String javaOutput = javaWSDLParam_.getJavaOutput();
-
- if (deployFiles == null || javaOutput == null) {
- return status;
- }
-
-
- IPath webinfPath = J2EEUtils.getWebInfPath(project, moduleName_ );
-
- for (int i = 0; i < deployFiles.length; i++) {
- File f = new File(deployFiles[i]);
- String resourceToMove = f.getName();
- String targetFileName = ResourceUtils.getWorkspaceRoot().getFile(webinfPath.addTrailingSeparator().append(resourceToMove)).getLocation().toString();
- FileUtil.createTargetFile(deployFiles[i], targetFileName, true);
- File deploymentFile = new File(deployFiles[i]);
- deploymentFile.delete();
- deployFiles[i] = targetFileName;
- }
-
- } catch (Exception e) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[] { e.getLocalizedMessage()}), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public void setServerProject(IProject serverProject)
- {
- this.serverProject = serverProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
deleted file mode 100644
index d513f13..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/MoveJavaFilesTask.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class MoveJavaFilesTask extends SimpleCommand {
-
- private final String LABEL = "TASK_LABEL_MOVE_JAVA_FILES";
- private final String DESCRIPTION = "TASK_DESC_MOVE_JAVA_FILES";
-
- private JavaWSDLParameter javaWSDLParam_;
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private IProject serviceProject_;
-
- private String moduleName_;
- // rm private Model model_;
-
- public MoveJavaFilesTask(String moduleName) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- this.moduleName_ = moduleName;
- }
-
- public MoveJavaFilesTask() {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- }
-
- public MoveJavaFilesTask(JavaWSDLParameter javaWSDLParam) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- javaWSDLParam_ = javaWSDLParam;
-
- }
-
- /**
- * Execute DefaultsForJavaToWSDLTask
- */
- public Status execute(Environment env) {
-
- // rm
- /*
- //Begin Setters
- WebServiceElement wse =
- WebServiceElement.getWebServiceElement(model_);
- setServiceProject(wse.getServiceProject());
- //End Setters
- */
- Status status = new SimpleStatus("");
-
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // rm
- /*
- if (model_ == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
- return status;
- }
- */
-
- IProject project = serviceProject_;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
- if (projectURL == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
-
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
-
- String[] javaFiles = javaWSDLParam_.getJavaFiles();
- String javaoutput = javaWSDLParam_.getJavaOutput(); // <webproject>/JavaSource
- String output = javaWSDLParam_.getOutput(); // <webproject>/WebContent/META_INF
-
- if(javaFiles == null || javaoutput == null && output == null ){
- return status;
- }
- try {
- for (int i = 0; i < javaFiles.length; i++) {
- String resourceToMove = javaFiles[i].substring(output.length());
- String targetFileName = javaoutput + resourceToMove;
- File resultFile = new File(targetFileName);
- // copy java files that without overwtriting existing ones
-// if (!resultFile.exists()) {
-// FileUtil.createTargetFile(
-// javaFiles[i],
-// javaoutput + resourceToMove);
-// }
- // delete java files from the output directory
- File source = new File(javaFiles[i]);
- source.delete();
- }
- } catch (Exception e) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MOVE_RESOURCE",new String[]{e.getLocalizedMessage()}), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
- // rm
- /*
- public void setModel(Model model)
- {
- model_ = model;
- }
- */
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
deleted file mode 100644
index 83a4a32..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/Skeleton2WSDLCommand.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.WSDLUtils;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CopyWSDLCommand;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class Skeleton2WSDLCommand extends SimpleCommand
-{
- private static final String LABEL = "TASK_LABEL_SKELETON_WSDL";
- private static final String DESCRIPTION = "TASK_DESC_SKELETON_WSDL";
- private static final String IMPL = "Impl"; //$NON-NLS-1$
- private static final String SERVICE_EXT = "/services/"; //$NON-NLS-1$
- private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$
- private static final String DOT = "."; //$NON-NLS-1$
- private static final String SLASH = "/"; //$NON-NLS-1$
- private static final String PROTOCOL_SUFFIX = "://"; //$NON-NLS-1$
- private final String WSDL_FOLDER = "wsdl"; //$NON-NLS-1$
- private WebServicesParser webServicesParser;
- private JavaWSDLParameter javaWSDLParam;
- private IProject serverProject;
- private HashMap visitedLinks;
- private MessageUtils msgUtils_;
- private String moduleName_;
-
- public Skeleton2WSDLCommand( String moduleName ) {
- super(WebServiceAxisCreationUIPlugin.getMessage(LABEL), WebServiceAxisCreationUIPlugin.getMessage(DESCRIPTION));
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.creation.ui.plugin", this );
- setName( LABEL );
- setDescription( DESCRIPTION );
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute Skeleton2WSDLCommand
- */
- public Status execute(Environment env)
- {
- if (!(env instanceof EclipseEnvironment))
- {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_NOT_IN_ECLIPSE_ENVIRONMENT", new String[] {"Skeleton2WSDLCommand"}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
- if (javaWSDLParam == null)
- {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // Read WSDL
- Definition definition = null;
- String wsdlURL = javaWSDLParam.getInputWsdlLocation();
- try
- {
- URL url = new URL(wsdlURL);
- definition = webServicesParser.getWSDLDefinition(url.toString());
- }
- catch(MalformedURLException e)
- {
- wsdlURL = PlatformUtils.getFileURLFromPath(new Path(wsdlURL));
- definition = webServicesParser.getWSDLDefinition(wsdlURL);
- }
-
- // Compute the qualified name of the Java bean skeleton
- Service service = null;
- Port port = null;
- if (definition != null) {
- StringBuffer beanName = new StringBuffer();
- beanName.append(WSDLUtils.getPackageName(definition));
- beanName.append(DOT);
- try{
- service = (Service) definition.getServices().values().iterator().next();
- port = (Port) service.getPorts().values().iterator().next();
- Binding binding = port.getBinding();
- beanName.append(binding.getQName().getLocalPart());
- beanName.append(IMPL);
- javaWSDLParam.setBeanName(beanName.toString());
-
- javaWSDLParam.setPortTypeName(WSDLUtils.getPortTypeName(definition));
- javaWSDLParam.setServiceName(
- WSDLUtils.getServiceElementName(definition));
- javaWSDLParam.setBeanPackage(WSDLUtils.getPackageName(definition));
- }
- catch(Throwable e){
- e.printStackTrace();
- }
- }
- else {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_DEFINITION", new String[] {wsdlURL}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // Modify WSDL endpoint
- if (port == null) {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WSDL_NO_PORT", new String[] {wsdlURL}), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
- Map services = definition.getServices();
- for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
- {
- Service s = (Service)servicesIt.next();
- Map ports = s.getPorts();
- for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
- {
- Port p = (Port)portsIt.next();
- modifyEndpoint(p);
- }
- }
-
- visitedLinks = new HashMap();
-
- // Set WSDL file name: javaWSDLParam.setOutputWsdlLocation();
- IWorkspaceRoot workspace = ResourcesPlugin.getWorkspace().getRoot();
-
- String wsdlLocation = javaWSDLParam.getOutputWsdlLocation();
- IPath wsdlPath = null;
- IFile outputFile = null;
- try {
- if(wsdlLocation != null){
- outputFile = workspace.getFileForLocation( new Path(wsdlLocation));
- }
- else{
-// wsdlPath = serverProject.getFullPath();
-//
-// if (serverProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)) {
-// J2EEWebNatureRuntime webProject =
-// (J2EEWebNatureRuntime) serverProject.getNature(
-// IWebNatureConstants.J2EE_NATURE_ID);
-// wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
-// //wsdlPath = wsdlPath.append(webProject.getWEBINFPath());
-// }
-// else if (serverProject.hasNature(IEJBNatureConstants.NATURE_ID))
-// {
-// EJBNatureRuntime ejbProject = EJBNatureRuntime.getRuntime(serverProject);
-// wsdlPath = wsdlPath.append(ejbProject.getMetaFolder().getProjectRelativePath().addTrailingSeparator());
-// }
-// TODO: handle EJB case
- wsdlPath = J2EEUtils.getWebContentPath( serverProject, moduleName_ );
- IPath wsdlFilePath = wsdlPath.append(WSDL_FOLDER).append(port.getName()).addFileExtension(WSDL_EXT);
- IFolder folder = ResourceUtils
- .getWorkspaceRoot()
- .getFolder(wsdlPath.append(WSDL_FOLDER));
- FileUtil.createFolder(folder, true, true);
- outputFile = workspace.getFile(wsdlFilePath);
- wsdlLocation = outputFile.getLocation().toString();
- javaWSDLParam.setOutputWsdlLocation(wsdlLocation);
-
- }
-
- // copy WSDL
- CopyWSDLCommand copyWSDLCommand = new CopyWSDLCommand();
- copyWSDLCommand.setWebServicesParser(webServicesParser);
- copyWSDLCommand.setWsdlURI(wsdlURL);
- copyWSDLCommand.setDestinationURI(outputFile.getLocation().toFile().toURL().toString());
- copyWSDLCommand.setDefinition(definition);
- Status status = copyWSDLCommand.execute(env);
- if(status!=null && status.getSeverity()==Status.ERROR) {
- return status;
- }
- }
- catch (Exception e) {
- Status status = new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WRITE_WSDL", new String[] { wsdlLocation }), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- private Status modifyEndpoint(Port port)
- {
- Iterator it = port.getExtensibilityElements().iterator();
- SOAPAddress soapAddress = null;
- while (it.hasNext())
- {
- Object obj = it.next();
- if (obj instanceof SOAPAddress)
- {
- soapAddress = (SOAPAddress)obj;
- break;
- }
- }
- if (soapAddress != null)
- {
-// String projectURL = ResourceUtils.getEncodedWebProjectURL(serverProject);
- String projectURL = ServerUtils.getEncodedWebComponentURL(serverProject, moduleName_);
- if (projectURL == null)
- return new SimpleStatus(WebServiceAxisCreationUIPlugin.ID, msgUtils_.getMessage("MSG_ERROR_PROJECT_URL", new String[] {serverProject.toString()}), Status.ERROR, null);
- StringBuffer serviceURL = new StringBuffer(projectURL);
- serviceURL.append(SERVICE_EXT).append(port.getName());
- javaWSDLParam.setUrlLocation(serviceURL.toString());
- soapAddress.setLocationURI(serviceURL.toString());
- }
- return new SimpleStatus("");
- }
-
- /**
- * Returns the javaWSDLParam.
- * @return JavaWSDLParameter
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- return javaWSDLParam;
- }
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- /**
- * @param serverProject The serverProject to set.
- */
- public void setServerProject(IProject serverProject) {
- this.serverProject = serverProject;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser() {
- return webServicesParser;
- }
-
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser) {
- this.webServicesParser = webServicesParser;
- }
-
- public String getWsdlURI()
- {
- File file = new File(getJavaWSDLParam().getOutputWsdlLocation());
- String url = "";
- try {
- url = file.toURL().toString();
- }
- catch(MalformedURLException mue){}
- return url;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
deleted file mode 100644
index d83dc37..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/TDCheckAxisDeploymentDescriptors.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-
-public class TDCheckAxisDeploymentDescriptors extends CheckAxisDeploymentDescriptorsTask
-{
- public TDCheckAxisDeploymentDescriptors(String moduleName)
- {
- super(moduleName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
deleted file mode 100644
index 9de2a11..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/task/UpdateAxisWSDDFileTask.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.task;
-
-
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.IPluginRegistry;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.FileUtil;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class UpdateAxisWSDDFileTask extends SimpleCommand {
-
-
- private final String LABEL = "TASK_LABEL_UPDATE_AXIS_WSDD";
- private final String DESCRIPTION = "TASK_DESC_UPDATE_AXIS_WSDD";
- private final String DEPLOY_XSL = "deploy.xsl"; //$NON-NLS-1$
- private final String DEPLOY_BAK = "deploy.wsdd.bak"; //$NON-NLS-1$
- private final String CLASSNAME_PARAM = "newClassName"; //$NON-NLS-1$
- private MessageUtils msgUtils_;
- private MessageUtils coreMsgUtils_;
- private JavaWSDLParameter javaWSDLParam_;
- private IProject serviceProject_;
- // rm private Model model_;
-
- private String moduleName_;
-
- public UpdateAxisWSDDFileTask( String moduleName)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
-
- moduleName_ = moduleName;
- }
-
- public UpdateAxisWSDDFileTask(JavaWSDLParameter javaWSDLParam) {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- coreMsgUtils_ = new MessageUtils( "org.eclipse.jst.ws.axis.consumption.core.consumption", this );
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- setName(msgUtils_.getMessage(LABEL));
- javaWSDLParam_ = javaWSDLParam;
- }
-
- /**
- * Execute UpdateAxisWSDDFileTask
- */
- public Status execute(Environment env) {
-
- // rm
- /*
- //Begin Setters
- WebServiceElement wse =
- WebServiceElement.getWebServiceElement(model_);
- setServiceProject(wse.getServiceProject());
- //End Setters
- */
- Status status = new SimpleStatus("");
- if (javaWSDLParam_ == null) {
- status = new SimpleStatus("",coreMsgUtils_.getMessage("MSG_ERROR_JAVA_WSDL_PARAM_NOT_SET"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // rm
- /*
- if (model_ == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_MODEL_NOT_SET"), Status.ERROR);
- return status;
- }
- */
-
- IProject project = serviceProject_;
- //String projectURL = ResourceUtils.getEncodedWebProjectURL(project);
- String projectURL = ServerUtils.getEncodedWebComponentURL(project, moduleName_);
- if (projectURL == null) {
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_PROJECT_URL",new String[] {project.toString()}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- } else {
- javaWSDLParam_.setProjectURL(projectURL);
- }
- String outputLocation = javaWSDLParam_.getJavaOutput();
- if (outputLocation == null) {
- return status;
- }
-// try {
-// if (!project.hasNature(IWebNatureConstants.J2EE_NATURE_ID))
-// return status;
-// } catch (Exception ex) {
-// status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_INTERAL"), Status.ERROR, ex);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
- String[] javaFiles = javaWSDLParam_.getJavaFiles();
- String javaoutput = javaWSDLParam_.getJavaOutput();
- String output = javaWSDLParam_.getOutput();
-
-// String webContentPath = ResourceUtils.getWebModuleServerRoot(project).getLocation().toString();
- String webContentPath = J2EEUtils.getWebContentContainer( project, moduleName_ ).getLocation().toString();
- try {
-
- if (javaWSDLParam_.getDeploymentFiles() != null
- && javaWSDLParam_.getDeploymentFiles().length > 0) {
-
- String wsdd_deploy = javaWSDLParam_.getDeploymentFiles()[0];
- Path deployPath = new Path(wsdd_deploy);
- String deployBackup =
- deployPath
- .removeLastSegments(1)
- .append(DEPLOY_BAK)
- .toString();
- FileUtil.createTargetFile(wsdd_deploy, deployBackup, true);
- String deployXSL = getPluginFilePath(DEPLOY_XSL).toString();
-
- TransformerFactory tFactory = TransformerFactory.newInstance();
-
- // Use the TransformerFactory to instantiate a Transformer that will work with
- // the stylesheet you specify. This method call also processes the stylesheet
- // into a compiled Templates object.
- Transformer transformer =
- tFactory.newTransformer(new StreamSource(deployXSL));
- transformer.setParameter(CLASSNAME_PARAM, javaWSDLParam_.getBeanName());
-
- // Use the Transformer to apply the associated Templates object to an XML document
- // (foo.xml) and write the output to a file (foo.out).
- transformer.transform(
- new StreamSource(deployBackup),
- new StreamResult(new FileOutputStream(wsdd_deploy)));
-
- }
-
- } catch (Exception e) {
- String[] errorMsgStrings = new String[]{project.toString(), outputLocation.toString(), webContentPath.toString()};
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_UPDATE_AXIS_WSDD", errorMsgStrings), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- private IPath getPluginFilePath(String pluginfileName)
- throws CoreException {
- try {
- IPluginRegistry pluginRegistry = Platform.getPluginRegistry();
- IPluginDescriptor pluginDescriptor =
- pluginRegistry.getPluginDescriptor(WebServiceAxisCreationUIPlugin.ID);
-
- URL localURL =
- Platform.asLocalURL(
- new URL(pluginDescriptor.getInstallURL(), pluginfileName));
- return new Path(localURL.getFile());
- } catch (MalformedURLException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- msgUtils_.getMessage(
- "MSG_PLUGIN_FILE_URL"),
- e));
- } catch (IOException e) {
- throw new CoreException(
- new org.eclipse.core.runtime.Status(
- IStatus.WARNING,
- WebServiceAxisCreationUIPlugin.ID,
- 0,
- msgUtils_.getMessage(
- "MSG_PLUGIN_FILE_URL"),
- e));
- }
- }
-
-
- /**
- * Sets the javaWSDLParam.
- * @param javaWSDLParam The javaWSDLParam to set
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- javaWSDLParam_ = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
-
- public void setServiceProject(IProject serviceProject)
- {
- serviceProject_ = serviceProject;
- }
-
- // rm
- /*
- public void setModel(Model model)
- {
- model_ = model;
- }
- */
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
deleted file mode 100644
index 346a63b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/AxisBeanFragment.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class AxisBeanFragment extends SequenceFragment
-{
-
- public AxisBeanFragment()
- {
- add( new SimpleFragment( new ValidateObjectSelectionCommand(), ""));
- add( new SimpleFragment( new BUAxisDefaultingCommand(), "" ) );
- add( new BUAxisCommandsFragment1());
- add( new BUAxisCommandsFragment2());
- add( new SimpleFragment( "BeanConfig" ) );
- add( new MappingFragment() );
- add( new BUAxisCommandsFragment3());
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- //ValidateObjectSelectionCommand
- registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-
- //BUAxisDefaultingCommand
- registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-
- //WSINonCompliantRuntimeCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- //BUAxisCommands2 - these run after BeanClassWidget
- //DefaultsForServerJavaWSDLCommand
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
- //JavaWSDLMethodCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- // BUAxisCommands3 - these run after BeanConfigWidget
- //LiteralSupportMessageTask
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-
- //CheckAxisDeploymentDescriptorsTask
- //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", new StringToIProjectTransformer());
-
- //CopyAxisJarCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- //AddJarsToProjectBuildPathTask
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //WSDL2JavaCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
-
- //MoveJavaFilesTask
- registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateAxisWSDDFileTask
- registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateWEBXMLCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-
- //BuildProjectCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- //StartProjectCommand
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-
- //AxisDeployCommand
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- //CopyAxisServerConfigTask
- /*
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", CopyAxisServerConfigTask.class);
- registry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisServerConfigTask.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", CopyAxisServerConfigTask.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", CopyAxisServerConfigTask.class);
- */
-
- // ServerExtensionOutputCommand
- registry.addMapping(Java2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);
- }
-
- private class BUAxisCommandsFragment1 extends SequenceFragment
- {
- public BUAxisCommandsFragment1()
- {
- add(new SimpleFragment(new WSINonCompliantRuntimeCommand(), ""));
- }
- }
-
- private class BUAxisCommandsFragment2 extends SequenceFragment
- {
- public BUAxisCommandsFragment2()
- {
- //add(new SimpleFragment(new DefaultsForServerJavaWSDLCommand(), ""));
- add(new SimpleFragment(new JavaToWSDLMethodCommand(), ""));
- }
- }
-
- private class BUAxisCommandsFragment3 extends SequenceFragment
- {
- public BUAxisCommandsFragment3()
- {
- add(new SimpleFragment(new LiteralSupportMessageTask(), ""));
- //add(new SimpleFragment(new CheckAxisDeploymentDescriptorsTask(), ""));
- //add(new SimpleFragment(new CopyAxisJarCommand(), ""));
- add(new SimpleFragment(new AddJarsToProjectBuildPathTask(), ""));
- add(new SimpleFragment(new WaitForAutoBuildCommand(), "" ));
- add(new SimpleFragment(new Java2WSDLCommand(), ""));
- add(new SimpleFragment(new RefreshProjectCommand(), ""));
- add(new SimpleFragment(new WSDL2JavaCommand(), ""));
- add(new SimpleFragment(new MoveJavaFilesTask(), ""));
- //add(new SimpleFragment(new UpdateAxisWSDDFileTask(), ""));
- //add(new SimpleFragment(new UpdateWEBXMLCommand(), ""));
- add(new SimpleFragment(new RefreshProjectCommand(), ""));
- add(new SimpleFragment(new BuildProjectCommand(), ""));
- //add(new SimpleFragment(new StartProjectCommand(), ""));
- add(new SimpleFragment(new AxisDeployCommand(), ""));
- //add(new SimpleFragment(new CopyAxisServerConfigTask(), ""));
- add(new SimpleFragment(new RefreshProjectCommand(), ""));
- }
- }
-
- public class MappingFragment extends BooleanFragment
- {
- private boolean showMappings_;
-
- public MappingFragment()
- {
- super();
-
- setTrueFragment( new SimpleFragment( "AxisServiceBeanMapping" ));
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return showMappings_;
- }
- } );
- }
-
- public void setCustomizeServiceMappings( boolean showMappings )
- {
- showMappings_ = showMappings;
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
deleted file mode 100644
index 417e21b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BUAxisDefaultingCommand.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class BUAxisDefaultingCommand extends SimpleCommand
-{
- //Need
- private IStructuredSelection initialSelection_;
- private TypeRuntimeServer serviceIds_;
-
- //Provide
- private IServer serviceExistingServer_;
- private String serviceServerTypeID_; // rsk revisit
- private JavaWSDLParameter javaWSDLParam_;
- private String javaBeanName_;
- private WebServicesParser parser_;
- private boolean forceBuild_ = true;
- private Boolean IsWebProjectStartupRequested = Boolean.TRUE; // rsk revisit
- private ValidationManager validationManager_;
- private boolean customizeServiceMappings_ = false;
-
- //This is proxy and client related information
- //which can be nulled for commands dealing
- //with service creation.
- //rsk revisit
- private Boolean isProxyProject_ = Boolean.FALSE;
- private String clientRuntimeID_ = null;
- private IProject proxyProject_ = null;
- private IProject sampleProject_ = null;
- private String sampleServerTypeID_ = null;
- private IServer sampleExistingServer_ = null;
-
- private MessageUtils msgUtils_;
-
- public Status execute(Environment env)
- {
-
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
-// if (serviceIds_.getServerInstanceId() != null) { // server exists
-// serviceExistingServer_ = ServerCore.findServer(serviceIds_.getServerInstanceId());
-// }
-// if (serviceExistingServer_ != null)
-// {
-// serviceServerTypeID_ = serviceExistingServer_.getServerType().getId();
-// }
-// else
-// {
-// serviceServerTypeID_ = serviceIds_.getServerId();
-// // server will be created in ServerDeployableConfigurationCommand
-// }
-
- //javaWSDLParam
- javaWSDLParam_ = new JavaWSDLParameter();
-
-// if (initialSelection_ == null) {
-// Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-// msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION"), Status.ERROR);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
-
- if (javaBeanName_ == null) {
- Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"), //$NON-NLS-1$
- Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-// try {
-//
-// javaBeanName_ = getJavaBeanFromInitialSelection(env);
-//
-// } catch (CoreException e) {
-// Status status = new SimpleStatus("BUAxisDefaultingCommand", //$NON-NLS-1$
-// msgUtils_.getMessage("MSG_ERROR_INITIAL_SELECTION") + " " //$NON-NLS-1$
-// +e.getCause().toString(), Status.ERROR);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
-
- //parser
- parser_ = new WebServicesParserExt();
-
-
-
- //validationManager
- validationManager_ = new ValidationManager();
-
- return new SimpleStatus("");
- }
-
- private String getJavaBeanFromInitialSelection(Environment env) throws CoreException
- {
- String beanClass = "";
- JavaResourceFilter filter = new JavaResourceFilter();
- IStructuredSelection selection = initialSelection_;
- //
- if (selection != null)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- // get the IResource represented by the selection
- IResource res = null;
-
- res = ResourceUtils.getResourceFromSelection(obj);
-
- if (filter.accepts(res))
- {
- // get the package-qualified class name without file extensions
- String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
- if (beanPackage==null)
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- beanClass = beanPackage + res.getName();
-
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
- beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
- }
- }
- }
- }
-
- //
- return beanClass;
- }
- /**
- * @return Returns the clientRuntimeID_.
- */
- public String getClientRuntimeID()
- {
- return clientRuntimeID_;
- }
- /**
- * @return Returns the forceBuild_.
- */
- public boolean getForceBuild()
- {
- return forceBuild_;
- }
- /**
- * @return Returns the isProxyProject_.
- */
- public Boolean getIsProxyProject()
- {
- return isProxyProject_;
- }
- /**
- * @return Returns the javaBeanName_.
- */
- public String getJavaBeanName()
- {
- return javaBeanName_;
- }
- /**
- * @return Returns the javaWSDLParam_.
- */
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam_;
- }
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getParser()
- {
- return parser_;
- }
- /**
- * @return Returns the proxyProject_.
- */
- public IProject getProxyProject()
- {
- return proxyProject_;
- }
- /**
- * @return Returns the sampleExistingServer_.
- */
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer_;
- }
- /**
- * @return Returns the sampleProject_.
- */
- public IProject getSampleProject()
- {
- return sampleProject_;
- }
- /**
- * @return Returns the sampleServerTypeID_.
- */
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID_;
- }
- /**
- * @return Returns the validationManager_.
- */
- public ValidationManager getValidationManager()
- {
- return validationManager_;
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- initialSelection_ = initialSelection;
- }
- /**
- * @return Returns the serviceExistingServer_.
- */
- public IServer getServiceExistingServer()
- {
- return serviceExistingServer_;
- }
-
-// public String getServiceServerTypeID()
-// {
-// return serviceServerTypeID_;
-// }
-
- public boolean getCustomizeServiceMappings()
- {
- return customizeServiceMappings_;
- }
- /**
- * @return Returns the isWebProjectStartupRequested.
- */
- public Boolean getIsWebProjectStartupRequested()
- {
- return IsWebProjectStartupRequested;
- }
-
-public void setJavaBeanName(String javaBeanName) {
- this.javaBeanName_ = javaBeanName;
-}
-
-// public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
-// {
-// serviceIds_ = ids;
-// }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
deleted file mode 100644
index 2345bc1..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanClassWidget.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jface.wizard.IWizardPage;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class BeanClassWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private String thisPlugin = "org.eclipse.jst.ws.axis.creation.ui";
- private IProject serverProject_ = null;
- private Composite parent_ = null;
- private IWizardContainer context_ = null;
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private IResource initialResource_ = null;
-
- /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
- private String INFOPOP_PBCL_PAGE = "PBCL0001";
-
- private Text beanClassText_;
- /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
- private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- private Button beanResourceBrowseButton_;
- /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, thisPlugin );
-
- parent_ = parent;
-
- Composite group = uiUtils.createComposite( parent, 4 );
-
- group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-
- beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
- "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
- INFOPOP_PBCL_TEXT_BEAN_CLASS,
- SWT.SINGLE | SWT.BORDER);
-
- beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
- "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
- "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
- beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseFiles();
- }
- } );
-
- return this;
- }
-
- private void handleBrowseClasses()
- {
- String className = DialogUtils.browseClasses( parent_.getShell(),
- serverProject_, context_ );
-
- if (className!=null) beanClassText_.setText(className);
-
- }
-
- private void handleBrowseFiles()
- {
- IResource topResource = serverProject_;
-
- if (topResource == null)
- {
- topResource = ResourceUtils.getWorkspaceRoot();
- }
-
- IResource resource
- = DialogUtils.browseResources( parent_.getShell(),
- topResource,
- initialResource_,
- filter_ );
-
- if( resource != null )
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
-
- if( basename != null && basename.length() > 0 )
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassText_.setText(beanClass);
- }
- }
- }
-
- public void setCurrentPage( IWizardPage page )
- {
- context_ = page.getWizard().getContainer();
- }
-
- public void setBeanClassName(String beanClassName)
- {
- beanClassText_.setText(beanClassName);
- }
-
- public String getBeanClassName()
- {
- return beanClassText_.getText().trim();
- }
-
- public void setServerProjectName( String name )
- {
- serverProject_ = (IProject)ResourceUtils.findResource( new Path( name ).makeAbsolute() );
- }
-
- public void setInitialResource( IResource resource )
- {
- initialResource_ = resource;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
deleted file mode 100644
index 053d100..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/BeanConfigWidget.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.util.PlatformUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class BeanConfigWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
-
- private Button rpcEncodedButton_;
- private Button rpcLiteralButton_;
- private Button docLiteralButton_;
-
- private Listener statusListener_;
-
- private JavaWSDLParameter javaParameter_;
-
- /* CONTEXT_ID PBCF0001 for the Bean Config Page */
- private final String INFOPOP_PBCF_PAGE = "PBCF0001"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_PAGE = "TOOLTIP_PBCF_PAGE";
-
- private Text uriText_;
- /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-
- private Text wsdlFolderText_;
- /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-
- private Text wsdlFileText_;
- /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-
- private Tree methodsTree_;
- /* CONTEXT_ID PBME0002 for the Methods tree of the Bean Methods Page */
- private final String INFOPOP_PBME_TREE_METHODS = "PBME0002"; //$NON-NLS-1$
- private final String TOOLTIP_PBME_TREE_METHODS = "TOOLTIP_PBME_TREE_METHODS";
-
- private Button selectAllMethodsButton_;
- /* CONTEXT_ID PBME0010 for the Select All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_SELECT_ALL = "PBME0010"; //$NON-NLS-1$
- private final String TOOLTIP_PBME_BUTTON_SELECT_ALL = "TOOLTIP_PBME_BUTTON_SELECT_ALL";
-
- private Button deselectAllMethodsButton_;
- /* CONTEXT_ID PBME0011 for the Deselect All button of the Bean Methods Page */
- private final String INFOPOP_PBME_BUTTON_DESELECT_ALL = "PBME0011"; //$NON-NLS-1$
- private final String TOOLTIP_PBME_BUTTON_DESELECT_ALL = "TOOLTIP_PBME_BUTTON_DESELECT_ALL";
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBCF0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_P2N_SHOW_MAPPINGS = "PBCF0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- String baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- MessageUtils baseConUtils = new MessageUtils( baseConPluginId + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
- UIUtils baseConUiUtils = new UIUtils( baseConUtils, pluginId_ );
-
- statusListener_ = statusListener;
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBCF_PAGE ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PBCF_PAGE );
-
- Composite configGroup = uiUtils.createComposite( parent, 2 );
-
- uriText_ = uiUtils.createText( configGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFolderText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FOLDER_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
- INFOPOP_PBCF_TEXT_WSDL_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFileText_ = uiUtils.createText( configGroup, "LABEL_OUTPUT_FILE_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER );
- wsdlFileText_.addListener( SWT.Modify, statusListener );
-
- Label separator = uiUtils.createHorizontalSeparator( parent, 6 );
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group methodsGroup = baseConUiUtils.createGroup( parent, "LABEL_METHODS", null, null );
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- methodsTree_ = uiUtils.createTree( methodsGroup, TOOLTIP_PBME_TREE_METHODS,
- INFOPOP_PBME_TREE_METHODS,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
- methodsTree_.addListener( SWT.Selection, statusListener );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL",
- TOOLTIP_PBME_BUTTON_SELECT_ALL,
- INFOPOP_PBME_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = baseConUiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL",
- TOOLTIP_PBME_BUTTON_DESELECT_ALL,
- INFOPOP_PBME_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- // TODO this group has no TOOLTIP or INFOPOP.
- Group styleGroup = uiUtils.createGroup( parent, "LABEL_STYLE_USE", null, null );
-
- // TODO radio buttons have no TOOLTIP or INFOPOP.
- docLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_DOC_LITERAL", null, null );
- rpcLiteralButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_LITERAL", null, null );
- rpcEncodedButton_ = uiUtils.createRadioButton( styleGroup, "STYLE_RPC_ENCODED", null, null );
-
- showMappingsCheckbox_ = uiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_BEAN2XML",
- "TOOLTIP_P2N_SHOW_MAPPINGS",
- INFOPOP_P2N_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
-
- statusListener_.handleEvent( null );
- }
-
- public void setCustomizeServiceMappings( boolean value )
- {
- showMappingsCheckbox_.setSelection( value );
- }
-
- public boolean getCustomizeServiceMappings()
- {
- return showMappingsCheckbox_ == null ? false : showMappingsCheckbox_.getSelection();
- }
-
- public void setJavaParameter( JavaWSDLParameter javaParameter )
- {
- javaParameter_ = javaParameter;
-
- String wsdlLocation = javaParameter.getOutputWsdlLocation();
-
- // TODO Verify that we need to find the WSDL in the eclipse file system.
- //IFile file
- // = ResourceUtils.getWorkspaceRoot().getFileForLocation(new Path(wsdlLocation));
- //IPath wsdlPath = file.getFullPath();
- IPath wsdlPath = new Path( wsdlLocation );
-
- wsdlFolderText_.setText(wsdlPath.removeLastSegments(1).toString());
- wsdlFileText_.setText(wsdlPath.lastSegment());
-
- String location = javaParameter.getUrlLocation();
- uriText_.setText(location == null ? "" : location);
-
- methodsTree_.removeAll();
- Hashtable methods = javaParameter.getMethods();
- Enumeration e = methods.keys();
-
- while( e.hasMoreElements() )
- {
- String name = (String) e.nextElement();
- TreeItem item = new TreeItem(methodsTree_, SWT.NULL);
-
- item.setData(name);
- item.setText(name);
- item.setChecked((((Boolean) methods.get(name)).booleanValue()));
- }
-
- TreeItem[] items = methodsTree_.getItems();
-
- if( items.length > 0 )
- {
- methodsTree_.setSelection( new TreeItem[]{ items[0] } );
- }
-
- String style = javaParameter.getStyle();
-
- if( style.equals( JavaWSDLParameter.STYLE_RPC ) )
- {
- rpcEncodedButton_.setSelection(true);
- }
- else if( style.equals( JavaWSDLParameter.STYLE_DOCUMENT ) )
- {
- rpcLiteralButton_.setSelection(true);
- }
- else
- {
- docLiteralButton_.setSelection(true);
- }
- }
-
- public JavaWSDLParameter getJavaParameter()
- {
- IPath wsdlPath
- = new Path( wsdlFolderText_.getText().trim() ).append( wsdlFileText_.getText().trim() );
- IWorkspaceRoot workspace = ResourceUtils.getWorkspaceRoot();
-
- // TODO Do we need to go to the eclipse file system??
- //String wsdlLocation = workspace.getFile(wsdlPath).getLocation().toString();
- String wsdlLocation = wsdlPath.toString();
-
- javaParameter_.setOutputWsdlLocation(wsdlLocation);
- javaParameter_.setInputWsdlLocation(wsdlLocation);
-
- String fileURL = PlatformUtils.getFileURLFromPath(new Path(wsdlLocation));
-
- Hashtable methods = new Hashtable();
-
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- TreeItem item = items[i];
- methods.put((String)item.getData(), new Boolean(item.getChecked()));
- }
-
- javaParameter_.setMethods(methods);
-
- if( rpcEncodedButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_RPC);
- javaParameter_.setUse(JavaWSDLParameter.USE_ENCODED);
- }
- else if( rpcLiteralButton_.getSelection())
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_DOCUMENT);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
- else
- {
- javaParameter_.setStyle(JavaWSDLParameter.STYLE_WRAPPED);
- javaParameter_.setUse(JavaWSDLParameter.USE_LITERAL);
- }
-
- return javaParameter_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus()
- {
- Status result = null;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- if( wsdlFileText_.getText().equals( "" ) )
- {
- result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_FILE_SPECIFIED" ), Status.ERROR );
- }
- else
- {
- TreeItem[] items = methodsTree_.getItems();
- boolean itemSelected = false;
-
- for( int index = 0; index < items.length; index++ )
- {
- if( items[index].getChecked() )
- {
- itemSelected = true;
- break;
- }
- }
-
- if( !itemSelected )
- {
- result = new SimpleStatus( "", msgUtils.getMessage( "PAGE_MSG_NO_METHOD_SELECTED" ), Status.ERROR );
- }
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
deleted file mode 100644
index e96b20e..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/DefaultsForConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import java.util.Hashtable;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-
-public class DefaultsForConfig extends SimpleCommand
-{
- public JavaWSDLParameter getJavaParameter()
- {
- JavaWSDLParameter parameter = new JavaWSDLParameter();
- Hashtable methods = new Hashtable();
-
- methods.put( "method1", new Boolean( true ) );
- methods.put( "method2", new Boolean( false ) );
- methods.put( "method3", new Boolean( true ) );
-
- parameter.setMethods( methods );
- parameter.setOutputWsdlLocation( "/SomeProj/SomeFolder/SomeFile" );
- parameter.setUrlLocation( "SomeURLLocation" );
- parameter.setStyle( JavaWSDLParameter.STYLE_DOCUMENT );
-
- return parameter;
- }
-
- public boolean getCustomizeServiceMappings()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
deleted file mode 100644
index 6ce5371..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/bean/ValidateObjectSelectionCommand.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class ValidateObjectSelectionCommand extends SimpleCommand
-{
- private String JAVA_EXTENSION = ".java"; //$NON-NLS-1$
- private String CLASS_EXTENSION = ".class"; //$NON-NLS-1$
- private MessageUtils msgUtils_;
- private IStructuredSelection objectSelection;
- private String serviceProjectName;
-
-
- /**
- * Validates that the selected Java bean can be loaded from the service project. If it can't, an error is displayed.
- */
- public ValidateObjectSelectionCommand()
- {
- super();
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
- public Status execute(Environment env)
- {
- //Make sure a bean is selected
- String javaBeanName = null;
- if (objectSelection != null && !objectSelection.isEmpty())
- {
- Object object = objectSelection.getFirstElement();
- if (object instanceof String)
- {
- javaBeanName = ((String)object);
- }
- else
- {
- //The ObjectSelectionWidget never appeared and so the IStucturedSelection from
- //ObjectSelectionWidgetOutputCommand is the initial selection.
- //Get the Java bean name from the selection.
- try
- {
- System.out.println(object.getClass().toString());
- javaBeanName = getJavaBeanFromObjectSelection(objectSelection);
- } catch (CoreException ce)
- {
- Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- }
- }
-
- if (javaBeanName==null || javaBeanName.length()==0)
- {
- Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_CANNOT_NO_JAVA_BEAN"),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure a project is selected
- IProject serviceProject = ProjectUtilities.getProject(serviceProjectName);
- if (serviceProject==null)
- {
- Status errorStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_NO_PROJECT"),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- //Make sure the selected bean can be loaded from the selected project
- if (javaBeanName.toLowerCase().endsWith(JAVA_EXTENSION)
- || javaBeanName.toLowerCase().endsWith(CLASS_EXTENSION)) {
- javaBeanName = javaBeanName.substring(0, javaBeanName.lastIndexOf('.'));
- }
-
- try
- {
- JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(serviceProject);
- JavaClass javaClass =(JavaClass) JavaClassImpl.reflect(javaBeanName, jMOF.getResourceSet());
- if (!javaClass.isExistingType())
- {
- Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
- } catch (CoreException ce)
- {
- Status errorStatus = new SimpleStatus("JavaToWSDLMethodCommand", msgUtils_.getMessage("MSG_ERROR_CANNOT_LOAD_JAVA_BEAN", new String[] { javaBeanName, serviceProjectName }),Status.ERROR);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- return new SimpleStatus("");
- }
-
- /**
- * @param serviceProjectName The serviceProjectName to set.
- */
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName = serviceProjectName;
- }
-
- /**
- * @param objectSelection The objectSelection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- this.objectSelection = objectSelection;
- }
-
- private String getJavaBeanFromObjectSelection(IStructuredSelection objectSelection) throws CoreException
- {
- String beanClass = "";
- JavaResourceFilter filter = new JavaResourceFilter();
- //IStructuredSelection selection = initialSelection_;
- //
- if (objectSelection != null)
- {
- Object obj = objectSelection.getFirstElement();
- if (obj != null)
- {
- // get the IResource represented by the selection
- IResource res = null;
-
- res = ResourceUtils.getResourceFromSelection(obj);
-
- if (filter.accepts(res))
- {
- // get the package-qualified class name without file extensions
- String beanPackage = ResourceUtils.getJavaResourcePackageName(res.getFullPath());
- if (beanPackage==null)
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- beanClass = beanPackage + res.getName();
-
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class")) {
- beanClass = beanClass.substring(0,beanClass.lastIndexOf('.'));
- }
- }
- }
- }
-
- //
- return beanClass;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
deleted file mode 100644
index 0b6a14d..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonDefaultingCommand.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class AxisSkeletonDefaultingCommand extends SimpleCommand
-{
- private IStructuredSelection initialSelection;
- private IStructuredSelection objectSelection;
- private WebServicesParser webServicesParser;
- private String wsdlURI_;
- private JavaWSDLParameter javaWSDLParam;
-
- public Status execute(Environment env){
-
- javaWSDLParam = new JavaWSDLParameter();
- javaWSDLParam.setServerSide(JavaWSDLParameter.SERVER_SIDE_BEAN);
- javaWSDLParam.setSkeletonDeploy(true);
- javaWSDLParam.setMetaInfOnly(false);
- return new SimpleStatus("");
-
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- this.initialSelection = initialSelection;
- }
-
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- this.objectSelection = objectSelection;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = WSDLParserFactory.getWSDLParser();
- return webServicesParser;
- }
-
- public String getWebServiceURI()
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object firstElement = initialSelection.getFirstElement();
- if (firstElement instanceof IFile)
- {
- IFile ifile = (IFile)firstElement;
- String fileExtension = ifile.getFileExtension();
- if (fileExtension.equals("wsdl") ||
- fileExtension.equals("wsil") ||
- fileExtension.equals("html"))
- {
- return ifile.getFullPath().toString();
- }
- }
- }
- return "";
- }
-
- public String getWsdlURI()
- {
-// if (objectSelection != null && !objectSelection.isEmpty())
-// {
-// Object object = objectSelection.getFirstElement();
-// if (object instanceof IResource)
-// return ((IResource)object).getLocation().toString();
-// else
-// return object.toString();
-// }
-// return "";
- return wsdlURI_;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
-
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWsdlURI();
- int index = wsURI.lastIndexOf('.');
- if (index != -1)
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, index));
- sb.append(".wsil");
- return sb.toString();
- }
- return "";
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
- public String getHttpBasicAuthPassword()
- {
- return getWebServicesParser().getHTTPBasicAuthPassword();
- }
-
- public String getHttpBasicAuthUsername()
- {
- return getWebServicesParser().getHTTPBasicAuthUsername();
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
deleted file mode 100644
index 7e86a18..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/AxisSkeletonFragment.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerName2IServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-public class AxisSkeletonFragment extends SequenceFragment
-{
- public AxisSkeletonFragment()
- {
- add( new SimpleFragment( new AxisSkeletonDefaultingCommand(), "" ) );
- add( new SimpleFragment( new ValidateWSDLCommand(), ""));
- //add( new SimpleFragment( new SkeletonConfigWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "SkeletonConfig") );
- add( new AxisMappingsFragment() );
- //add( new SimpleFragment( new CheckAxisDeploymentDescriptorsTask(), ""));
- add( new SimpleFragment( new AddJarsToProjectBuildPathTask(), ""));
- //add( new SimpleFragment( new CopyAxisJarCommand(), ""));
- add( new SimpleFragment( new WSDL2JavaCommand(), ""));
- //add( new SimpleFragment( new MoveDeploymentFilesTask(), ""));
- //add( new SimpleFragment( new Skeleton2WSDLCommand(), ""));
- //add( new SimpleFragment( new UpdateWEBXMLCommand(), ""));
- add( new SimpleFragment( new RefreshProjectCommand(), ""));
- add( new SimpleFragment( new BuildProjectCommand(), ""));
- //add( new SimpleFragment( new StartProjectCommand(), ""));
- // the second build project command is needed to synchronize with workspace auto build
- add( new SimpleFragment( new BuildProjectCommand(), ""));
- add( new SimpleFragment( new AxisDeployCommand(), ""));
- add( new SimpleFragment( new RefreshProjectCommand(), ""));
- add (new SimpleFragment( new ComputeAxisSkeletonBeanCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // Transformers
- ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-
- // ValidateWSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-
- // SkeletonConfigWidgetDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-
- // CheckAxisDeploymentDescriptorsTask
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CheckAxisDeploymentDescriptorsTask.class, "ServerProject", projectTransformer);
-
- // AddJarsToProjectBuildPathTask
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
- //dataRegistry.addMapping(WSDLSelectionTreeWidget.class, "WsdlURI", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
- // MoveDeploymentFilesTask
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
- // CopyAxisJarCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
- // UpdateWEBXMLCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // StartProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
- dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
- // AxisDeployCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // ServerExtensionOutputCommand
- dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ServerExtensionOutputCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ServerExtensionOutputCommand.class);
-
- // ComputeAxisSkeletonBeanCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-
- // OpenJavaEditorCommand
- dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
deleted file mode 100644
index 5f2115a..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidget.java
+++ /dev/null
@@ -1,215 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class SkeletonConfigWidget extends SimpleWidgetDataContributor
-{
- private JavaWSDLParameter javaWSDLParam;
-
- /* CONTEXT_ID PBSC0001 for the Skeleton Config Page */
- private static final String INFOPOP_PBSC_PAGE = "PBSC0001"; //$NON-NLS-1$
- private static final String TOOLTIP_PBSC_PAGE = "TOOLTIP_PBSC_PAGE";
-
- // private Text uriText_;
- /* CONTEXT_ID PBCF0002 for the URI field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_URI = "PBCF0002"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_URI = "TOOLTIP_PBCF_TEXT_URI";
-
- private Text wsdlFolderText_;
- /* CONTEXT_ID PBCF0006 for the WSDL Folder field in the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FOLDER = "PBCF0006"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FOLDER = "TOOLTIP_PBCF_TEXT_WSDL_FOLDER";
-
- private Text wsdlFileText_;
- /* CONTEXT_ID PBCF0007 for the WSDL File field of the Bean Config Page */
- private final String INFOPOP_PBCF_TEXT_WSDL_FILE = "PBCF0007"; //$NON-NLS-1$
- private final String TOOLTIP_PBCF_TEXT_WSDL_FILE = "TOOLTIP_PBCF_TEXT_WSDL_FILE";
-
- private Combo skeletonFolderText_;
- /* CONTEXT_ID PBSC0004 for the Skeleton Folder field of the Skeleton Config Page */
- private static final String INFOPOP_PBSC_TEXT_SKELETON_FOLDER = "PBSC0004"; //$NON-NLS-1$
- private static final String TOOLTIP_PBSC_TEXT_SKELETON_FOLDER = "TOOLTIP_PBSC_TEXT_SKELETON_FOLDER";
- //
-
- /* CONTEXT_ID PBSC0005 for the Skeleton Folder Browse button of the Skeleton Config Page */
- // private static final String INFOPOP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "PBSC0005"; //$NON-NLS-1$
- // private static final String TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE = "TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE";
-
- private Button showMappingsCheckbox_;
- /* CONTEXT_ID PBSC0016 for the Show Mappings checkbox of the Bean Methods Page */
- private String INFOPOP_N2P_SHOW_MAPPINGS = "PBSC0016"; //$NON-NLS-1$
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.axis.creation.ui";
- String conPluginId = "org.eclipse.jst.ws.axis.consumption.ui";
- String baseConPluginId = "org.eclipse.jst.ws.consumption.ui";
-
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- MessageUtils conMsgUtils = new MessageUtils( conPluginId + ".plugin", this );
- MessageUtils baseConMsgUtils = new MessageUtils( baseConPluginId + ".plugin", this );
- UIUtils uiUtils = new UIUtils( msgUtils, pluginId );
- UIUtils conUiUtils = new UIUtils( conMsgUtils, pluginId );
- UIUtils baseConUiUtils = new UIUtils( baseConMsgUtils, pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PBSC_PAGE );
- parent.setToolTipText( msgUtils.getMessage( TOOLTIP_PBSC_PAGE ) );
-
- Composite textGroup = uiUtils.createComposite( parent, 2, 0, 0 );
-
- /*
- uriText_ = uiUtils.createText( textGroup, "LABEL_URI",
- TOOLTIP_PBCF_TEXT_URI,
- INFOPOP_PBCF_TEXT_URI,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- */
-
- wsdlFolderText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FOLDER_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FOLDER,
- INFOPOP_PBCF_TEXT_WSDL_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- wsdlFileText_ = uiUtils.createText( textGroup, "LABEL_OUTPUT_FILE_NAME",
- TOOLTIP_PBCF_TEXT_WSDL_FILE,
- INFOPOP_PBCF_TEXT_WSDL_FILE,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- skeletonFolderText_ = baseConUiUtils.createCombo( textGroup, "LABEL_SKELETON_ROOT_NAME",
- TOOLTIP_PBSC_TEXT_SKELETON_FOLDER,
- INFOPOP_PBSC_TEXT_SKELETON_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- Label separator = uiUtils.createHorizontalSeparator( parent, 5 );
-
- showMappingsCheckbox_ = conUiUtils.createCheckbox( parent, "LABEL_EXPLORE_MAPPINGS_XML2BEAN",
- "TOOLTIP_N2P_SHOW_MAPPINGS",
- INFOPOP_N2P_SHOW_MAPPINGS );
-
- return this;
- }
-
- public void setEndpointURI(String endpointURI)
- {
- /*
- if (endpointURI != null)
- uriText_.setText(endpointURI);
- */
- }
-
- public void setOutputWSDLFolder(String outputWSDLFolder)
- {
- if (outputWSDLFolder != null)
- wsdlFolderText_.setText(outputWSDLFolder);
- }
-
- public void setOutputWSDLFile(String outputWSDLFile)
- {
- if (outputWSDLFile != null)
- wsdlFileText_.setText(outputWSDLFile);
- }
-
- public void setOutputJavaFolder(String outputJavaFolder)
- {
- if (outputJavaFolder != null)
- {
- int index = skeletonFolderText_.indexOf(outputJavaFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else if (skeletonFolderText_.getItemCount() <= 0)
- {
- String root = getWorkspaceRootLocation();
- if (outputJavaFolder.startsWith(root))
- skeletonFolderText_.setText(outputJavaFolder.substring(root.length()));
- else
- skeletonFolderText_.setText(outputJavaFolder);
- }
- }
- }
-
- public void setShowMapping(boolean showMapping)
- {
- showMappingsCheckbox_.setSelection(showMapping);
- }
-
- public boolean getShowMapping()
- {
- return showMappingsCheckbox_.getSelection();
- }
-
- /**
- * @return Returns the javaWSDLParam.
- */
- public JavaWSDLParameter getJavaWSDLParam() {
- String root = getWorkspaceRootLocation();
- File file = new File(root);
- try
- {
- root = file.toURL().toString();
- char lastChar = root.charAt(root.length()-1);
- if (lastChar == '/' || lastChar == '\\')
- root = root.substring(0, root.length()-1);
- }
- catch (MalformedURLException murle)
- {
- }
- javaWSDLParam.setOutput(root + wsdlFolderText_.getText());
- javaWSDLParam.setJavaOutput(root + skeletonFolderText_.getText());
- return javaWSDLParam;
- }
-
- /**
- * @param javaWSDLParam The javaWSDLParam to set.
- */
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam) {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public void setServerProject(IProject serviceProject)
- {
- String originalSkeletonFolder = skeletonFolderText_.getText();
- skeletonFolderText_.removeAll();
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(serviceProject);
- for (int i = 0; i < paths.length ; i++)
- skeletonFolderText_.add(paths[i].toString());
- int index = skeletonFolderText_.indexOf(originalSkeletonFolder);
- if (index != -1)
- skeletonFolderText_.select(index);
- else
- skeletonFolderText_.select(0);
- }
-
- private String getWorkspaceRootLocation()
- {
- return ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
deleted file mode 100644
index d930940..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/widgets/skeleton/SkeletonConfigWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class SkeletonConfigWidgetDefaultingCommand extends SimpleCommand
-{
- private String wsdlURI;
- private IProject serverProject;
- private JavaWSDLParameter javaWSDLParam;
- private String moduleName_;
-
- public SkeletonConfigWidgetDefaultingCommand( String moduleName )
- {
- moduleName_ = moduleName;
- }
-
- public Status execute(Environment env)
- {
- String root = getRootURL();
- javaWSDLParam.setOutput( root + getOutputWSDLFolder());
- javaWSDLParam.setJavaOutput(root + getOutputJavaFolder());
- return new SimpleStatus("");
-
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = ResourcesPlugin.getWorkspace().getRoot().getProject(serverProject);
- }
-
- public String getEndpointURI()
- {
- return null;
- }
-
- public String getOutputWSDLFolder()
- {
- IPath wsdlPath = J2EEUtils.getWebContentPath(serverProject, moduleName_ ).append("wsdl");
- return wsdlPath.toString();
- }
-
- public String getOutputWSDLFile()
- {
- int index = wsdlURI.lastIndexOf('/');
- if (index == -1)
- index = wsdlURI.lastIndexOf('\\');
- return wsdlURI.substring(index+1, wsdlURI.length());
- }
-
- public String getOutputJavaFolder()
- {
- if (serverProject!=null){
- return ResourceUtils.getJavaSourceLocation(serverProject, moduleName_).toString();
- }
- return null;
- }
-
- public boolean getShowMapping()
- {
- return false;
- }
-
- public boolean isShowMapping()
- {
- return getShowMapping();
- }
-
- public void setJavaWSDLParam(JavaWSDLParameter javaWSDLParam)
- {
- this.javaWSDLParam = javaWSDLParam;
- }
-
- public JavaWSDLParameter getJavaWSDLParam()
- {
- return javaWSDLParam;
- }
-
- private String getRootURL()
- {
- String rootURL = ResourcesPlugin.getWorkspace().getRoot().getLocation().removeTrailingSeparator().toString();
- File file = new File( rootURL );
-
- try
- {
- rootURL = file.toURL().toString();
-
- char lastChar = rootURL.charAt(rootURL.length()-1);
-
- if (lastChar == '/' || lastChar == '\\')
- {
- rootURL = rootURL.substring(0, rootURL.length()-1);
- }
- }
- catch (MalformedURLException murle)
- {
- }
-
- return rootURL;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
deleted file mode 100644
index 36cc921..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/beans/WSBeanAxisType.java
+++ /dev/null
@@ -1,267 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CheckAxisDeploymentDescriptorsTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.AxisBeanFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
-* This is the class for the
-* Java Bean
-* {@link org.eclipse.jst.ws.was.creation.ui.wizard.WebServiceServerRuntimeType WebServiceServerRuntimeType}.
-*/
-public class WSBeanAxisType implements WebServiceServerRuntimeType, CommandWidgetBinding
-{
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
-
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getName ()
- {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_NAME_BEANWAXIS");
- }
-
- /**
- * Returns a locale specific description of this Web Service type.
- * @return A locale specific description of this Web Service type.
- */
- public String getDescription ()
- {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_DESC_BEANWAXIS");
- }
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel()
- {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel)
- {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel()
- {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel)
- {
- runtimeName_ = runtimeLabel;
- }
-
- /**
- * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
- * @return A label for the Web Service type
- */
- public String getWebServiceTypeLabel()
- {
- return WebServiceAxisCreationUIPlugin.getMessage("%WEBSERVICETYPE_NAME_JAVA_AXIS");
- }
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired()
- {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule)
- {
- isWebModuleRequired_ = requireWebModule;
- }
-
-
- /**
- * Returns a string representation of this object.
- * @return A string representation of this object.
- */
- public String toString ()
- {
- return getName();
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
- return false;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- /*
- dataRegistry.addMapping( CurrentPageCommand.class, "CurrentPage", BeanClassWidget.class );
- //BeanClassWidget - as target
- dataRegistry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", BeanClassWidget.class, "BeanClassName", null);
- //BeanClassWidget - as source
- dataRegistry.addMapping(BeanClassWidget.class, "BeanClassName", DefaultsForServerJavaWSDLCommand.class, "JavaBeanName", null); //BeanConfigWidget
- */
- // ObjectSelectionWidget
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", DefaultsForServerJavaWSDLCommand.class);
-
- //BeanConfigWidget - as target
- dataRegistry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", BeanConfigWidget.class, "JavaParameter", null );
- //BeanConfigWidget - as source
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", LiteralSupportMessageTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AddJarsToProjectBuildPathTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
- //MappingFragment (optionally displays the AxisMappingsWidget)
- dataRegistry.addMapping(BeanConfigWidget.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
- //AxisMappingsWidget - as target
- dataRegistry.addMapping(BeanConfigWidget.class, "JavaParameter", AxisMappingsWidget.class);
-
- //AxisMappingsWidget - as source
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", LiteralSupportMessageTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", CheckAxisDeploymentDescriptorsTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", AddJarsToProjectBuildPathTask.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", Java2WSDLCommand.class, "JavaWSDLParam", null);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
-
- //dataRegistry.addMapping( DefaultsForConfig.class, "JavaParameter", BeanConfigWidget.class );
- //dataRegistry.addMapping( DefaultsForConfig.class, "CustomizeServiceMappings", BeanConfigWidget.class );
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.axis.creation.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- /*
- widgetRegistry.add( "BeanSelection",
- msgUtils.getMessage("PAGE_TITLE_WSBEAN_CLASS"),
- msgUtils.getMessage("PAGE_DESC_WSBEAN_CLASS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanClassWidget();
- }
- } );
- */
-
- widgetRegistry.add( "BeanConfig",
- msgUtils.getMessage("PAGE_TITLE_WSBEAN_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_WSBEAN_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new BeanConfigWidget();
- }
- } );
-
- String consPluginId_ = "org.eclipse.jst.ws.axis.consumption.ui";
- MessageUtils consMsgUtils = new MessageUtils( consPluginId_ + ".plugin", this );
-
- widgetRegistry.add( "AxisServiceBeanMapping",
- consMsgUtils.getMessage("PAGE_TITLE_WS_BEAN2XML"),
- consMsgUtils.getMessage("PAGE_DESC_P2N_MAPPINGS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_BEAN2XML );
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new AxisBeanFragment();
- }
- };
- }
-
-}
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
deleted file mode 100644
index 1114fde..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wizard/wsdl/WSWSDLAxisType.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl;
-
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsFragment;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.widgets.AxisMappingsWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.plugin.WebServiceAxisCreationUIPlugin;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLResourceFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-/**
-* This is the class for the Axis Web service type.
-*/
-public class WSWSDLAxisType implements WebServiceServerRuntimeType, CommandWidgetBinding
-{
- private WSDLResourceFilter filter_ = new WSDLResourceFilter();
-
- private String serverName_;
- private String runtimeName_;
- private boolean isWebModuleRequired_;
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getName() {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_NAME_WSDLAXIS");
- }
-
- /**
- * Returns a locale specific description of this Web Service type.
- * @return A locale specific description of this Web Service type.
- */
- public String getDescription() {
- return WebServiceAxisCreationUIPlugin.getMessage("%WS_DESC_WSDLAXIS");
- }
-
- /**
- * Returns a locale specific label for the Server supported by this Web Service type
- * @return A locale specific server label from server plugins
- */
- public String getServerLabel() {
- return serverName_;
- }
-
- /**
- * Sets the server label to the appropriate name found in the server plugins.
- * @param server name
- */
- public void setServerLabel(String serverLabel) {
- serverName_ = serverLabel;
- }
-
- /**
- * Returns a locale specific label for the deployment runtime of this Web Service type
- * @return A locale specific label for the deployment runtime
- */
- public String getRuntimeLabel() {
- return runtimeName_;
- }
-
- /**
- * Sets the runtime label for the appropriate runtime
- * @param server name
- */
- public void setRuntimeLabel(String runtimeLabel) {
- runtimeName_ = runtimeLabel;
- }
-
- /**
- * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
- * @return A label for the Web Service type
- */
- public String getWebServiceTypeLabel() {
- return WebServiceAxisCreationUIPlugin.getMessage(
- "%WEBSERVICETYPE_NAME_WSDL_AXIS");
- }
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired() {
- return isWebModuleRequired_;
- }
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule) {
- isWebModuleRequired_ = requireWebModule;
- }
-
- /**
- * Returns a string representation of this object.
- * @return A string representation of this object.
- */
- public String toString() {
- return getName();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#isEJBModuleRequired()
- */
- public boolean isEJBModuleRequired() {
-
- return false;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeType#setEJBModuleRequired(boolean)
- */
- public void setEJBModuleRequired(boolean arg0) {
- return;
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // SkeletonConfigWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", SkeletonConfigWidget.class, "ServerProject", new ProjectName2IProjectTransformer());
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "EndpointURI", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputWSDLFile", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "OutputJavaFolder", SkeletonConfigWidget.class);
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", SkeletonConfigWidget.class);
-
- // AxisMappingsFragment
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "ShowMapping", AxisMappingsFragment.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "ShowMapping", AxisMappingsFragment.class);
-
- // AxisMappingsWidget
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", AxisMappingsWidget.class, "JavaParameter", null);
-
- // WSDL2JavaCommand
- dataRegistry.addMapping(SkeletonConfigWidgetDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- dataRegistry.addMapping(SkeletonConfigWidget.class, "JavaWSDLParam", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisMappingsWidget.class, "JavaParameter", WSDL2JavaCommand.class, "JavaWSDLParam", null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- /*
- widgetRegistry.add( "WSDLSelection",
- msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionTreeWidget",
- msgUtils.getMessage("PAGE_TITLE_WSDL_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WSDL_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionTreeWidget();
- }
- });
- */
-
- widgetRegistry.add( "SkeletonConfig",
- msgUtils.getMessage("PAGE_TITLE_WSSKEL_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_WSSKEL_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new SkeletonConfigWidget();
- }
- } );
-
- widgetRegistry.add( "AxisMappingsWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_XML2BEAN"),
- msgUtils.getMessage("PAGE_DESC_N2P_MAPPINGS"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new AxisMappingsWidget(AxisMappingsWidget.MODE_XML2BEAN);
- }
- } );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new AxisSkeletonFragment();
- }
- };
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
deleted file mode 100644
index c5d1594..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisBeanConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BeanConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.beans.WSBeanAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisBeanConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor beanConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private BeanConfigWidget beanWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisBeanConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSBeanAxisType() );
-
- beanConfigWidget_ = adapter_.getWidget( "BeanConfig" );
- beanWidget_ = (BeanConfigWidget)beanConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisServiceBeanMapping" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return beanConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == beanConfigWidget_ && beanWidget_.getCustomizeServiceMappings() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
deleted file mode 100644
index cbab9b4..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisSkeletonConfigWidgetFactory.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidget;
-import org.eclipse.jst.ws.internal.axis.creation.ui.wizard.wsdl.WSWSDLAxisType;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetBindingToWidgetFactoryAdapter;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributor;
-import org.eclipse.wst.command.internal.provisional.env.ui.widgets.INamedWidgetContributorFactory;
-
-public class AxisSkeletonConfigWidgetFactory implements INamedWidgetContributorFactory {
-
- private INamedWidgetContributor skelConfigWidget_;
- private INamedWidgetContributor mappingsWidget_;
- private SkeletonConfigWidget skelWidget_;
- private WidgetBindingToWidgetFactoryAdapter adapter_;
-
- public AxisSkeletonConfigWidgetFactory()
- {
- adapter_ = new WidgetBindingToWidgetFactoryAdapter( new WSWSDLAxisType() );
-
- skelConfigWidget_ = adapter_.getWidget( "SkeletonConfig" );
- skelWidget_ = (SkeletonConfigWidget)skelConfigWidget_.getWidgetContributorFactory().create();
- mappingsWidget_ = adapter_.getWidget( "AxisMappingsWidget" );
- }
-
- public INamedWidgetContributor getFirstNamedWidget()
- {
- return skelConfigWidget_;
- }
-
- public INamedWidgetContributor getNextNamedWidget( INamedWidgetContributor widgetContributor)
- {
- return widgetContributor == skelConfigWidget_ && skelWidget_.getShowMapping() ? mappingsWidget_ : null;
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- adapter_.registerDataMappings( dataRegistry );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
deleted file mode 100644
index 83ed755..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java
+++ /dev/null
@@ -1,337 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.AxisDeployCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.Java2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.core.command.WSDL2JavaCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.AddJarsToProjectBuildPathTask;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.CopyAxisJarCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.RefreshProjectCommand;
-import org.eclipse.jst.ws.internal.axis.consumption.ui.task.ValidateWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisOutputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.AxisRunInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.BUAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.ComputeAxisSkeletonBeanCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.JavaToWSDLMethodCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.TDAxisInputCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.command.UpdateWEBXMLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.BUCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.DefaultsForServerJavaWSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.LiteralSupportMessageTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveDeploymentFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.MoveJavaFilesTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.Skeleton2WSDLCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.TDCheckAxisDeploymentDescriptors;
-import org.eclipse.jst.ws.internal.axis.creation.ui.task.UpdateAxisWSDDFileTask;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.AxisBeanFragment;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.bean.BUAxisDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.AxisSkeletonDefaultingCommand;
-import org.eclipse.jst.ws.internal.axis.creation.ui.widgets.skeleton.SkeletonConfigWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.WSINonCompliantRuntimeCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ProjectName2IProjectTransformer;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class AxisWebService extends AbstractWebService
-{
- private AxisWebServiceInfo axisWebServiceInfo_;
-
- public AxisWebService(WebServiceInfo info)
- {
- super(info);
- }
-
- public ICommandFactory assemble(Environment env, IContext ctx,
- ISelection sel, String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
-
- Vector commands = new Vector();
-
- if (ctx.getScenario().getValue() == WebServiceScenario.BOTTOMUP) {
-
- registerBUDataMappings( env.getCommandManager().getMappingRegistry());
-
- commands.add(new BUAxisInputCommand(this, project, module));
-// commands.add(new ValidateObjectSelectionCommand());
- commands.add(new BUAxisDefaultingCommand());
- commands.add(new WSINonCompliantRuntimeCommand());
- commands.add(new DefaultsForServerJavaWSDLCommand(module));
- commands.add(new JavaToWSDLMethodCommand());
- // commands.add(new SimpleFragment( "BeanConfig" ));
- // commands.add(new SimpleFragment( "AxisServiceBeanMapping" ));
- commands.add(new BUCheckAxisDeploymentDescriptors(module));
- commands.add(new LiteralSupportMessageTask());
- commands.add(new CopyAxisJarCommand(module));
- commands.add(new AddJarsToProjectBuildPathTask(module));
- commands.add(new WaitForAutoBuildCommand());
- commands.add(new Java2WSDLCommand());
- commands.add(new RefreshProjectCommand());
- commands.add(new WSDL2JavaCommand());
- commands.add(new MoveJavaFilesTask(module));
- commands.add(new UpdateAxisWSDDFileTask(module));
- commands.add(new UpdateWEBXMLCommand(module));
- commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
-
- registerTDDataMappings( env.getCommandManager().getMappingRegistry());
-
- commands.add(new TDAxisInputCommand(this, project, module));
- commands.add(new AxisSkeletonDefaultingCommand());
- commands.add(new ValidateWSDLCommand());
- commands.add(new SkeletonConfigWidgetDefaultingCommand(module));
-// commands.add(new SimpleFragment( "SkeletonConfig" ));
-// commands.add(new SimpleFragment( "AxisMappingsWidget" ));
- commands.add(new TDCheckAxisDeploymentDescriptors(module));
- commands.add(new CopyAxisJarCommand(module));
- commands.add(new AddJarsToProjectBuildPathTask(module));
- commands.add(new WSDL2JavaCommand());
- commands.add(new MoveDeploymentFilesTask(module));
- commands.add(new Skeleton2WSDLCommand(module));
- commands.add(new UpdateWEBXMLCommand(module));
- commands.add(new RefreshProjectCommand());
- commands.add(new BuildProjectCommand());
- commands.add(new AxisOutputCommand(this));
-
- } else {
- System.out.println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- }
-
-
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- return null;
- }
-
- public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear)
- {
- Vector commands = new Vector();
-
- if (ctx.getScenario().getValue() == WebServiceScenario.CLIENT) {
- System.out
- .println("Error - WebServiceScenario should not be Client for AxisWebService");
- return null;
- } else {// For BOTTOM_UP and TOP_DOWN
- commands.add(new AxisRunInputCommand(this, project, module));
-// commands.add(new StartProjectCommand(module));
- commands.add(new AxisDeployCommand());
- commands.add(new RefreshProjectCommand());
- if (ctx.getScenario().getValue() == WebServiceScenario.TOPDOWN) {
- commands.add(new ComputeAxisSkeletonBeanCommand());
- commands.add(new OpenJavaEditorCommand());
- }
- return new SimpleCommandFactory(commands);
- }
- }
-
- public void registerBUDataMappings(DataMappingRegistry registry)
- {
- //BUAxisInputCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "JavaBeanName", BUAxisDefaultingCommand.class );
-
- //ValidateObjectSelectionCommand
-// registry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ValidateObjectSelectionCommand.class);
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", ValidateObjectSelectionCommand.class,"ServiceProjectName", null );
-
- //BUAxisDefaultingCommand
-// registry.addMapping(SelectionCommand.class, "InitialSelection", BUAxisDefaultingCommand.class );
-//KSC registry.addMapping(BUAxisInputCommand.class, "ServiceTypeRuntimeServer", BUAxisDefaultingCommand.class );
-
- //WSINonCompliantRuntimeCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", WSINonCompliantRuntimeCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- //BUAxisCommands2 - these run after BeanClassWidget
- //DefaultsForServerJavaWSDLCommand
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaWSDLParam", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", DefaultsForServerJavaWSDLCommand.class, "ServiceProject", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "JavaBeanName", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "Parser", DefaultsForServerJavaWSDLCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "CustomizeServiceMappings", AxisBeanFragment.MappingFragment.class);
-
- //JavaWSDLMethodCommand
- registry.addMapping(DefaultsForServerJavaWSDLCommand.class, "JavaWSDLParam", JavaToWSDLMethodCommand.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", JavaToWSDLMethodCommand.class, "ServiceProject", new StringToIProjectTransformer());
-
- // BUAxisCommands3 - these run after BeanConfigWidget
- //LiteralSupportMessageTask
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", LiteralSupportMessageTask.class);
-
- //CheckAxisDeploymentDescriptorsTask
- //registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", CheckAxisDeploymentDescriptorsTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BUCheckAxisDeploymentDescriptors.class, "ServerProject", new StringToIProjectTransformer());
-
- //CopyAxisJarCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", new StringToIProjectTransformer());
-
- //AddJarsToProjectBuildPathTask
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", new StringToIProjectTransformer());
-
- //Java2WSDLCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", Java2WSDLCommand.class);
-
- //RefreshProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
- //WSDL2JavaCommand
- registry.addMapping(JavaToWSDLMethodCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
-
- //MoveJavaFilesTask
- registry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveJavaFilesTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", MoveJavaFilesTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateAxisWSDDFileTask
- registry.addMapping(MoveJavaFilesTask.class, "JavaWSDLParam", UpdateAxisWSDDFileTask.class);
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateAxisWSDDFileTask.class, "ServiceProject", new StringToIProjectTransformer());
-
- //UpdateWEBXMLCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", new StringToIProjectTransformer());
-
- //BuildProjectCommand
- registry.addMapping(BUAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", new StringToIProjectTransformer());
- registry.addMapping(BUAxisDefaultingCommand.class, "ForceBuild", BuildProjectCommand.class);
- registry.addMapping(BUAxisDefaultingCommand.class, "ValidationManager", BuildProjectCommand.class);
-
- //StartProjectCommand
-// registry.addMapping(BUAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", new StringToIProjectTransformer());
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleProject", StartProjectCommand.class);
-//KSC registry.addMapping(BUAxisDefaultingCommand.class, "ServiceServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleServerTypeID", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "ServiceExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "SampleExistingServer", StartProjectCommand.class);
-// registry.addMapping(BUAxisDefaultingCommand.class, "IsWebProjectStartupRequested",StartProjectCommand.class);
-
- // AxisOutputCommand
- registry.addMapping(Java2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
- registry.addMapping(UpdateAxisWSDDFileTask.class, "JavaWSDLParam", AxisOutputCommand.class);
-
- // Run extension
-
- //AxisDeployCommand
- registry.addMapping(AxisRunInputCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
- //RefreshProjectCommand
- registry.addMapping(AxisRunInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", new StringToIProjectTransformer());
-
-
-
- }
-
- public void registerTDDataMappings(DataMappingRegistry dataRegistry)
- {
- // Transformers
- ProjectName2IProjectTransformer projectTransformer = new ProjectName2IProjectTransformer();
-
- // TODO: map "InitialSelection" and "ObjectSelection" from TDAxisInputCommand
-
-// dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", AxisSkeletonDefaultingCommand.class);
-// dataRegistry.addMapping(TDAxisInputCommand.class, "WebServicesParser", AxisSkeletonDefaultingCommand.class);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "WsdlURI", AxisSkeletonDefaultingCommand.class);
- // ValidateWSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ValidateWSDLCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", ValidateWSDLCommand.class);
-
- // SkeletonConfigWidgetDefaultingCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", SkeletonConfigWidgetDefaultingCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", SkeletonConfigWidgetDefaultingCommand.class);
-
- // CheckAxisDeploymentDescriptorsTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", TDCheckAxisDeploymentDescriptors.class, "ServerProject", projectTransformer);
-
- // AddJarsToProjectBuildPathTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", AddJarsToProjectBuildPathTask.class, "Project", projectTransformer);
-
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WsdlURI", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthUsername", WSDL2JavaCommand.class);
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "HttpBasicAuthPassword", WSDL2JavaCommand.class);
-
-// WSDL2JavaCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "JavaWSDLParam", WSDL2JavaCommand.class);
-
- // MoveDeploymentFilesTask
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", MoveDeploymentFilesTask.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", MoveDeploymentFilesTask.class);
-
- // CopyAxisJarCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", CopyAxisJarCommand.class, "Project", projectTransformer);
-
- // Skeleton2WSDLCommand
- dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", Skeleton2WSDLCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", Skeleton2WSDLCommand.class, "ServerProject", projectTransformer);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", Skeleton2WSDLCommand.class);
-
- // UpdateWEBXMLCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", UpdateWEBXMLCommand.class, "ServerProject", projectTransformer);
-
- // RefreshProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", RefreshProjectCommand.class, "Project", projectTransformer);
-
- // BuildProjectCommand
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", BuildProjectCommand.class, "Project", projectTransformer);
-
- // StartProjectCommand
-// dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", StartProjectCommand.class, "ServiceProject", projectTransformer);
-// dataRegistry.addMapping(TDAxisInputCommand.class, "ServerServer", StartProjectCommand.class, "ServiceExistingServer", new ServerName2IServerTransformer());
-// dataRegistry.addMapping(CopyAxisJarCommand.class, "ProjectRestartRequired", StartProjectCommand.class, "IsWebProjectStartupRequested", null);
-
- // AxisDeployCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisDeployCommand.class);
-
- // AxisOutputCommand
- dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", AxisOutputCommand.class);
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", AxisOutputCommand.class);
-// dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", AxisOutputCommand.class);
-
- // ComputeAxisSkeletonBeanCommand
- dataRegistry.addMapping(WSDL2JavaCommand.class, "JavaWSDLParam", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(Skeleton2WSDLCommand.class, "WsdlURI", ComputeAxisSkeletonBeanCommand.class);
- //dataRegistry.addMapping(AxisSkeletonDefaultingCommand.class, "WebServicesParser", ComputeAxisSkeletonBeanCommand.class);
-
- // OpenJavaEditorCommand
- dataRegistry.addMapping(ComputeAxisSkeletonBeanCommand.class, "ClassNames", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(TDAxisInputCommand.class, "ServerProject", OpenJavaEditorCommand.class, "Project", projectTransformer);
- }
- public AxisWebServiceInfo getAxisWebServiceInfo() {
- return axisWebServiceInfo_;
- }
-
- public void setAxisWebServiceInfo(AxisWebServiceInfo axisWebServiceInfo) {
- axisWebServiceInfo_ = axisWebServiceInfo;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
deleted file mode 100644
index 1e7f78b..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceInfo.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.core.common.JavaWSDLParameter;
-
-public class AxisWebServiceInfo {
-
- private JavaWSDLParameter javaWSDLParameter;
-
- public JavaWSDLParameter getJavaWSDLParameter() {
- return javaWSDLParameter;
- }
-
- public void setJavaWSDLParameter(JavaWSDLParameter javaWSDLParameter) {
- this.javaWSDLParameter = javaWSDLParameter;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
deleted file mode 100644
index 38c8c87..0000000
--- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebServiceRuntime.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ws.internal.axis.creation.ui.wsrt;
-
-import org.eclipse.jst.ws.internal.axis.consumption.ui.wsrt.AxisWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-
-public class AxisWebServiceRuntime extends AbstractWebServiceRuntime
-{
-
- public IWebService getWebService(WebServiceInfo info)
- {
- return new AxisWebService(info);
- }
-
- public IWebServiceClient getWebServiceClient(WebServiceClientInfo info)
- {
- return new AxisWebServiceClient(info);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath b/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore b/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
deleted file mode 100644
index 491c19c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wsc-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/.project b/bundles/org.eclipse.jst.ws.consumption.ui/.project
deleted file mode 100644
index 7883728..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.discovery.core</project>
- <project>org.eclipse.jst.ws.ui</project>
- <project>org.eclipse.wst.wsdl</project>
- <project>org.eclipse.wst.ws.parser</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index bcd5bfb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,68 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc-ui.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.internal.consumption.ui.action,
- org.eclipse.jst.ws.internal.consumption.ui.command,
- org.eclipse.jst.ws.internal.consumption.ui.command.data,
- org.eclipse.jst.ws.internal.consumption.ui.common,
- org.eclipse.jst.ws.internal.consumption.ui.extension,
- org.eclipse.jst.ws.internal.consumption.ui.plugin,
- org.eclipse.jst.ws.internal.consumption.ui.preferences,
- org.eclipse.jst.ws.internal.consumption.ui.selection,
- org.eclipse.jst.ws.internal.consumption.ui.widgets,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.binding,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.object,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer,
- org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample,
- org.eclipse.jst.ws.internal.consumption.ui.wizard,
- org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi,
- org.eclipse.jst.ws.internal.consumption.ui.wsil,
- org.eclipse.jst.ws.internal.consumption.ui.wsrt
-Require-Bundle: org.eclipse.wst.ws.parser,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.wst.ws,
- org.eclipse.jem.workbench,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emf,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.jst.j2ee.webservices.ui,
- org.eclipse.wst.common.modulecore,
- org.eclipse.wst.ws.ui,
- org.wsdl4j,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/about.html b/bundles/org.eclipse.jst.ws.consumption.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties b/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
deleted file mode 100644
index 5587d1f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/build.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-source.wsc-ui.jar = src/
-bin.includes = wsc-ui.jar,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
-src.includes = schema/
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
deleted file mode 100644
index 8da3a21..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
deleted file mode 100644
index a113c85..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
deleted file mode 100644
index eaba51f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
deleted file mode 100644
index 1ee05fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
deleted file mode 100644
index 1060dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
deleted file mode 100644
index 590d396..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
deleted file mode 100644
index 68b7a26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
deleted file mode 100644
index 927ad5a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
deleted file mode 100644
index 641fe84..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
deleted file mode 100644
index a3061e6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
deleted file mode 100644
index afb6cb7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
deleted file mode 100644
index 53e7dbd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
deleted file mode 100644
index 11b34b7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
deleted file mode 100644
index 618a946..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
deleted file mode 100644
index 8fb844f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
deleted file mode 100644
index 7c5916f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
deleted file mode 100644
index ccd3738..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.properties
+++ /dev/null
@@ -1,121 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-FEATURE_DESCRIPTION=Web services
-
-XP_PUBLIC_UDDI_REGISTRY_TYPES=Public UDDI Registry Types
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
-XP_WEB_SERVICE_CLIENT_TYPES=Web Service Client Types
-XP_WEB_SERVICE_TEST=Web Service Test
-XP_WEB_SERVICE_SERVER_RUNTIME_TYPES=Web Service Server Runtime Types
-XP_WEB_SERVICE_CLIENT_PROJECT_TYPE=clientProjectType
-XP_OBJECT_SELECTION_WIDGET=objectSelectionWidget
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-PLUGIN_IMPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_CLIENT=Access an existing XML web service
-PLUGIN_IMPORT_WIZARD_DESC_WS=A wizard for importing a web service
-IMPORT_WIZARD_DESC_WSIL=Import WSDL references to a WSIL document
-
-#
-# Web Samples IDs
-#
-SAMPLE_TYPE_WEBSERVICES_ID=Web service sample JSPs
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-ACTION_GEN_SAMPLE=Generate Sample JSPs
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Hide Generate Java bean Proxy Dialog
-CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG=Hide Proxy To Sample Generation Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Hide the dialog for generating the Java bean proxy action.
-TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE=Hide the dialog for generating the sample application action.
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-
-PREFERENCE_CATEGORY_SERVER_RUNTIME=Server and Runtime
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_TEST_FACILITY=Test Facility Defaults
-PREFERENCE_CATEGORY_DIALOGS=Popup Dialog Selection
-
-
-#
-# Pop-up actions
-#
-MENU_RUN=&Run
-
-#
-# WebServiceTestPage
-#
-WSEXPLORER_ID=Web Services Explorer
-
-#
-# WebServicePublishPage
-#
-TOOLTIP_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-COMMAND_LAUNCH_WS_EXPLORER=Launch the Web Services Explorer
-
-#
-# PublicUDDIRegistryType
-#
-PUBLICUDDIREGISTRYTYPE_NAME_IBM=IBM UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST=IBM UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT=Microsoft UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST=Microsoft UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP=SAP UDDI Registry
-PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST=SAP UDDI Test Registry
-PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS=XMethods Registry
-PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM=NTT Communications Registry
-
-#
-# WSIL proxy
-#
-IMPORT_WIZARD_NAME_WSIL=WSIL
-POPUP_GENERATE_WSIL=Generate WSIL
-
-#
-# Web Service Server Runtime Type
-#
-WEBSERVICETYPE_NAME_WSDL=Skeleton Java bean Web Service
-WEBSERVICETYPE_NAME_JAVA=Java bean Web Service
-
-#
-# Client project type
-#
-LABEL_CLIENT_TYPE_WEB=Web
-LABEL_CLIENT_TYPE_EJB=EJB
-LABEL_CLIENT_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_TYPE_CONTAINERLESS=Java
-
-#
-# Handlers Configuration wizard page
-#
-POPUP_ADD_HANDLERS=Configure handlers
-LABEL_HANDLERS_CONFIG=Configure Handlers
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml b/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
deleted file mode 100644
index 35e1a56..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/plugin.xml
+++ /dev/null
@@ -1,786 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension-point
- id="publicUDDIRegistryType"
- name="%XP_PUBLIC_UDDI_REGISTRY_TYPES"/>
-
- <extension-point
- id="privateUDDIRegistryType"
- name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <extension-point
- id="webServiceClientType"
- name="%XP_WEB_SERVICE_CLIENT_TYPES"
- schema="schema/webServiceClientType.exsd"/>
-
- <extension-point
- id="webServiceTest"
- name="%XP_WEB_SERVICE_TEST"
- schema="schema/webServiceTest.exsd"/>
-
- <extension-point
- id="webServiceServerRuntimeType"
- name="%XP_WEB_SERVICE_SERVER_RUNTIME_TYPES"
- schema="schema/webServiceServerRuntimeType.exsd"/>
-
- <extension-point
- id="clientProjectType"
- name="%XP_WEB_SERVICE_CLIENT_PROJECT_TYPE"
- schema="schema/clientProjectType.exsd"/>
-
- <extension-point
- id="objectSelectionWidget"
- name="%XP_OBJECT_SELECTION_WIDGET"
- schema="schema/objectSelectionWidget.exsd"/>
-
- <!-- UDDI Registry Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBMTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_IBM"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryIBM">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoftTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryMicrosoft">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAPTest">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_SAP"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistrySAP">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryXMethods">
- </publicUDDIRegistryType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.publicUDDIRegistryType">
- <publicUDDIRegistryType
- name="%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM"
- class="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryNTTComm">
- </publicUDDIRegistryType>
- </extension>
-
- <!-- Test Facilities -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceTest">
-
- <webServiceTest
- methodsneeded="true"
- name="%SAMPLE_TYPE_WEBSERVICES_ID"
- java="true"
- codegen="true"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.WebServiceWSSampleExecutable"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest">
- </webServiceTest>
-
- <webServiceTest
- methodsneeded="false"
- name="%WSEXPLORER_ID"
- java="false"
- codegen="false"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorerExecutable">
- </webServiceTest>
-
- </extension>
-
- <!-- Java Beans -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_JAVA"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.web.WebNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.java">
- </webServiceType>
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_WSDL"
- resourceTypeMetadata="File IResource String ServiceImpl ServiceRefImpl WSDLResourceImpl"
- extensionMetadata=".wsdl .wsil .html .ServiceImpl .ServiceRefImpl .WSDLResourceImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.web.WebNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.wsdl">
- </webServiceType>
-
- </extension>
-
- <!-- Dynamic Wizards -->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_CLIENT"
- icon="icons/full/ctool16/newclient_webserv_wiz.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_CLIENT
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/webservicesclient_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ClientWidgetBinding"
- title="%WIZARD_TITLE_WSC"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/gen_sample_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.GenSampleWidgetBinding"
- title="%WIZARD_TITLE_WSC"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </dynamicWizard>
- </extension>
-
- <!-- extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigServiceHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </dynamicWizard>
- </extension -->
-
- <!-- extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigClientHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </dynamicWizard>
- </extension -->
-
- <!-- extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/config_handler_wiz.gif"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ConfigureHandlersWidgetBinding"
- title="%LABEL_HANDLERS_CONFIG"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
- </dynamicWizard>
- </extension -->
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- icon="icons/import_ws.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsimport">
- <description>
- %PLUGIN_IMPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/import_ws_wiz.gif"
- name="%PLUGIN_IMPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSWidgetBinding"
- id="wsimport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.importWizards">
- <wizard
- name="%IMPORT_WIZARD_NAME_WSIL"
- icon="icons/wsil/import_wsil.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsilimport">
- <description>
- %IMPORT_WIZARD_DESC_WSIL
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/wsil/import_wiz_banner_wsil.gif"
- name="%IMPORT_WIZARD_NAME_WSIL"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.binding.ImportWSILWidgetBinding"
- id="wsilimport">
- </dynamicWizard>
- </extension>
-
- <!-- Preference Pages -->
-
- <extension
- point="org.eclipse.ui.preferencePages">
-
- <page
- name="%PREFERENCE_CATEGORY_SERVER_RUNTIME"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage"
- id="org.eclipse.jst.ws.internal.consumption.ui.preferences.ServerRuntimePreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_DIALOGS"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.wst.command.internal.env.ui.preferences.ActionDialogsPreferencePage"
- id="org.eclipse.jst.wss.popup.category">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_TEST_FACILITY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ScenarioDefaultsPreferencePage">
- </page>
-
- <page
- name="%PREFERENCE_CATEGORY_PROJECT_TOPOLOGY"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ProjectTopologyPreferencePage">
- </page>
-
- </extension>
-
- <!-- Main Menu Actions -->
-
- <extension point="org.eclipse.ui.actionSets">
-
- <actionSet
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- visible="true"
- id="org.eclipse.jst.ws.consumption">
- <menu
- label="%MENU_RUN"
- path="additions"
- id="org.eclipse.ui.run">
- <separator name="explorer">
- </separator>
- </menu>
- <action
- label="%COMMAND_LAUNCH_WS_EXPLORER"
- icon="icons/registry.gif"
- tooltip="%TOOLTIP_LAUNCH_WS_EXPLORER"
- class="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction"
- menubarPath="org.eclipse.ui.run/explorer"
- toolbarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.LaunchWSEAction">
- </action>
- </actionSet>
-
- </extension>
-
- <!-- "Don't Show Me" Extensions -->
-
- <extension
- point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
- <actionDialogPreferenceType
- showcheckbox="true"
- name="%CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG"
- category="org.eclipse.jst.wss.popup.category"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY"
- infopop="org.eclipse.jst.ws.consumption.ui.PPAD0004"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_PROXY2SAMPLE_DIALOG"
- category="org.eclipse.jst.wss.popup.category"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_PROXY2SAMPLE"
- infopop="org.eclipse.jst.ws.consumption.ui.PPAD0005"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- showcheckbox="false"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- </actionDialogPreferenceType>
-
- <!-- actionDialogPreferenceType
- showcheckbox="false"
- alwayshide="false"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- </actionDialogPreferenceType -->
-
- </extension>
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- <action
- label="%ACTION_GEN_SAMPLE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- <action
- label="%ACTION_GEN_SAMPLE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.gensamplewizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <!-- objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservices.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers">
- </action>
- <visibility>
- <objectState
- name="type"
- value="Handlers">
- </objectState>
- </visibility>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.service">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="webservicesclient.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="ejb-jar.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="web.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="application-client.xml"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.editor">
- <action
- label="%POPUP_ADD_HANDLERS"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.handlers.client">
- </action>
- </objectContribution -->
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- <action
- label="%ACTION_GENERATE_JAVA_PROXY"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.wizard.client.genwsil">
- <action
- label="%POPUP_GENERATE_WSIL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="wsilimport">
- </action>
- </objectContribution>
-
- </extension>
-
- <!-- Client Project Types -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jst.j2ee.web.WebNature"
- exclude=""
- label="%LABEL_CLIENT_TYPE_WEB"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
- </clientProjectType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jdt.core.javanature"
- exclude="org.eclipse.jst.j2ee.web.WebNature org.eclipse.jst.j2ee.ejb.EJBNature org.eclipse.jst.j2ee.ApplicationClientNature"
- label="%LABEL_CLIENT_TYPE_CONTAINERLESS"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless">
- </clientProjectType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jst.j2ee.ejb.EJBNature"
- exclude=""
- label="%LABEL_CLIENT_TYPE_EJB"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB">
- </clientProjectType>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.clientProjectType">
- <clientProjectType
- include="org.eclipse.jst.j2ee.ApplicationClientNature"
- exclude=""
- label="%LABEL_CLIENT_TYPE_APP_CLIENT"
- id="org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient">
- </clientProjectType>
- </extension>
-
- <!-- Object Selection Widgets -->
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.objectSelectionWidget">
- <objectSelectionWidget
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- transformer="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionTransformer"
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget">
- </objectSelectionWidget>
- </extension>
-
- <!-- New extension points for WTP M4 -->
- <extension-point id="discovery" name="UI Browsers for implementation artifacts"/>
- <extension-point id="wsImpl" name="Web service implementations"/>
- <extension-point id="wsClientImpl" name="Web service client implementations"/>
- <extension-point id="serviceType" name="Extensions that provide unique combinations of service implementations, scenarios, and module types "/>
- <extension-point id="clientType" name="Extensions that provide unique combinations of client implementations and module types"/>
- <extension-point id="webServiceRuntime" name="Web service runtimes"/>
- <extension-point id="tester" name="Web service test facilities"/>
- <extension-point id="publisher" name="Web service publication facilities"/>
-
-<!-- M4 Extensions to the new extension points -->
-
-<!-- Test Extensions beginning -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"
- label="%SAMPLE_TYPE_WEBSERVICES_ID"
- testWSDL="no"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="true"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample.GSTCWebServiceTester">
- </tester>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.tester">
- <tester
- id="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WebServiceExplorer"
- label="%WSEXPLORER_ID"
- testWSDL="yes"
- wsClientImplIds="org.eclipse.jst.ws.client.type.java"
- moduletypes="webmodule"
- methodsneeded="false"
- class="org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer.WSEWebServiceTester">
- </tester>
-</extension>
-
-<!-- Test Extensions end -->
-
-<extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.wsImpl.java"
- label="%WEBSERVICETYPE_NAME_JAVA"
- resourceTypeMetadata="File IResource CompilationUnit"
- extensionMetadata=".java .class"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.JavaBeanSelectionWidget">
- </webServiceImpl>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.wsClientImpl">
- <webServiceClientImpl
- id="org.eclipse.jst.ws.client.type.java"
- label="Java Proxy">
- </webServiceClientImpl>
-</extension>
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.java"
- implId="org.eclipse.jst.ws.wsImpl.java"
- buModuleTypesInclude="jst.web"
- buModuleTypesExclude=""
- tdModuleTypesInclude="jst.web"
- tdModuleTypesExclude="">
- </serviceType>
-</extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
- <clientType
- id="org.eclipse.jst.ws.clientType.java.webOnly"
- implId="org.eclipse.jst.ws.client.type.java"
- moduleTypesInclude="jst.web"
- moduleTypesExclude="">
- </clientType>
-</extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.clientType">
- <clientType
- id="org.eclipse.jst.ws.clientType.java.j2ee"
- implId="org.eclipse.jst.ws.client.type.java"
- moduleTypesInclude="jst.web jst.ejb jst.appclient jst.utility"
- moduleTypesExclude="">
- </clientType>
-</extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
deleted file mode 100644
index 6995213..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/clientProjectType.exsd
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="clientProjectType" name="clientProjectType"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This extension point defines client container types.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="clientProjectType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.clientProjectType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="clientProjectType">
- <complexType>
- <attribute name="include" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type only works with these particular project types. For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="exclude" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type DOES NOT work with these particular project types. For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label represents this client project type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- A unique identifier for this client project type. This identifier is referenced in the clientProjectType attribute of the webServiceClientType element of an org.eclipse.jst.ws.consumption.ui.webServiceClientType extension.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
deleted file mode 100644
index 61cefe0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/objectSelectionWidget.exsd
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="objectSelectionWidget" name="objectSelectionWidget"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="objectSelectionWidget" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.objectSelectionWidget.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="objectSelectionWidget">
- <annotation>
- <documentation>
- This extension point entry allows an extender to add new ways of browsing/finding artifacts that can be used to create Web services.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="class" type="string" use="required">
- <annotation>
- <documentation>
- This class defines Selection Widget to be displayed on the Object Selection page of the Web services wizards. This class must implement the org.eclipse.jst.ws.consumption.ui.widgets.object.IObjectSelectionWidget interface.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This id uniquely identifies this objectSelectionWidget element.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="transformer" type="string">
- <annotation>
- <documentation>
- This attribute specifies a class that must implement the org.eclipse.wst.command.internal.provisional.env.core.data.Transformer interface. This interface contains a transform method. Even though the type of the input parameter and the return value are of type Object it is expected that they will be used with the type org.eclipse.jface.viewers.IStructuredSelection. This transformation method allows the extender to modify the initial selection to an IStructuredSelection object that is more readily usable by the runtime server type.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
deleted file mode 100644
index 3bbe2f2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceClientType.exsd
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="" id="webServiceClientType" name="Web Service Client Types"/>
- </appInfo>
- <documentation>
- This extension point defines Web Service Client types. This is done by defining webServiceClientType elements. These elements refer to a server and a Web Service runtime. These are respectively defined in the webServiceServer element and the webServiceRuntime element.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceClientType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceClientType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServer">
- <annotation>
- <documentation>
- This element specifies information about a particular server type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- This is the factory id for a server. This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this server should be used as the default server. Note: this default parameter is only used in the absence of other information. If the user has defined a particular server as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is a local ID for this server. The server attribute of the webserviceClientType element refers to this ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeTypeIds" type="string">
- <annotation>
- <documentation>
- This attribute is currently a place holder for future development. Please, do not use.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceRuntime">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services runtime.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label is displayed to the user for this runtime. Therefore, is must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of this Web Services runtime.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this runtime should be used as the default runtime. Note: this default parameter is only used in the absence of other information. If the user has defined a particular runtime as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="j2eeversion" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the J2EE versions supported by this runtime. The allowable values are 12, 13, and 14. If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be "12 13".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceClientType">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services client type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID for this Web Service Client type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- This is the name for this Web Service Client type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="clientType" type="string" use="required">
- <annotation>
- <documentation>
- This is the kind of Web Service Client type being defined. (ie. the value of the Java client is org.eclipse.jst.ws.client.type.java.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtime" type="string" use="required">
- <annotation>
- <documentation>
- This is the runtime ID for this Web Service client type. There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="server" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the server for this Web Service client type. There should be a corresponding webServiceServer element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="clientProjectType" type="string" use="default" value="org.eclipse.jst.ws.consumption.ui.clientProjectType.Web">
- <annotation>
- <documentation>
- This attribute contains a space delimited list of client project type ids supported by this by this webServiceClientType element. The client project type ids are defined by the org.eclipse.jst.ws.consumption.ui.clientProjectType extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="developBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE development phase. The Command and UI elements in this binding always come first in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="assemblyBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE assembly phase. The Command and UI elements in this binding always come after the development phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="deployBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE deploy phase. The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="installBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE install phase. The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
deleted file mode 100644
index ec44bca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceServerRuntimeType.exsd
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceServerRuntimeType" name="Web Service Server Runtime Types"/>
- </appInfo>
- <documentation>
- This extension point defines Web Service Server types. This is done by defining webServiceServerRuntimeType elements. These elements refer to a server and a Web Service runtime. These are respectively defined in the webServiceServer element and the webServiceRuntime element.
- </documentation>
- </annotation>
-
- <element name="extension">
- <complexType>
- <sequence>
- <element ref="webServiceServer" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceRuntime" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceServerRuntimeType" minOccurs="1" maxOccurs="unbounded"/>
- <element ref="webServiceType" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServer">
- <annotation>
- <documentation>
- This element specifies information about a particular server type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="factoryId" type="string" use="required">
- <annotation>
- <documentation>
- This is the factory id for a server. This id is defined by
-the org.eclipse.wst.server.core.serverTypes extension point.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this server should be used as the default server. Note: this default parameter is only used in the absence of other information. If the user has defined a particular server as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is a local ID for this server. The server attribute of the webserviceServerRuntimeType element refers to this ID.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtimeTypeIds" type="string">
- <annotation>
- <documentation>
- This attribute is currently a place holder for future development. Please, do not use.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceRuntime">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services runtime.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This label is displayed to the user for this runtime. Therefore, is must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="description" type="string">
- <annotation>
- <documentation>
- A description of this Web Services runtime.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="isDefault" type="boolean" use="required">
- <annotation>
- <documentation>
- This parameter indicates if this runtime should be used as the default runtime. Note: this default parameter is only used in the absence of other information. If the user has defined a particular runtime as their default then this parameter is ignored. Should contain a value of either "true" or "false".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="j2eeversion" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the J2EE versions supported by this runtime. The allowable values are 12, 13, and 14. If more than one J2EE version is supported each J2EE level should be specified with a blank delimiter.(eg. if J2EE version 1.2 and 1.3 are supported then this attribute string would be "12 13".
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceServerRuntimeType">
- <annotation>
- <documentation>
- This element specifies information about a particular Web Services server runtime type. An entry for this element defines a valid combination of server, runtime, and webservice type.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This is the ID for this Web Service Server Runtime type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string" use="required">
- <annotation>
- <documentation>
- This is the name for this Web Service Server Runtime type. It is displayed to the user so it must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="runtime" type="string" use="required">
- <annotation>
- <documentation>
- This is the runtime ID for this Web Service Server Runtime type. There should be a corresponding webServiceRuntime element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="server" type="string" use="required">
- <annotation>
- <documentation>
- This attribute specifies the server for this Web Service Server Runtime type. There should be a corresponding webServiceServer element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="type" type="string" use="required">
- <annotation>
- <documentation>
- This is the kind of Web Service Runtime type being defined. (eg. the value of a Java Bean Webservice is org.eclipse.jst.ws.type.java)
-There should be a corresponding webServiceType element with an attribute called id that has this value.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="developBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE development phase. The Command and UI elements in this binding always come first in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="assemblyBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE assembly phase. The Command and UI elements in this binding always come after the development phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="deployBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE deploy phase. The Command and UI elements in this binding always come after the assembly phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="installBinding" type="string">
- <annotation>
- <documentation>
- This attribute specifies a CommandWidgetBinding class. This class specifies the Commands and UI elements associate with J2EE install phase. The Command and UI elements in this binding always come after the deploy phase binding in the wizard.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="requireEJBModule" type="boolean" use="required">
- <annotation>
- <documentation>
- If the Webservice for this Server Runtime Type is required to be in an EJB module then the value of this attribute should be true.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="requireWebModule" type="boolean" use="required">
- <annotation>
- <documentation>
- If the Webservice for this Server Runtime Type is required to be in an Web module then the value of this attribute should be true.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceType">
- <annotation>
- <documentation>
- This element defines a particular Web service kind. Such as a Java Bean web service, a Skeleton Web service, an EJB Web service, etc.
- </documentation>
- </annotation>
- <complexType>
- <attribute name="id" type="string" use="required">
- <annotation>
- <documentation>
- This a unique ID for this Web service type. It is referenced in the webServiceServerRuntimeType element with the type attribute.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="label" type="string" use="required">
- <annotation>
- <documentation>
- This is a translatable label for this web service type.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="resourceTypeMetadata" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list class Names. (ie.No package prefix) The classes listed define the allowable Eclipse resources that this web service type understands and turn into a Web service. For example, if a user selects a Java source file in the package explorer view and then starts the Web services wizard a CompilationUnit object will be passed in as part of an IStructuredSelection. By putting "CompilationUnit" as one of the classes in this attribute it indicates that this type can create a Web service from the CompilationUnit.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="extensionMetadata" type="string" use="required">
- <annotation>
- <documentation>
- This attribute allows this Web service type to restrict names of the input files that it understands. For example, if the value is set to ".java .class" it indicates that this Web service type only understands resource names that end with .java or end with .class.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="objectSelectionWidget" type="string" use="required">
- <annotation>
- <documentation>
- On page 2 of the Web service wizard there is an Object selection page. This selection page can be customized using this attribute, since different Web service types may need different methods of selecting them. The value of this attribute should be the id of a org.eclipse.jst.ws.consumption.ui.objectSelectionWidget extension. The predefined id for a Java selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.JavaBeanSelectionWidget. The predefined id for a WSDL selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.WSDLSelectionWidget. The predefined id for an EJB selection widget is org.eclipse.jst.ws.consumption.ui.widgets.object.EJBSelectionWidget.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="includeNatures" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type only works with these particular project types. For example, if this type only works with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="excludeNatures" type="string" use="required">
- <annotation>
- <documentation>
- This attribute contains a blank delimited list of Project Nature Ids. The listed IDs indicate that this type DOES NOT work with these particular project types. For example, if this type does not work with web projects an ID of org.eclipse.jst.j2ee.web.WebNature would be specified.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd b/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
deleted file mode 100644
index e462b04..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/schema/webServiceTest.exsd
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.jst.ws.consumption.ui">
-<annotation>
- <appInfo>
- <meta.schema plugin="org.eclipse.jst.ws.consumption.ui" id="webServiceTest" name="Web Service Test"/>
- </appInfo>
- <documentation>
- [Enter description of this extension point.]
- </documentation>
- </annotation>
-
- <element name="extension">
- <annotation>
- <documentation>
- This extension point defines Web service test facilities that can be plugged into the Web services wizards.
- </documentation>
- </annotation>
- <complexType>
- <sequence>
- <element ref="webServiceTest" minOccurs="1" maxOccurs="unbounded"/>
- </sequence>
- <attribute name="point" type="string" use="required">
- <annotation>
- <documentation>
- The point attribute string must be org.eclipse.jst.ws.consumption.ui.webServiceTest.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
-
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <element name="webServiceTest">
- <complexType>
- <attribute name="methodsneeded" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates if this test facility need to methods from a proxy bean.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="name" type="string">
- <annotation>
- <documentation>
- The value of this attribute is displayed to the user for this test facility. It must be translated.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="java" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates whether this test facility is intended for clients that generate a Java bean as output.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="codegen" type="boolean">
- <annotation>
- <documentation>
- This attribute indicates if this test facility generates code or not, such as JSP files.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="class" type="string">
- <annotation>
- <documentation>
- This attribute contains a class name. The class must implement org.eclipse.jst.ws.ext.WebServiceExecutable. This class allows the extender to provide the Commands that will execute for this test facility.
- </documentation>
- </annotation>
- </attribute>
- <attribute name="id" type="string">
- <annotation>
- <documentation>
- This is a unique identifier for this test facility.
- </documentation>
- </annotation>
- </attribute>
- </complexType>
- </element>
-
- <annotation>
- <appInfo>
- <meta.section type="since"/>
- </appInfo>
- <documentation>
- [Enter the first release in which this extension point appears.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="examples"/>
- </appInfo>
- <documentation>
- [Enter extension point usage example here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="apiInfo"/>
- </appInfo>
- <documentation>
- [Enter API information here.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="implementation"/>
- </appInfo>
- <documentation>
- [Enter information about supplied implementation of this extension point.]
- </documentation>
- </annotation>
-
- <annotation>
- <appInfo>
- <meta.section type="copyright"/>
- </appInfo>
- <documentation>
-
- </documentation>
- </annotation>
-
-</schema>
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
deleted file mode 100644
index ea16f91..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties
+++ /dev/null
@@ -1,523 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-PLUGIN_NEW_WIZARD_NAME_WS_CLIENT=Web Service Client
-#
-# Web services "Internet" preferences extension.
-#
-
-#
-# Web Samples IDs
-#
-
-#
-# Pop-up actions
-#
-ACTION_GENERATE_JAVA_PROXY=Generate Client
-
-#
-# Dialogs
-#
-CHECKBOX_SHOW_GENERATE_JAVA_PROXY_DIALOG=Show Generate Java bean Proxy Dialog
-TOOLTIP_PPAD_CHECKBOX_WSDL2PROXY=Show the dialog for generating the Java bean proxy action.
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-#
-
-#
-# Preferences Tooltips
-#
-
-#
-#Server Runtime Preferences
-#
-TOOLTIP_SRPF_COMBO_SERVER=The preferred server type
-TOOLTIP_SRPF_COMBO_RUNTIME=The preferred Web service runtime
-TOOLTIP_SRPF_COMBO_J2EE=The preferred J2EE version
-
-#
-# Pop-up actions
-#
-
-#
-# General messages.
-#
-MSG_ERROR_TASK_EXCEPTED=IWAB0234E An internal error occurred. Details: {0}
-
-
-
-
-#
-#Runtime labels
-#
-
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Common wizard strings.
-#
-LABEL_FOLDER_NAME=Folder:
-LABEL_JSP_FOLDER_NAME=JSP folder:
-LABEL_WEB_PROJECT_NAME=Web project:
-LABEL_WEBSERVICETYPE=Web service type:
-LABEL_J2EE_VERSION=J2EE version:
-LABEL_NA=N/A
-
-BUTTON_BROWSE=Browse...
-BUTTON_BROWSE_FILES=Browse files...
-BUTTON_USE_ABSOLUTE_LOCATION=Use absolute location URI for WSDL input statements
-BUTTON_USE_INLINE_SCHEMA=Use inline schema
-
-BOTTOMUP_LABEL=Bottom up
-TOPDOWN_LABEL=Top down
-CLIENT_LABEL=Client
-
-
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSC=Web Service Client
-
-#
-# WebServiceClientSelectionPage
-#
-
-#
-# WebServiceServerSelectionPage
-#
-
-#
-# WebServiceProjectPage
-#
-PAGE_TITLE_WS_PROJECT=Web Services
-PAGE_DESC_WS_PROJECT=Review your Web service options and make any necessary changes before proceeding to the next page.
-BUTTON_START_WEB_PROJECT=Start Web service in Web project
-GROUP_SCENARIO_SERVICE=Service
-GROUP_SCENARIO_CLIENT=Client proxy
-LABEL_WEBSERVICECLIENTTYPE=Client proxy type:
-
-
-
-# Items common to WebServiceRuntimeSelectionPage and WebServiceClientRuntimeSelectionPage
-# WebServiceRuntimeSelectionPage
-PAGE_TITLE_WS_RUNTIME_SELECTION=Service Deployment Configuration
-PAGE_DESC_WS_RUNTIME_SELECTION=Choose from the list of runtimes and deployment servers, or use the default settings.
-LABEL_RUNTIMES_LIST=Web service runtime:
-LABEL_SERVERS_LIST=Server:
-LABEL_EDIT_BUTTON=Edit...
-LABEL_SERVICE_EAR_MODULE=Service EAR module:
-LABEL_CLIENT_EAR_MODULE=Client EAR module:
-LABEL_CLIENT_MODULE=Client module:
-LABEL_SERVICE_MODULE=Service module:
-LABEL_CLIENT_PROJECT=Client project:
-LABEL_SERVICE_PROJECT=Service project:
-LABEL_CLIENT_EAR_PROJECT=Client EAR project:
-LABEL_SERVICE_EAR_PROJECT=Service EAR project:
-
-#
-# Client component type labels
-#
-LABEL_CLIENT_COMP_TYPE_WEB=Web
-LABEL_CLIENT_COMP_TYPE_EJB=EJB
-LABEL_CLIENT_COMP_TYPE_APP_CLIENT=Application Client
-LABEL_CLIENT_COMP_TYPE_CONTAINERLESS=Java
-
-
-TOOLTIP_PWRS_TEXT_RUNTIME=The runtime to be used.
-TOOLTIP_PWRS_TEXT_SERVER=The server to be used.
-TOOLTIP_PWRS_J2EE_VERSION=J2EE version to be used.
-
-LABEL_SELECTION_VIEW_TITLE=Server-Side Deployment Selection:
-LABEL_SELECTION_VIEW_RUNTIME=Choose Web service runtime first
-LABEL_SELECTION_VIEW_SERVER=Choose server first
-LABEL_SELECTION_VIEW_EXPLORE=Explore options
-
-LABEL_TREE_EXISTING_SERVERS=Existing Servers
-LABEL_TREE_SERVER_TYPES=Server Types
-
-MSG_INVALID_SRT_SELECTIONS=This server and runtime combination is not supported. Choose a different server or runtime to proceed through the Web services wizard.
-MSG_NO_RUNTIME=No runtime specified for the {0} scenario.
-MSG_NO_SERVER=No server specified for the {0} scenario.
-
-MSG_SERVER_TARGET_MISMATCH=The project, {0}, has a server target which is not compatible with the selected server type
-MSG_J2EE_MISMATCH=The project, {0}, has a different J2EE level from the selected J2EE level
-MSG_SERVICE_PROJECT_EMPTY=The service project {0} cannot be empty. Select a service project {0}.
-MSG_SERVICE_EAR_EMPTY=The service EAR {0} cannot be empty. Select a service EAR {0}.
-MSG_CLIENT_PROJECT_EMPTY=The client project {0} cannot be empty. Select a client project {0}.
-MSG_CLIENT_EAR_EMPTY=The client EAR {0} cannot be empty. Select a client EAR {0}.
-MSG_INVALID_EJB_PROJECT={0} is not an EJB project. Choose an EJB project, or enter a new EJB project name.
-MSG_INVALID_WEB_PROJECT={0} is not a Web project. Choose a Web project, or enter a new Web project name.
-MSG_MODULE=module
-
-MSG_SAME_CLIENT_AND_SERVICE_EARS=Your selected service and client {0} modules have the same name. Proceeding with this configuration may result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS=Your selected service and client {0} modules have the same name. Proceeding with this configuration will result in runtime errors.
-MSG_SAME_CLIENT_AND_SERVICE_PROJECTS=Your selected service and client projects are the same. Proceeding with this configuration will result in errors.
-MSG_WRONG_CLIENT_PROJECT_TYPE=The selected client project, {0}, is not a {1} project. Please select a {1} project or enter a new project name.
-MSG_CLIENT_SUB=client
-MSG_SERVICE_SUB=service
-MSG_GENERAL_PROJECT_AND_EAR=Select the {0} project and the EAR project with which you want it to be associated.
-MSG_EAR_PROJECT_WILL_BE_CREATED=If an EAR or project does not exist or is currently unassociated, it will be created and \nassociated as required when you click Next.
-
-MSG_EAR_WILL_BE_ASSOCIATED=The selected {0} project will be associated with the EAR project.
-MSG_PROJECT_WILL_BE_CREATED=The {0} project will be created and associated with the EAR project.
-MSG_EAR_WILL_BE_CREATED=The {0} EAR project will be created and associated with the project.
-MSG_PROJECT_AND_EAR_CREATED=The {0} project and EAR project will be created and associated with one another.
-
-# WebServiceClientRuntimeSelectionPage
-PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION=Client Environment Configuration
-PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION=Choose from the list of supported runtimes and servers for the client environment, or use the default settings.
-
-LABEL_CLIENT_SELECTION_VIEW_TITLE=Client-Side Environment Selection:
-LABEL_CLIENT_TYPE=Client type:
-LABEL_WEB=Web
-LABEL_EJB=EJB
-LABEL_NO_LABEL=
-
-#
-# Items common to WebServiceMappingsPage, WebServiceMappingsPage (client), and WebServiceSOAPBindingPage
-#
-PAGE_MSG_VALIDATION_INTERNAL_ERROR=An internal error occurred during page validation. See logs for details.
-
-#
-# WebServiceMappingsPage
-#
-PAGE_TITLE_WS_XML2BEAN=Web Service Skeleton XML to Java Mappings
-PAGE_DESC_N2P_MAPPINGS=Define custom mapping for namespace to package.
-MSG_MAPPING_DUPLICATE_ENTRIES=Duplicate {0} mapped to the same {1}.
-
-
-#
-# The two ITEM_* strings are entries in a list box of mappings.
-# There are two forms, one when the page is in Java-to-XML mode:
-# <java-bean-name>, <encoding-style>
-# and one when the page is in XML-to-Java mode:
-# <xml-namespace-uri>:<xml-short-name>, <encoding-style>
-# where:
-# <java-bean-name> is a fully-qualified Java class name
-# <xml-namespace-uri> is the namespace of an XML type
-# <xml-short-name> is the XML type name within the namespace
-# <encoding-style> is the encoding style (SOAP or Literal XML)
-#
-
-#
-# WebServiceProxyPage
-#
-BUTTON_GENERATE_PROXY=Generate a proxy
-
-#
-# WebServiceSkeletonConfigPage
-#
-PAGE_DESC_WSSKEL_CONFIG=Define a skeleton Java bean as a Web service.
-PAGE_TITLE_WSSKEL_CONFIG=Web Service Skeleton Java Bean Configuration
-TOOLTIP_PBSC_TEXT_SKELETON_FOLDER=Folder for generated Java skeleton.
-TOOLTIP_PBSC_BUTTON_SKELETON_FOLDER_BROWSE=Browse folders.
-LABEL_SKELETON_ROOT_NAME=Skeleton folder:
-
-#
-# WebServiceBeanClassPage
-#
-LABEL_BEAN_CLASS_NAME=Bean:
-PAGE_MSG_BEAN_CANNOT_BE_EMPTY=Please select a Java bean class.
-BUTTON_BROWSE_CLASSES=Browse classes...
-
-
-#
-# WebServiceTestPage
-#
-PAGE_TITLE_WSTEST=Web Service Test Page
-PAGE_DESC_WSTEST=Select a test facility
-LABEL_TEST_TYPES=Test Facility
-CHECKBOX_TEST_WEBSERVICE=Test the Web service
-CHECKBOX_MONITOR_WEBSERVICE=Monitor the Web service
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=An error occurred. Unable to launch WSDL test facility.
-
-#
-# WebServiceExplorerPage
-#
-BUTTON_LAUNCH_SERVICE_TEST=Launch
-
-#
-# WebServiceClientTestPage
-#
-PAGE_TITLE_WS_SAMPLE=Web Service Client Test
-PAGE_DESC_WS_SAMPLE=Do you want to test the generated proxy?
-BUTTON_TEST=Test the generated proxy
-LABEL_TEST_TYPES=Test facility
-BUTTON_RUN_TEST=Run test on server
-LABEL_METHODS=Methods
-MSG_ERROR_JTS_JSP_GEN=IWAB0313E Error encountered while generating the sample.
-LABEL_JSP_PROJECT_NAME=JSP project:
-MSG_ERROR_JTS_PROXY_NOT_COMPILED=IWAB0357E The Generated proxy was not found. WebService sample jsps cannot be generated.
-MSG_ERROR_MALFORMED_URL=IWAB0358E Test client URL is malformed.
-
-#
-# WebServiceISDPage
-#
-
-#
-# WebServiceBeanConfigPage
-#
-
-#
-# WebServiceBeanMethodsPage
-#
-BUTTON_SELECT_ALL=Select All
-BUTTON_DESELECT_ALL=Deselect All
-TOOLTIP_PBME_BUTTON_SELECT_ALL=Select all methods
-TOOLTIP_PBME_BUTTON_DESELECT_ALL=Deselect all methods
-
-#
-# WebServiceEJBConfigPage
-#
-
-#
-# WebServiceWSDLSelectionPage
-#
-PAGE_TITLE_WSDL_SELECTION=Web Service WSDL File Selection
-PAGE_DESC_WSDL_SELECTION=Select a WSDL file.
-
-
-#
-# WebServicePublishPage
-#
-PAGE_TITLE_WS_PUBLISH=Web Service Publication
-PAGE_DESC_WS_PUBLISH=Do you want to publish your Web service?
-PAGE_TITLE_WS_FIND=Find a Web service
-PAGE_DESC_WS_FIND=Do you want to find a Web service?
-BUTTON_WS_PUBLISH=Launch the Web Services Explorer to publish this Web service to a UDDI Registry
-BUTTON_WS_PUBLISH_PRIVATE_UDDI=Launch the Web Services Explorer to publish this Web service to the Unit Test UDDI Registry
-BUTTON_WS_FIND=Launch the Web Services Explorer to find a Web service from a UDDI Registry
-BUTTON_WS_FIND_PRIVATE_UDDI=Launch the Web Services Explorer to find a Web service from the Unit Test UDDI Registry
-LABEL_PUBLIC_UDDI_REGISTRIES=Public UDDI Registry
-
-#
-# EJB UI strings
-#
-LABEL_EJB_BEAN_NAME=EJB bean
-TABLE_TITLE_EJB_BEAN_NAMES=Stateless EJB beans
-TABLE_TITLE_EJB_PROJECT_NAME=EJB project
-LABEL_EAR_PROJECTS=EAR projects
-TOOLTIP_EAR_PROJECTS=Enterprise application projects.
-TOOLTIP_TABLE_BEAN_NAMES=Select an EJB.
-
-#
-# Tooltips for WebServiceWSDLSelectionPage
-#
-TOOLTIP_PWWS_PAGE=
-
-#
-# Tooltips for beans.WebServiceBeanClassPage
-#
-TOOLTIP_PBCL_PAGE=
-TOOLTIP_PBCL_TEXT_BEAN_CLASS=Selected Java bean.
-TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE=Browse classes.
-TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE=Browse Java files.
-
-
-#
-# Tooltips for beans.WebServiceTestPage
-#
-TOOLTIP_PSTP_COMBOBOX_TEST=Test facilities available to test the service.
-TOOLTIP_PSTP_LAUNCH_BUTTON=Launch the selected test facility.
-
-
-
-
-#
-# Tooltips for WebServiceRuntimeSelectionPage
-#
-TOOLTIP_PWRS_PAGE=
-TOOLTIP_PWRS_LIST_RUNTIMES=Select from the following deployment runtime(s).
-TOOLTIP_PWRS_LIST_SERVERS=Select from application server(s).
-TOOLTIP_PWRS_RADIO_SERVER=Server oriented selection.
-TOOLTIP_PWRS_RADIO_RUNTIME=Runtime oriented selection.
-TOOLTIP_PWRS_RADIO_EXPLORE=Explore combinations.
-TOOLTIP_PWRS_COMBO_PROJECT=Web project.
-
-#
-# Tooltips for WebServiceClientRuntimeSelectionPage
-#
-TOOLTIP_PWCR_COMBO_CLIENT_TYPE=Client type.
-
-
-#
-# Tooltips for WebServiceProjectPage
-#
-TOOLTIP_PWPR_COMBO_TYPE=Web service implementation type.
-TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE=Service defaults for this wizard scenario.
-TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY=Enable/disable proxy generation for this scenario.
-TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT=Start Web service in Web project for this scenario.
-TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS=Launch the Web Services Explorer to publish the Web service in this scenario to a UDDI Registry.
-TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE=Select this to explore the Web service created.
-TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE=Select this to monitor the SOAP traffics of this Web service.
-TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT=Client proxy defaults for this wizard scenario.
-TOOLTIP_PWPR_COMBO_CLIENTTYPE=Client proxy selection type.
-
-#
-# Tooltips for WebServicePublishPage
-#
-TOOLTIP_PWPB_PAGE=
-TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH=Publish the Web service.
-
-
-#
-# WSIL proxy
-#
-
-PAGE_WSIL_IMPORT=WSIL Import Page
-TITLE_WSIL_IMPORT=WSIL Import
-DESC_WSIL_IMPORT=Import WSDL references to a WSIL document
-PAGE_TITLE_WS_SELECTION=Web Service Selection Page
-PAGE_DESC_WS_SELECTION=Enter a web service URI.
-
-PAGE_MSG_LOADING_WEB_SERVICE_URI=Loading Web service URI...
-PAGE_MSG_INVALID_WEB_SERVICE_URI=Invalid Web service URI. Enter an URI to a WSDL, WSIL or HTML document.
-PAGE_MSG_NO_SUCH_FILE=File "{0}" does not exists.
-PAGE_MSG_SELECTION_MUST_BE_WSDL=Selection must be WSDL.
-PAGE_MSG_INVALID_WSIL_FILE_NAME=Invalid WSIL file name. WSIL file name must end with .wsil
-
-
-
-MSG_ERROR_URI_NOT_RESOLVABLE=IWAB0469E "{0}" is not resolvable.
-MSG_ERROR_WSDL_HAS_NO_SERVICE_ELEMENT=IWAB0551E WSDL file at {0} has no service element.
-
-LABEL_WSIL_URI=WSIL URI:
-LABEL_BROWSE=Browse
-LABEL_WSDL=WSDL:
-LABEL_WSDL_URI=WSDL URI
-LABEL_IMPORT=Import...
-LABEL_ADD=Add
-LABEL_REMOVE=Remove
-LABEL_WS_SELECTION=Enter an URI to a WSDL, WSIL or HTML document:
-LABEL_SELECT_WSDL=Select a WSDL
-
-
-TOOLTIP_WSIL_IMPORT_PAGE=This page allows you to add WSDL references to a WSIL document.
-TOOLTIP_WSIL_TEXT_WSIL=Enter the location of a new or existing WSIL document.
-TOOLTIP_WSIL_BUTTON_BROWSE_WSIL=Browse for a WSIL document.
-TOOLTIP_WSIL_TABLE_WSDL=Enter the URIs of the WSDLs that are going to be added as service references.
-TOOLTIP_PCON_PAGE=Select a web service for consumption.
-TOOLTIP_PCON_TEXT_WS=Enter an URI to a WSDL, WSIL or HTML document.
-TOOLTIP_PCON_BUTTON_BROWSE_WS=Browse for a web service resource.
-
-#
-# Tooltips for client.WebServiceClienTestPage
-#
-TOOLTIP_PWSM_PAGE=
-TOOLTIP_PWSM_CHECKBOX_TEST=Enable/disable Test.
-TOOLTIP_PWSM_COMBOBOX_TEST=Select the test type.
-TOOLTIP_PWSM_CHECKBOX_LAUNCH=Run test on a server.
-TOOLTIP_PWSM_TEXT_JSP_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE=Browse folders.
-TOOLTIP_PWSM_BUTTON_SELECT_ALL=Select all methods.
-TOOLTIP_PWSM_BUTTON_DESELECT_ALL=Deselect all methods.
-TOOLTIP_PWSM_COMBO_PROJECT=Web project for generated sample.
-TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER=Destination folder of generated sample files.
-TOOLTIP_PWSM_TREE_METHODS=Methods to generate into the sample.
-TOOLTIP_PWSM_EAR_PROJECT=EAR project for the generated sample.
-
-#
-# HTTP Basic Auth
-#
-DIALOG_TITLE_HTTP_BASIC_AUTH=HTTP Basic Authentication
-LABEL_URL=URL:
-LABEL_HTTP_BASIC_AUTH_USERNAME=User name:
-LABEL_HTTP_BASIC_AUTH_PASSWORD=Password:
-
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=Enter your HTTP basic authentication user name.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Enter your HTTP basic authentication password.
-
-#
-# Web Service Server Runtime Type
-#
-
-
-#
-# Client project type
-#
-
-#
-# Generate Handler Skeleton
-#
-TASK_LABEL_GEN_HANDLER_SKELETON=Generate handler skeleton command
-TASK_DESC_GEN_HANDLER_SKELETON=Generate handler skeleton command
-MSG_ERROR_GENERATE_HANDLER_SKELETON=IWAB0359E Error in generating handler skeleton.
-MSG_ERROR_WRITE_FILE=IWAB0360E Error in writing file {0}.
-
-#
-# Handlers Configuration wizard page
-#
-LABEL_HANDLERS_CONFIG=Handler Configuration
-LABEL_BUTTON_ADD=Add
-LABEL_BUTTON_REMOVE=Remove
-LABEL_BUTTON_MOVE_UP=Move Up
-LABEL_BUTTON_MOVE_DOWN=Move Down
-LABEL_BUTTON_GEN_SKELETON=Generate skeleton classes for new handlers
-LABEL_COMBO_SOURCE_LOC=Output folder:
-LABEL_COMBO_WS_CLIENT_REF=Client Service Reference:
-LABEL_COMBO_WS_SERVICE_DESC=Service Description:
-
-LABEL_HANDLER_NAME=Name
-LABLE_HANDLER_CLASS=Class Name
-LABEL_HANDLER_PORT=Port Name
-
-DIALOG_TITLE_WS_ADD_HANDLER=Add New Handler
-LABEL_TEXT_HANDLER_NAME=Name:
-LABEL_TEXT_HANDLER_CLASS=Class name:
-LABEL_TEXT_HANDLER_PORT=Port name:
-
-PAGE_TITLE_SERVICE_HDLR_CONFIG=Service Handlers Configuration
-PAGE_DESC_SERVICE_HDLR_CONFIG=Configure service-side handlers
-PAGE_TITLE_CLIENT_HDLR_CONFIG=Client Handlers Configuration
-PAGE_DESC_CLIENT_HDLR_CONFIG=Configure client-side handlers
-
-TOOLTIP_EDIT_WS_HANDLERS=Configure Web Service Handlers
-TOOLTIP_BUTTON_GEN_SKELETON=Select to generate skeleton classes for new handlers.
-TOOLTIP_COMBO_SOURCE_LOC=Select the output location for file generation.
-TOOLTIP_TEXT_HANDLER_NAME=Handler name
-TOOLTIP_TEXT_HANDLER_CLASS=Handler class name
-TOOLTIP_TEXT_HANDLER_PORT=Handler port component name
-TOOLTIP_WS_CLIENT_REF=Select a client service-reference to show its handlers.
-TOOLTIP_WS_SERVICE_DESC=Select a service description to show its handlers.
-
-#
-# OpenJavaEditorCommand
-#
-MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR=IWAB0029E Unable to open class {0} from project {1} in the Java editor.
-
-#
-# CheckIfServiceProject
-#
-MSG_WARN_IS_SERVICE_PROJECT=The selected client project, {0}, contains the Web service. Proceeding with this configuration may result in runtime errors when invoking the Web service. Would you like to proceed?
-MSG_USER_ABORTED=User pressed cancel in warning dialog which warned about the selected client project being the service project.
-
-
-#
-# Missing third party file error message
-#
-MSG_MISSING_THIRD_PARTY_FILES=Missing third party files. Refer to http://www.eclipse.org/webtools/wst/components/ws/download_instructions_for_jars.html
-
-#
-# WSDLSelectionOutputCommand
-#
-MSG_WARNING_NO_SERVICE_ELEMENT=The WSDL file does not contain a Service element. Therefore a service interface and Java proxy will not be generated and as a result, a Java test client will not be launched. Click OK to proceed, or click Cancel to select another WSDL file. Alternately, exit the wizard and use the WSDL editor to create a Service WSDL document.
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
deleted file mode 100644
index 672f960..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/action/LaunchWSEAction.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.action;
-
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-
-public class LaunchWSEAction implements IWorkbenchWindowActionDelegate
-{
- public void run(IAction action)
- {
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseProgressMonitor monitor = new EclipseProgressMonitor();
- TransientResourceContext context = new TransientResourceContext();
- EclipseEnvironment environment = new EclipseEnvironment( null, context, monitor, handler );
- WSExplorerLauncherCommand cmd = new WSExplorerLauncherCommand();
-
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- LaunchOption[] launchOptions = new LaunchOption[] {
- new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation),
- new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation)
- };
- cmd.setLaunchOptions(launchOptions);
- cmd.execute( environment );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#dispose()
- */
- public void dispose() { }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWindowActionDelegate#init(org.eclipse.ui.IWorkbenchWindow)
- */
- public void init(IWorkbenchWindow window) { }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection) { }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
deleted file mode 100644
index 56f58a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/CheckForServiceProjectCommand.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
- * This command checks to see if the selected client project is the
- * service project. If so, the user is warned.
- */
-public class CheckForServiceProjectCommand extends SimpleCommand
-{
- MessageUtils msgUtils;
- SelectionListChoices runtime2ClientTypes;
- String wsdlURI;
- WebServicesParser webServicesParser;
-
- public CheckForServiceProjectCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public void setRuntime2ClientTypes( SelectionListChoices runtime2ClientTypes )
- {
- this.runtime2ClientTypes = runtime2ClientTypes;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment)
- {
- Status status = new SimpleStatus("");
- if (runtime2ClientTypes==null || wsdlURI==null || wsdlURI.length()==0 || webServicesParser==null)
- return status;
-
- String clientProjectName = runtime2ClientTypes.getChoice().getChoice().getList().getSelection();
- if (clientProjectName==null || clientProjectName.length()==0)
- return status;
-
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- ValidationUtils vu = new ValidationUtils();
- Calendar cal = new GregorianCalendar();
- boolean isServiceProject = vu.isProjectServiceProject(clientProject, wsdlURI, webServicesParser);
- if (isServiceProject)
- {
- Status wStatus = new SimpleStatus("", msgUtils.getMessage("MSG_WARN_IS_SERVICE_PROJECT", new String[]{clientProjectName}), Status.WARNING);
- try
- {
- environment.getStatusHandler().report(wStatus);
- }
- catch (StatusException se)
- {
- //User decided to abort. Return an error status
- Status eStatus = new SimpleStatus("", msgUtils.getMessage("MSG_USER_ABORTED"), Status.ERROR);
- return eStatus;
- }
- }
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
deleted file mode 100644
index bb26226..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/GenerateHandlerSkeletonCommand.java
+++ /dev/null
@@ -1,257 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-public class GenerateHandlerSkeletonCommand extends SimpleCommand
-{
-
- private IProject serviceProject_;
- private MessageUtils msgUtils_;
-
- private String LABEL = "TASK_LABEL_GEN_HANDLER_SKELETON";
- private String DESCRIPTION = "TASK_DESC_GEN_HANDLER_SKELETON";
-
- private IPath outputLocation_;
- private String[] handlerNames_;
- private boolean genSkeleton_;
- private String handlerNameForEdit_ = null;
-
- public GenerateHandlerSkeletonCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
-
- public Status execute (Environment env)
- {
-
- if (!genSkeleton_)
- return new SimpleStatus("");
-
- int i;
- boolean error = false;
- boolean warning = false;
-
- SimpleStatus status = null;
- Status writeStatus;
-
-
- for (i=0; i<handlerNames_.length; i++) {
- writeStatus = writeFile(env, handlerNames_[i], outputLocation_);
- // handle status return
- if (writeStatus.getSeverity() == Status.ERROR) { // write status is OK or ERROR
- error = true;
- if (status == null) {
- status = new SimpleStatus( "execute", msgUtils_.getMessage("MSG_ERROR_GENERATE_HANDLER_SKELETON"), Status.ERROR);
- }
- status.addChild(writeStatus);
- }
- }
- if (error) {
- env.getStatusHandler().reportError(status);
- } else {
- status = new SimpleStatus( "" );
- }
- return status;
- }
-
- public Status writeFile (Environment env, String className, IPath outputLocation)
- {
- Status status = new SimpleStatus("");
- int index;
-
- String simpleClassName = className;
- String packageName = null;
- IPath filePath = outputLocation;
- if (className != null) {
- index = className.lastIndexOf('.');
- if (index != -1) {
- simpleClassName = className.substring(index + 1);
- packageName = className.substring(0, index);
-
- String packageSegment = packageName;
- int j = 0;
- j = packageSegment.indexOf('.');
- while (j != -1) {
- filePath = filePath.append(packageSegment.substring(0, j));
- packageSegment = packageSegment.substring(j + 1);
- j = packageSegment.indexOf('.');
- }
- filePath = filePath.append(packageSegment);
- }
- else {
- packageName = "";
- }
- }
-
- filePath = filePath.append(simpleClassName);
-
- filePath = filePath.addFileExtension("java");
-
- // check if Handler already exists; do not overwrite existing Handlers
- IResource workspaceRes = ResourceUtils.findResource(filePath);
- if (workspaceRes!=null && workspaceRes.exists()) {
- return status;
- }
-
- if (handlerNameForEdit_ == null){
- handlerNameForEdit_ = className;
- }
-
- OutputStream outputStream = FileResourceUtils.newFileOutputStream( EnvironmentUtils.getResourceContext(env), filePath, env.getProgressMonitor(), env.getStatusHandler());
- // create buffered writer for writing file
- BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(outputStream));
- try {
- if (packageName.length() != 0) {
- bw.write("package " +packageName+";");
- bw.newLine();
- bw.newLine();
- }
- bw.write("import javax.xml.rpc.handler.GenericHandler;");
- bw.newLine();
- bw.write("import javax.xml.rpc.handler.MessageContext;");
- bw.newLine();
- bw.write("import javax.xml.namespace.QName;");
- bw.newLine();
- bw.newLine();
-
- bw.write("public class "+simpleClassName+" extends GenericHandler");
- bw.newLine();
- bw.write("{");
- bw.newLine();
- bw.newLine();
-
- bw.write(" public QName[] getHeaders ()");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body");
- bw.newLine();
- bw.write(" return null;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleRequest( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleResponse( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler ");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
- bw.newLine();
- bw.write(" public boolean handleFault( MessageContext context )");
- bw.newLine();
- bw.write(" {");
- bw.newLine();
- bw.write(" // Fill in method body or delete method to use GenericHandler");
- bw.newLine();
- bw.write(" return true;");
- bw.newLine();
- bw.write(" }");
- bw.newLine();
-
- bw.newLine();
- bw.write("}");
- bw.close();
- status = new SimpleStatus( "" );
- } catch (IOException e) {
- status = new SimpleStatus( "writeFile", msgUtils_.getMessage("MSG_ERROR_WRITE_FILE", new String[]{ className }), Status.ERROR, e );
- if (bw != null) {
- try {
- bw.close();
- } catch (IOException e1) {
- }
- }
- }
- return status;
- }
-
- public Status undo(Environment environment)
- {
- return null;
- }
-
- public Status redo(Environment environment)
- {
- return null;
- }
-
- public void setOutputLocation(IPath outputLocation)
- {
- this.outputLocation_ = outputLocation;
- }
-
- public void setHandlerNames (String[] handlerNames)
- {
- this.handlerNames_ = handlerNames;
- }
-
- public void setGenSkeletonEnabled(boolean genSkeleton)
- {
- this.genSkeleton_ = genSkeleton;
- }
-
- public IProject getProject(){
- IProject project = null;
- if (outputLocation_!=null){
- project = ResourceUtils.getProjectOf(outputLocation_);
- }
- return project;
- }
-
- public List getClassNames(){
- List classes = new ArrayList();
- if (handlerNameForEdit_!=null){
- classes.add(handlerNameForEdit_);
- }
- return classes;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
deleted file mode 100644
index 77efef8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/OpenJavaEditorCommand.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.progress.UIJob;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class OpenJavaEditorCommand extends SimpleCommand
-{
- private List classNames;
- private IProject project;
-
- public OpenJavaEditorCommand()
- {
- }
-
- public Status execute(Environment environment)
- {
- OpenJavaEditorJob job = new OpenJavaEditorJob(classNames, project);
- job.setPriority(Job.LONG);
- job.schedule();
- return new SimpleStatus("");
- }
-
- public void setClassNames(List classNames)
- {
- this.classNames = classNames;
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
- private class OpenJavaEditorJob extends UIJob
- {
- private List classNames;
- private IProject project;
-
- public OpenJavaEditorJob(List classNames, IProject project)
- {
- super("org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorJob");
- this.classNames = classNames;
- this.project = project;
- }
-
- public IStatus runInUIThread(IProgressMonitor monitor)
- {
- if (project != null && classNames != null)
- {
- IJavaProject javaProject = JavaCore.create(project);
- for (Iterator it = classNames.iterator(); it.hasNext();)
- {
- String className = (String)it.next();
- try
- {
- IType type = javaProject.findType(className);
- JavaUI.openInEditor(type);
- }
- catch (Throwable t)
- {
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{className, project.getName()}), t);
- }
- }
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.OK, WebServiceConsumptionUIPlugin.ID, 0, "", null);
- }
- else
- return new org.eclipse.core.runtime.Status(org.eclipse.core.runtime.Status.ERROR, WebServiceConsumptionUIPlugin.ID, 0, WebServiceConsumptionUIPlugin.getMessage("MSG_ERROR_UNABLE_TO_OPEN_JAVA_EDITOR", new String[]{classNames != null ? classNames.toString() : "", project != null ? project.getName() : ""}), null);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
deleted file mode 100644
index 51d4f6f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/WSINonCompliantRuntimeCommand.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIAPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSISSBPContext;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.WSIComplianceUtils;
-
-
-
-public class WSINonCompliantRuntimeCommand extends SimpleCommand
-{
-
- private IProject serviceProject_;
- private MessageUtils msgUtils_;
-
- private String LABEL = "TASK_LABEL_WSI_NONCOMPLIANT";
- private String DESCRIPTION = "TASK_DESC_WSI_NONCOMPLIANT";
-
- public WSINonCompliantRuntimeCommand()
- {
- String pluginId = "org.eclipse.wst.ws.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- setName (msgUtils_.getMessage(LABEL));
- setDescription( msgUtils_.getMessage(DESCRIPTION));
- }
-
-
- public Status execute (Environment environment)
- {
-
- PersistentWSISSBPContext wsiSSBPContext = WSUIPlugin.getInstance().getWSISSBPContext();
- PersistentWSIAPContext wsiAPContext = WSUIPlugin.getInstance().getWSIAPContext();
- Vector statusSSBP = new Vector();
- statusSSBP.add(new SimpleStatus("WSINonCompliantRuntimeCommand",
- msgUtils_.getMessage("WSI_SSBP_INCOMPLIANT_RUNTIME"), WSIComplianceUtils.getWSISeverity(serviceProject_, wsiSSBPContext)));
- Status[] statusesSSBP = (Status[]) statusSSBP.toArray(new Status[statusSSBP.size()]);
-
- Vector statusAP = new Vector();
- statusAP.add(new SimpleStatus("WSINonCompliantRuntimeCommand",
- msgUtils_.getMessage("WSI_AP_INCOMPLIANT_RUNTIME"), WSIComplianceUtils.getWSISeverity(serviceProject_, wsiAPContext)));
- Status[] statusesAP = (Status[]) statusAP.toArray(new Status[statusAP.size()]);
-
- if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesSSBP, serviceProject_, wsiSSBPContext)) {
- if (WSIComplianceUtils.checkWSICompliance (environment.getStatusHandler(), statusesAP, serviceProject_, wsiAPContext)) {
- return new SimpleStatus( "" );
- } else {
- return new SimpleStatus(
- "WSINonCompliantRuntimeCommand",
- msgUtils_.getMessage("NOT_OK"),
- Status.ERROR);
- }
- } else {
- return new SimpleStatus(
- "WSINonCompliantRuntimeCommand",
- msgUtils_.getMessage("NOT_OK"),
- Status.ERROR);
- }
- }
-
- public Status undo(Environment environment)
- {
- return null;
- }
-
- public Status redo(Environment environment)
- {
- return null;
- }
-
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
deleted file mode 100644
index 8f8400b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/EclipseIPath2URLStringTransformer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-public class EclipseIPath2URLStringTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- String s = value.toString();
- if (s.indexOf(":") < 0)
- {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(value.toString());
- if (res.exists())
- {
- try
- {
- s = res.getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- return s;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
deleted file mode 100644
index 0f77254..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ProjectName2IProjectTransformer.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class ProjectName2IProjectTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- String project = (String)value;
- int slashIndex = project.indexOf( '/' );
- String projectName = project;
-
- if( slashIndex != -1 )
- {
- projectName = project.substring( 0, slashIndex );
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
deleted file mode 100644
index c96075d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerInstToIServerTransformer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 20, 2004
- */
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/*
- * Transforms a server instance id to an IServer
- */
-public class ServerInstToIServerTransformer implements Transformer {
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform(Object value) {
-
- String existingServerInstId = (String)value;
- IServer serverInst = null;
- if (existingServerInstId != null) {
- serverInst = ServerCore.findServer(existingServerInstId);
- }
- return serverInst;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
deleted file mode 100644
index 7ac5f0d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/command/data/ServerName2IServerTransformer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.command.data;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerName2IServerTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- Vector serverIds = new Vector();
- {
- String serverName = value.toString();
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0)
- {
- for (int i = 0; i < servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- if ((server.getName()).equals(serverName))
- return server;
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ClientServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ClientServerSelectionUtils.java
deleted file mode 100644
index 4a6be03..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ClientServerSelectionUtils.java
+++ /dev/null
@@ -1,510 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class ClientServerSelectionUtils
-{
- /*
- * Returns reasonable defaults for server factory id and instance id based on
- * an existing project
- * index [0] contains factoryId, index[1] contains instance Id.
- * @deprecated
- */
- public static String[] getServerInfoFromExistingProject(IProject project, String typeId, boolean askExtenders)
- {
- String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
- // If the project has been added to an existing server, pick that server
- IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, typeId );
- if (firstSupportedServer != null)
- {
- serverInfo[0] = firstSupportedServer.getServerType().getId();
- serverInfo[1] = firstSupportedServer.getId();
- return serverInfo;
- }
-
- //Does the project have a runtime-target?
- IRuntime runtimeTarget = getRuntimeTarget(project.getName());
- if (runtimeTarget != null)
- {
- //Look for an existing server which is compatible with the runtime-target
- IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
- if (compatibleServers!=null && compatibleServers.length > 0)
- {
- IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, typeId);
- if (firstSupportedCompatServer != null)
- {
- serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
- serverInfo[1] = firstSupportedCompatServer.getId();
- return serverInfo;
-
- }
- }
-
- //No existing compatible server was found. Choose a compatible server type.
-
- //If the preferred server is compatible with the project's runtime target, use it.
- PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pFactoryId = ctx.getServerFactoryId();
- IServerType serverType = ServerCore.findServerType(pFactoryId);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
- {
- serverInfo[0] = pFactoryId;
- return serverInfo;
- }
- }
-
- //The preferred server was not compatible. Pick the first valid compatible server type.
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
-
- if (askExtenders)
- {
- ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
- if (recommendedServerInfo!=null)
- {
- if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
- serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-
- if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
- serverInfo[1] = recommendedServerInfo.getServerInstanceId();
-
- return serverInfo;
- }
- }
-
- //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
- String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
- List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
- String[] compatServerInfo = getCompatibleExistingServer(runtimes,typeId);
- if ( compatServerInfo != null)
- {
- return compatServerInfo;
- }
-
- //No existing compatible server, pick a type.
- String factoryId = getFirstSupportedServerType(runtimes, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- /*
- * Returns reasonable defaults for server factory id and instance id based on
- * an existing project
- * index [0] contains factoryId, index[1] contains instance Id.
- * @deprecated
- */
- public static String[] getServerInfoFromExistingProject(IProject project, String typeId, String runtimeId, boolean askExtenders)
- {
- String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
- // If the project has been added to an existing server, pick that server
- IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, typeId );
- if (firstSupportedServer != null)
- {
- serverInfo[0] = firstSupportedServer.getServerType().getId();
- serverInfo[1] = firstSupportedServer.getId();
- return serverInfo;
- }
-
- //Does the project have a runtime-target?
- IRuntime runtimeTarget = getRuntimeTarget(project.getName());
- if (runtimeTarget != null)
- {
- //Look for an existing server which is compatible with the runtime-target
- IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
- if (compatibleServers!=null && compatibleServers.length > 0)
- {
- IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, typeId);
- if (firstSupportedCompatServer != null)
- {
- serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
- serverInfo[1] = firstSupportedCompatServer.getId();
- return serverInfo;
-
- }
- }
-
- //No existing compatible server was found. Choose a compatible server type.
-
- //If the preferred server is compatible with the project's runtime target, use it.
- PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pFactoryId = ctx.getServerFactoryId();
- IServerType serverType = ServerCore.findServerType(pFactoryId);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
- {
- serverInfo[0] = pFactoryId;
- return serverInfo;
- }
- }
-
- //The preferred server was not compatible. Pick the first valid compatible server type.
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
-
- if (askExtenders)
- {
- ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
- if (recommendedServerInfo!=null)
- {
- if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
- serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-
- if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
- serverInfo[1] = recommendedServerInfo.getServerInstanceId();
-
- return serverInfo;
- }
- }
-
- //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
- String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
- List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
- List suppRuntimes = getRuntimeTargetsSupportedByWSRuntime(runtimes, runtimeId);
- String[] compatServerInfo = getCompatibleExistingServer(suppRuntimes,typeId);
- if ( compatServerInfo != null)
- {
- return compatServerInfo;
- }
-
- //No existing compatible server, pick a type.
- String factoryId = getFirstSupportedServerType(suppRuntimes, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- /*
- * Given a list of existing servers, this returns the first one that is supported
- * by the given Web service type id.
- * Returns null of there are no supported servers in the array.
- */
- public static IServer getFirstSupportedServer(IServer[] servers, String typeId)
- {
- WebServiceClientTypeRegistry wsctRegistry = WebServiceClientTypeRegistry.getInstance();
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (wsctRegistry.isServerSupportedForChosenType(typeId, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- return null;
- }
-
- /*
- * Returns the factory id of a server type compatible with the Web service type and the runtime target.
- * Returns null if there are none.
- */
- public static String getFirstSupportedServerType(IRuntime runtimeTarget, String typeId)
- {
- String runtimeId = runtimeTarget.getRuntimeType().getId();
- WebServiceClientTypeRegistry wsctRegistry = WebServiceClientTypeRegistry.getInstance();
- String[] serverFactoryIds = wsctRegistry.getServerFactoryIdsByType(typeId);
-
- for (int i=0; i<serverFactoryIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
- if (serverType!=null ){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- {
- return serverFactoryIds[i];
- }
- }
- }
- return null;
- }
-
- /*
- * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
- * Returns null if there are none.
- */
- public static String getFirstSupportedServerType(List runtimeTargets, String typeId)
- {
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null && factoryId.length()>0)
- return factoryId;
- }
-
- return null;
- }
-
- public static IRuntime getRuntimeTarget(String projectName)
- {
- if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if( project != null && project.exists() ){
- return ServerCore.getProjectProperties(project).getRuntimeTarget();
- }
- }
- return null;
- }
-
- public static IServer[] getCompatibleExistingServers(IRuntime runtime)
- {
- if (runtime == null)
- return null;
-
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length!=0)
- return null;
-
- ArrayList compatibleServersList = new ArrayList();
- String runtimeId = runtime.getRuntimeType().getId();
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String serverRuntimeId = server.getRuntime().getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- compatibleServersList.add(server);
-
- }
- if (compatibleServersList.size()<1)
- return null;
-
-
- Object[] compatibleServersArray = compatibleServersList.toArray();
- IServer[] compatibleServers = new IServer[compatibleServersArray.length];
- for (int j=0; j<compatibleServersArray.length; j++)
- {
- compatibleServers[j] = (IServer)compatibleServersArray[j];
- }
-
- return compatibleServers;
- }
- /*
- * Returns the factory Id and instance id of the first exiting server compatible
- * with the runtime targets and typeId
- * Returns null if there are none.
- * The item at [0] is the factory id.
- * The item at [1] is the instance id.
- */
- public static String[] getCompatibleExistingServer(List runtimeTargets, String typeId)
- {
- String[] serverInfo = new String[2];
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
- IServer compatServer = getFirstSupportedServer(existingCompatServers, typeId);
- if (compatServer != null)
- {
- serverInfo[0] = compatServer.getServerType().getId();
- serverInfo[1] = compatServer.getId();
- return serverInfo;
- }
- }
- return null;
- }
-
- public static ServerInfo getExtenderRecommendation(IProject project)
- {
- try
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
- for (int i=0; i<elements.length; i++)
- {
- Object serverDefaulterObject = elements[i].createExecutableExtension("class");
- if (serverDefaulterObject instanceof IServerDefaulter)
- {
- IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
- ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
- if (serverInfo != null)
- return serverInfo;
- }
-
- }
- } catch (CoreException ce)
- {
- return null;
- }
-
- return null;
- }
-
- private static List getRuntimeTargetsSupportedByWSRuntime(List runtimeTargets, String webServiceRuntimeId)
- {
- ArrayList suppRuntimeTargets = new ArrayList();
- WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
- for (int i=0; i<runtimeTargets.size(); i++)
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String rtId = runtimeTarget.getRuntimeType().getId();
- if (wsctReg.doesRuntimeSupportServerTarget(rtId, webServiceRuntimeId))
- {
- suppRuntimeTargets.add(runtimeTarget);
- }
- }
- return suppRuntimeTargets;
- }
-
- /**
- * Use this method to get a server factory id and instance id that is compatible with the given Web
- * service runtime.
- * @param clientRuntimeId
- * @param j2eeVersion String representation of the int values in J2EEVersionConstants i.e. "12", "13", "14"
- * @return String[] index [0] contains factoryId, index[1] contains instance Id.
- */
- public static String[] getServerFromClientRuntimeAndJ2EE(String clientRuntimeId, String j2eeVersion)
- {
- String[] serverInfo = new String[2];
- WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-
- //Get all possible valid servers. If there are none, we can't default intelligently, return null.
- String[] validServerFactoryIds = wsctReg.getServerFactoryIdsByRuntimeId(clientRuntimeId);
- if (validServerFactoryIds==null || validServerFactoryIds.length<1)
- return null;
-
- //Get all existing servers
- IServer[] servers = ServerCore.getServers(); //Get all existing servers
-
- //Get the preferred server.
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String prefServerFactoryId = context.getServerFactoryId();
-
- boolean preferredIsValid = containsString(validServerFactoryIds, prefServerFactoryId)
- && isServerValid(prefServerFactoryId, j2eeVersion);
- if (preferredIsValid)
- {
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String thisFactoryId = server.getServerType().getId();
-
- if (thisFactoryId.equals(prefServerFactoryId))
- {
- serverInfo[0] = prefServerFactoryId;
- serverInfo[1] = server.getId();
- return serverInfo;
- }
- }
- }
-
- //Either the preferred server was not valid or it was valid but does not exist.
- //Check the existing servers for validity
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String thisFactoryId = server.getServerType().getId();
-
- boolean thisServerValid = containsString(validServerFactoryIds, thisFactoryId)
- && isServerValid(thisFactoryId, j2eeVersion);
- if (thisServerValid)
- {
- serverInfo[0] = thisFactoryId;
- serverInfo[1] = server.getId();
- return serverInfo;
- }
- }
-
- //None of the existing servers is valid. Pick the preferred one if valid. Otherwise, pick the
- //first valid server type.
- if (preferredIsValid)
- {
- serverInfo[0] = prefServerFactoryId;
- return serverInfo;
- }
- else
- {
- for (int i=0; i<validServerFactoryIds.length; i++ )
- {
- boolean isValid = isServerValid(validServerFactoryIds[i], j2eeVersion);
- if (isValid)
- {
- serverInfo[0] = validServerFactoryIds[0];
- return serverInfo;
- }
- }
- }
-
- //We can't determine a valid server selection. Return null.
- return null;
- }
-
- private static boolean isServerValid(String serverFactoryId, String j2eeVersion)
- {
- if (serverFactoryId==null || serverFactoryId.length()==0 || j2eeVersion==null || j2eeVersion.length()==0)
- return true;
-
- String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
- if (runtimeTargetId == null || runtimeTargetId.length()==0)
- return false;
- String webModuleType = IServerTargetConstants.WEB_TYPE;
- boolean isValid = ServerUtils.isTargetValidForProjectType(runtimeTargetId, j2eeVersion, webModuleType);
- return isValid;
- }
- /*
- * Returns true if a contains b, false otherwise.
- */
- private static boolean containsString(String[] a, String b)
- {
- if (a==null || a.length<0 || b == null || b.length()==0 )
- return false;
-
- for (int i=0; i<a.length; i++)
- {
- String s = a[i];
- if (s.equals(b))
- {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
deleted file mode 100644
index a603ed9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/FinishFragment.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishFragment extends SequenceFragment
-{
- public FinishFragment()
- {
- add(new FinishTestFragment() );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
deleted file mode 100644
index 0867e61..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ServerSelectionUtils.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.ServerTargetHelper;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.IServerDefaulter;
-import org.eclipse.jst.ws.internal.consumption.common.ServerInfo;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class ServerSelectionUtils
-{
- /*
- * Returns reasonable defaults for server factory id and instance id based on
- * an existing project
- * index [0] contains factoryId, index[1] contains instance Id.
- * @deprecated
- */
- public static String[] getServerInfoFromExistingProject(IProject project, String componentName, String runtimeId, boolean askExtenders)
- {
- String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
- // If the project has been added to an existing server, pick that server
- //IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer[] configuredServers = ServerUtil.getServersByModule(ServerUtils.getModule(project, componentName), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
- if (firstSupportedServer != null)
- {
- serverInfo[0] = firstSupportedServer.getServerType().getId();
- serverInfo[1] = firstSupportedServer.getId();
- return serverInfo;
-
- }
-
-
- //Does the project have a runtime-target?
- IRuntime runtimeTarget = getRuntimeTarget(project.getName());
- if (runtimeTarget != null)
- {
- //Look for an existing server which is compatible with the runtime-target
- IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
- if (compatibleServers!=null && compatibleServers.length > 0)
- {
- IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, runtimeId);
- if (firstSupportedCompatServer != null)
- {
- serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
- serverInfo[1] = firstSupportedCompatServer.getId();
- return serverInfo;
-
- }
- }
-
- //No existing compatible server was found. Choose a compatible server type.
-
- //If the preferred server is compatible with the project's runtime target, use it.
- PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pFactoryId = ctx.getServerFactoryId();
- IServerType serverType = ServerCore.findServerType(pFactoryId);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
- {
- serverInfo[0] = pFactoryId;
- return serverInfo;
- }
- }
-
- //The preferred server was not compatible. Pick the first valid compatible server type.
- String factoryId = getFirstSupportedServerType(runtimeTarget, runtimeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- if (askExtenders)
- {
- ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
- if (recommendedServerInfo!=null)
- {
- if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
- serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-
- if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
- serverInfo[1] = recommendedServerInfo.getServerInstanceId();
-
- return serverInfo;
- }
-
- }
-
- //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
- String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
- List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
- String[] compatServerInfo = getCompatibleExistingServer(runtimes,runtimeId);
- if ( compatServerInfo != null)
- {
- return compatServerInfo;
- }
-
- //No existing compatible server, pick a type.
- String factoryId = getFirstSupportedServerType(runtimes, runtimeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- /*
- * Returns reasonable defaults for server factory id and instance id based on
- * an existing project
- * index [0] contains factoryId, index[1] contains instance Id.
- */
- /*
- public static String[] getServerInfoFromExistingProject(IProject project, String runtimeId, boolean askExtenders)
- {
- String[] serverInfo = new String[2]; //serverInfp[0] contains factoryId, serverInfo[1] contains instance Id
-
- // If the project has been added to an existing server, pick that server
- IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer firstSupportedServer = getFirstSupportedServer(configuredServers, runtimeId );
- if (firstSupportedServer != null)
- {
- serverInfo[0] = firstSupportedServer.getServerType().getId();
- serverInfo[1] = firstSupportedServer.getId();
- return serverInfo;
-
- }
-
-
- //Does the project have a runtime-target?
- IRuntime runtimeTarget = getRuntimeTarget(project.getName());
- if (runtimeTarget != null)
- {
- //Look for an existing server which is compatible with the runtime-target
- IServer[] compatibleServers = getCompatibleExistingServers(runtimeTarget);
- if (compatibleServers!=null && compatibleServers.length > 0)
- {
- IServer firstSupportedCompatServer = getFirstSupportedServer(compatibleServers, runtimeId);
- if (firstSupportedCompatServer != null)
- {
- serverInfo[0] = firstSupportedCompatServer.getServerType().getId();
- serverInfo[1] = firstSupportedCompatServer.getId();
- return serverInfo;
-
- }
- }
-
- //No existing compatible server was found. Choose a compatible server type.
-
- //If the preferred server is compatible with the project's runtime target, use it.
- PersistentServerRuntimeContext ctx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pFactoryId = ctx.getServerFactoryId();
- IServerType serverType = ServerCore.findServerType(pFactoryId);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeTarget.getRuntimeType().getId()))
- {
- serverInfo[0] = pFactoryId;
- return serverInfo;
- }
- }
-
- //The preferred server was not compatible. Pick the first valid compatible server type.
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
-
- if (askExtenders)
- {
- ServerInfo recommendedServerInfo = getExtenderRecommendation(project);
- if (recommendedServerInfo!=null)
- {
- if (recommendedServerInfo.getServerFactoryId()!=null && recommendedServerInfo.getServerFactoryId().length()>0)
- serverInfo[0] = recommendedServerInfo.getServerFactoryId();
-
- if (recommendedServerInfo.getServerInstanceId()!=null && recommendedServerInfo.getServerInstanceId().length()>0)
- serverInfo[1] = recommendedServerInfo.getServerInstanceId();
-
- return serverInfo;
- }
-
- }
-
- //Use ServerTargetHelper to get a list of valid runtime-targets and use these to determine a default server type.
- String[] projectAttrs = ServerTargetHelper.getProjectTypeAndJ2EELevel(project);
- List runtimes = ServerTargetHelper.getServerTargets(projectAttrs[0], projectAttrs[1]);
- List suppRuntimes = getRuntimeTargetsSupportedByWSRuntime(runtimes, runtimeId);
- String[] compatServerInfo = getCompatibleExistingServer(suppRuntimes,typeId);
- if ( compatServerInfo != null)
- {
- return compatServerInfo;
- }
-
- //No existing compatible server, pick a type.
- String factoryId = getFirstSupportedServerType(suppRuntimes, typeId);
- if (factoryId != null) serverInfo[0] = factoryId;
- return serverInfo;
-
- }
- */
-
- /*
- * Given a list of existing servers, this returns the first one that is supported
- * by the given Web service runtime id.
- * Returns null of there are no supported servers in the array.
- */
- public static IServer getFirstSupportedServer(IServer[] servers, String webServiceRuntimeId)
- {
- //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(webServiceRuntimeId, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- return null;
- }
-
- /*
- * Given a list of existing servers, this returns the first one that is supported
- * by the given Web service type id.
- * Returns null of there are no supported servers in the array.
- * @deprecated
- */
- /*
- public static IServer getFirstSupportedServer(IServer[] servers, String typeId)
- {
- WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++)
- {
- String serverFactoryId = servers[i].getServerType().getId();
- if (wssrtRegistry.isServerSupportedForChosenType(typeId, serverFactoryId))
- {
- return servers[i];
- }
- }
- }
- return null;
- }
- */
-
- /*
- * Returns the factory id of a server type compatible with the Web service type and the runtime target.
- * Returns null if there are none.
- */
- public static String getFirstSupportedServerType(IRuntime runtimeTarget, String webServiceRuntimeId)
- {
- String runtimeId = runtimeTarget.getRuntimeType().getId();
- //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- //String[] serverFactoryIds = wssrtRegistry.getServerFactoryIdsByType(typeId);
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
- String[] serverFactoryIds = wsrt.getServerFactoryIds();
- for (int i=0; i<serverFactoryIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- {
- return serverFactoryIds[i];
- }
- }
- }
- return null;
- }
-
- /*
- * Returns the factory id of a server type compatible with the Web service type and the runtime target.
- * Returns null if there are none.
- * @deprecated
- */
- /*
- public static String getFirstSupportedServerType(IRuntime runtimeTarget, String typeId)
- {
- String runtimeId = runtimeTarget.getRuntimeType().getId();
- WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- String[] serverFactoryIds = wssrtRegistry.getServerFactoryIdsByType(typeId);
- for (int i=0; i<serverFactoryIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryIds[i]);
- if (serverType!=null){
- String serverRuntimeId = serverType.getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- {
- return serverFactoryIds[i];
- }
- }
- }
- return null;
- }
- */
-
- /*
- * Return the factory id of the first server type compatible with the runtimeTargets and webServiceRuntimeId.
- * Returns null if there are none.
- */
- public static String getFirstSupportedServerType(List runtimeTargets, String webServiceRuntimeId)
- {
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String factoryId = getFirstSupportedServerType(runtimeTarget, webServiceRuntimeId);
- if (factoryId != null && factoryId.length()>0)
- return factoryId;
- }
-
- return null;
- }
- /*
- * Return the factory id of the first server type compatible with the runtimeTargets and typeId.
- * Returns null if there are none.
- * @deprecated
- */
- /*
- public static String getFirstSupportedServerType(List runtimeTargets, String typeId)
- {
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String factoryId = getFirstSupportedServerType(runtimeTarget, typeId);
- if (factoryId != null && factoryId.length()>0)
- return factoryId;
- }
-
- return null;
- }
- */
- public static IRuntime getRuntimeTarget(String projectName)
- {
- if( projectName != null && projectName.length() > 0 ){ //$NON-NLS-1$
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- if( project != null && project.exists() ){
- return ServerCore.getProjectProperties(project).getRuntimeTarget();
- }
- }
- return null;
- }
-
- public static IServer getFirstExistingServerFromFactoryId(String factoryId)
- {
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length!=0)
- return null;
- else
- {
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- if (server.getServerType().getId().equals(factoryId))
- {
- return server;
- }
- }
- }
- return null;
- }
-
- public static IServer[] getCompatibleExistingServers(IRuntime runtime)
- {
- if (runtime == null)
- return null;
-
- IServer[] servers = ServerCore.getServers();
- if (servers==null || servers.length==0)
- return null;
-
- ArrayList compatibleServersList = new ArrayList();
- String runtimeId = runtime.getRuntimeType().getId();
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String serverRuntimeId = server.getRuntime().getRuntimeType().getId();
- if (serverRuntimeId.equals(runtimeId))
- compatibleServersList.add(server);
-
- }
- if (compatibleServersList.size()<1)
- return null;
-
-
- Object[] compatibleServersArray = compatibleServersList.toArray();
- IServer[] compatibleServers = new IServer[compatibleServersArray.length];
- for (int j=0; j<compatibleServersArray.length; j++)
- {
- compatibleServers[j] = (IServer)compatibleServersArray[j];
- }
-
- return compatibleServers;
- }
-
-
- /*
- * Returns the factory Id and instance id of the first exiting server compatible
- * with the runtime targets and typeId
- * Returns null if there are none.
- * The item at [0] is the factory id.
- * The item at [1] is the instance id.
- * @deprecated
- */
- public static String[] getCompatibleExistingServer(List runtimeTargets, String webServiceRuntimeId)
- {
- String[] serverInfo = new String[2];
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
- IServer compatServer = getFirstSupportedServer(existingCompatServers, webServiceRuntimeId);
- if (compatServer != null)
- {
- serverInfo[0] = compatServer.getServerType().getId();
- serverInfo[1] = compatServer.getId();
- return serverInfo;
- }
- }
- return null;
- }
-
- /*
- * Returns the factory Id and instance id of the first exiting server compatible
- * with the runtime targets and typeId
- * Returns null if there are none.
- * The item at [0] is the factory id.
- * The item at [1] is the instance id.
- * @deprecated
- */
- /*
- public static String[] getCompatibleExistingServer(List runtimeTargets, String typeId)
- {
- String[] serverInfo = new String[2];
- for (int i=0; i<runtimeTargets.size(); i++ )
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- IServer[] existingCompatServers = getCompatibleExistingServers(runtimeTarget);
- IServer compatServer = getFirstSupportedServer(existingCompatServers, typeId);
- if (compatServer != null)
- {
- serverInfo[0] = compatServer.getServerType().getId();
- serverInfo[1] = compatServer.getId();
- return serverInfo;
- }
- }
- return null;
- }
- */
-
- public static ServerInfo getExtenderRecommendation(IProject project)
- {
- try
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "serverDefaulter");
- for (int i=0; i<elements.length; i++)
- {
- Object serverDefaulterObject = elements[i].createExecutableExtension("class");
- if (serverDefaulterObject instanceof IServerDefaulter)
- {
- IServerDefaulter serverDefaulter = (IServerDefaulter)serverDefaulterObject;
- ServerInfo serverInfo = serverDefaulter.recommendDefaultServer(project);
- if (serverInfo != null)
- return serverInfo;
- }
-
- }
- } catch (CoreException ce)
- {
- return null;
- }
-
- return null;
- }
-
- /**
- *
- * @param runtimeTargets
- * @param webServiceRuntimeId
- * @return
- * @deprecated
- */
- private static List getRuntimeTargetsSupportedByWSRuntime(List runtimeTargets, String webServiceRuntimeId)
- {
- ArrayList suppRuntimeTargets = new ArrayList();
- WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
- for (int i=0; i<runtimeTargets.size(); i++)
- {
- IRuntime runtimeTarget = (IRuntime)runtimeTargets.get(i);
- String rtId = runtimeTarget.getRuntimeType().getId();
- if (wssrtReg.doesRuntimeSupportServerTarget(rtId, webServiceRuntimeId));
- {
- suppRuntimeTargets.add(runtimeTarget);
- }
- }
- return suppRuntimeTargets;
- }
-
- /**
- * Use this method to get a server factory id and instance id that is compatible with the given Web
- * service runtime.
- * @param webServiceRuntimeId
- * @param j2eeVersion String representation of the int values in J2EEVersionConstants i.e. "12", "13", "14"
- * @return String[] index [0] contains factoryId, index[1] contains instance Id.
- */
- public static String[] getServerFromWebServceRuntimeAndJ2EE(String webServiceRuntimeId, String j2eeVersion)
- {
- String[] serverInfo = new String[2];
- //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-
- //Get all possible valid servers. If there are none, we can't default intelligently, return null.
- //String[] validServerFactoryIds = wssrtReg.getServerFactoryIDByRuntimeID(webServiceRuntimeId);
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(webServiceRuntimeId);
- String[] validServerFactoryIds = wsrt.getServerFactoryIds();
- if (validServerFactoryIds==null || validServerFactoryIds.length<1)
- return null;
-
- //Get all existing servers
- IServer[] servers = ServerCore.getServers(); //Get all existing servers
-
- //Get the preferred server.
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String prefServerFactoryId = context.getServerFactoryId();
-
- boolean preferredIsValid = containsString(validServerFactoryIds, prefServerFactoryId)
- && isServerValid(prefServerFactoryId, j2eeVersion);
- if (preferredIsValid)
- {
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String thisFactoryId = server.getServerType().getId();
-
- if (thisFactoryId.equals(prefServerFactoryId))
- {
- serverInfo[0] = prefServerFactoryId;
- serverInfo[1] = server.getId();
- return serverInfo;
- }
- }
- }
-
- //Either the preferred server was not valid or it was valid but does not exist.
- //Check the existing servers for validity
- for (int i=0; i<servers.length; i++)
- {
- IServer server = (IServer)servers[i];
- String thisFactoryId = server.getServerType().getId();
-
- boolean thisServerValid = containsString(validServerFactoryIds, thisFactoryId)
- && isServerValid(thisFactoryId, j2eeVersion);
- if (thisServerValid)
- {
- serverInfo[0] = thisFactoryId;
- serverInfo[1] = server.getId();
- return serverInfo;
- }
- }
-
- //None of the existing servers is valid. Pick the preferred one if valid. Otherwise, pick the
- //first valid server type.
- if (preferredIsValid)
- {
- serverInfo[0] = prefServerFactoryId;
- return serverInfo;
- }
- else
- {
- for (int i=0; i<validServerFactoryIds.length; i++ )
- {
- boolean isValid = isServerValid(validServerFactoryIds[i], j2eeVersion);
- if (isValid)
- {
- serverInfo[0] = validServerFactoryIds[0];
- return serverInfo;
- }
- }
- }
-
- //We can't determine a valid server selection. Return null.
- return null;
- }
-
- private static boolean isServerValid(String serverFactoryId, String j2eeVersion)
- {
- if (serverFactoryId==null || serverFactoryId.length()==0 || j2eeVersion==null || j2eeVersion.length()==0)
- return true;
-
- String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
- if (runtimeTargetId == null || runtimeTargetId.length()==0)
- return false;
- String webModuleType = IServerTargetConstants.WEB_TYPE;
- boolean isValid = ServerUtils.isTargetValidForProjectType(runtimeTargetId, j2eeVersion, webModuleType);
- return isValid;
- }
- /*
- * Returns true is a contains b, false otherwise.
- */
- private static boolean containsString(String[] a, String b)
- {
- if (a==null || a.length<0 || b == null || b.length()==0 )
- return false;
-
- for (int i=0; i<a.length; i++)
- {
- String s = a[i];
- if (s.equals(b))
- {
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
deleted file mode 100644
index 718059f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/common/ValidationUtils.java
+++ /dev/null
@@ -1,361 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.common;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.internal.WebServiceConstants;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.ClientProjectTypeRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- */
-public class ValidationUtils
-{
- MessageUtils msgUtils;
-
- /**
- *
- */
- public ValidationUtils()
- {
- String pluginId = WebServiceConsumptionUIPlugin.ID; //"org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils( pluginId + ".plugin", this );
- }
-
- public Status validateProjectTargetAndJ2EE(String projectName, String compName, String earName, String earCompName, String serverFactoryId, String j2eeLevel)
- {
- IProject p = ProjectUtilities.getProject(projectName);
- IProject earP = null;
- if (earName!=null && !earName.equalsIgnoreCase("")) {
- earP = ProjectUtilities.getProject(earName);
- }
- Status targetStatus = doesProjectTargetMatchServerType(p, serverFactoryId);
- if (earP!=null && targetStatus.getSeverity()==Status.OK)
- {
- //check the EAR
- Status earTargetStatus = doesProjectTargetMatchServerType(earP, serverFactoryId);
- if(earTargetStatus.getSeverity()==Status.ERROR)
- {
- return earTargetStatus;
- }
- }
- else
- {
- return targetStatus;
- }
-
-
- //Validate service side J2EE level
- Status j2eeStatus = doesProjectMatchJ2EELevel(p, compName, j2eeLevel);
- if(earP!=null && j2eeStatus.getSeverity()==Status.OK)
- {
- Status earJ2EEStatus = doesProjectMatchJ2EELevel(earP, earCompName, j2eeLevel);
- if(earJ2EEStatus.getSeverity()==Status.ERROR)
- {
- return earJ2EEStatus;
- }
- }
- else
- {
- return j2eeStatus;
- }
-
- return new SimpleStatus("");
- }
-
- private Status doesProjectTargetMatchServerType(IProject p, String serverFactoryId)
- {
- if (p!=null && p.exists())
- {
- IRuntime projectTarget = ServerSelectionUtils.getRuntimeTarget(p.getName());
- if (projectTarget!=null)
- {
- String projectTargetId = projectTarget.getRuntimeType().getId();
- String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId);
- if (serverTargetId!=null && serverTargetId.length()>0)
- {
- if(!projectTargetId.equals(serverTargetId))
- {
- return new SimpleStatus("",msgUtils.getMessage("MSG_SERVER_TARGET_MISMATCH",new String[]{p.getName()}),Status.ERROR);
- }
- }
- }
- }
- return new SimpleStatus("");
- }
-
- private Status doesProjectMatchJ2EELevel(IProject p, String compName, String j2eeLevel)
- {
-
- try {
- if (p!=null && p.exists())
- {
- int projectJ2EELevel = J2EEUtils.getJ2EEVersion(p, compName);
- if (projectJ2EELevel!=-1)
- {
- String projectJ2EELevelString = String.valueOf(projectJ2EELevel);
- if (j2eeLevel!=null && j2eeLevel.length()>0)
- {
- if (!projectJ2EELevelString.equals(j2eeLevel))
- {
- return new SimpleStatus("",msgUtils.getMessage("MSG_J2EE_MISMATCH",new String[]{p.getName()}), Status.ERROR);
- }
- }
- }
- }
- } catch(Exception e){
-
- }
-
- return new SimpleStatus("");
- }
-
- public Status validateProjectType(String projectName, SelectionListChoices runtime2ClientTypes)
- {
- Status status = new SimpleStatus("");
- IProject p = ProjectUtilities.getProject(projectName);
- if (p==null || !p.exists())
- {
- //Project does not exist which means a new project of the correct type will be created
- //We're done. All is good.
- return status;
- }
-
- //If the project exists, we should see it in the project list for the selected client
- //project type.
- String[] projectNames = runtime2ClientTypes.getChoice().getChoice().getList().getList();
- for (int i=0; i<projectNames.length; i++)
- {
- if (projectName.equals(projectNames[i]))
- {
- //Found the project. All is good.
- return status;
- }
- }
-
- //Didn't find the project. Return an error.
- //Get the label for the client type id
- String clientTypeLabel = getClientTypeLabel(runtime2ClientTypes.getChoice().getList().getSelection());
- String message = msgUtils.getMessage("MSG_WRONG_CLIENT_PROJECT_TYPE",new String[]{projectName, clientTypeLabel});
- Status eStatus = new SimpleStatus("",message,Status.ERROR);
- return eStatus;
-
- }
-
- private String getClientTypeLabel( String type )
- {
- ClientProjectTypeRegistry registry = ClientProjectTypeRegistry.getInstance();
- String clientTypeLabel = null;
-
- clientTypeLabel = registry.getElementById(type).getAttribute("label");
-
- return clientTypeLabel;
- }
-
- /**
- *
- * @param p
- * @param wsdlURL
- * @param parser
- * @return
- */
- public boolean isProjectServiceProject(IProject p, String wsdlURL, WebServicesParser parser)
- {
- if (p==null || wsdlURL==null || wsdlURL.length()==0 || parser==null)
- return false;
-
- IResource wsXML = getWebServcesXML(p);
- if (wsXML==null)
- return false;
-
-
- //Make a list of all the wsdl-port's in webservices.xml
- WebServicesManager wsm = WebServicesManager.getInstance();
- //WebServiceEditModel wsEditModel = wsm.getWSEditModel(p);
- //WebServices ws = wsEditModel.getWebServices();
- Iterator wsDescs = wsm.getInternalWebServicesDescriptions().iterator();
- ArrayList wsdlPortList = new ArrayList();
- while(wsDescs.hasNext())
- {
- WebServiceDescription wsDesc = (WebServiceDescription)wsDescs.next();
- Iterator pcs = wsDesc.getPortComponents().iterator();
- while(pcs.hasNext())
- {
- PortComponent pc = (PortComponent)pcs.next();
- WSDLPort wsdlPort = pc.getWsdlPort();
- wsdlPortList.add(new QualifiedName(wsdlPort.getNamespaceURI(), wsdlPort.getLocalPart()));
- }
- }
-
- ArrayList portList = getPortNamesFromWsdl(wsdlURL, parser);
-
- //If any of the QualifiedNames in portList equals any of the QualifiedNames
- //in wsdlPortList, this is the service project. Return true.
- Object[] ports = portList.toArray();
- Object[] wsdlPorts = wsdlPortList.toArray();
- for (int i = 0; i < ports.length; i++)
- {
- QualifiedName portName = (QualifiedName) ports[i];
- for (int j = 0; j < wsdlPorts.length; j++)
- {
- QualifiedName wsdlPortName = (QualifiedName) wsdlPorts[j];
- if (portName.equals(wsdlPortName))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- /**
- * @deprecated
- *
- */
- private IResource getWebServcesXML(IProject p)
- {
- //
-// J2EENature nature = (J2EENature) J2EENature.getRegisteredRuntime(p);
-// if (nature == null)
-// return null;
-
-// IResource moduleRoot = nature.getModuleServerRoot();
-// IResource moduleRoot = ResourceUtils.getWebModuleServerRoot(p);
- IResource moduleRoot = J2EEUtils.getFirstWebContentContainer(p);
- if (!(moduleRoot instanceof IContainer))
- return null;
-
- IResource webServicesXML=null;
-// if (nature instanceof J2EEWebNatureRuntime)
- if (ResourceUtils.isWebProject(p))
- {
- StringBuffer wsPath = new StringBuffer();
- wsPath.append("WEB-INF/");
- wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
- webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString());
- }
- else //Must be an Application Client Module or an EJB Module
- {
- StringBuffer wsPath = new StringBuffer();
- wsPath.append("META-INF/");
- wsPath.append(WebServiceConstants.WEBSERVICE_DD_SHORT_NAME);
- webServicesXML = ((IContainer)moduleRoot).findMember(wsPath.toString());
- }
-
- return webServicesXML;
- }
-
- private ArrayList getPortNamesFromWsdl(String wsdlURL, WebServicesParser parser)
- {
- ArrayList portNameList = new ArrayList();
- Definition def = parser.getWSDLDefinition(wsdlURL);
- Map services = def.getServices();
- Service service = null;
- for (Iterator it = services.values().iterator(); it.hasNext();)
- {
- service = (Service)it.next();
- String namespace = service.getQName().getNamespaceURI();
- Map ports = service.getPorts();
- for (Iterator it2 = ports.values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- portNameList.add(new QualifiedName(namespace, port.getName()));
- }
- }
-
- return portNameList;
-
- }
-
- private class QualifiedName
- {
- String namespaceURI;
-
- String localPart;
-
- /**
- * @param namespaceURI
- * @param localPart
- */
- public QualifiedName(String namespaceURI, String localPart)
- {
- super();
- this.namespaceURI = namespaceURI;
- this.localPart = localPart;
- }
-
- /**
- * @return Returns the localPart.
- */
- public String getLocalPart()
- {
- return localPart;
- }
-
- /**
- * @param localPart
- * The localPart to set.
- */
- public void setLocalPart(String localPart)
- {
- this.localPart = localPart;
- }
-
- /**
- * @return Returns the namespaceURI.
- */
- public String getNamespaceURI()
- {
- return namespaceURI;
- }
-
- /**
- * @param namespaceURI
- * The namespaceURI to set.
- */
- public void setNamespaceURI(String namespaceURI)
- {
- this.namespaceURI = namespaceURI;
- }
-
- public boolean equals(QualifiedName qn)
- {
- return (qn.getNamespaceURI().equals(namespaceURI) && qn.getLocalPart()
- .equals(localPart));
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
deleted file mode 100644
index 9e89985..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/ClientRootFragment.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-public class ClientRootFragment extends SequenceFragment
-{
- public ClientRootFragment()
- {
- add( new SimpleFragment( new PreClientDevelopCommand(), "" ) );
- add( new DevelopClientFragment() );
- add( new SimpleFragment( new PreClientAssembleCommand(), "" ) );
- add( new AssembleClientFragment() );
- add( new SimpleFragment( new PreClientDeployCommand(), "" ) );
- add( new DeployClientFragment() );
- add( new SimpleFragment( new PreClientInstallCommand(), "" ) );
- add( new InstallClientFragment() );
- add( new SimpleFragment( new PreClientRunCommand(), "" ) );
- add( new RunClientFragment() );
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- registry.addMapping( PreClientDevelopCommand.class, "WebService", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", DevelopClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", DevelopClientFragment.class );
-
- // Map the PreClientDevelopCommand into the dataObject.
- registry.addMapping( PreClientDevelopCommand.class, "DataObject", DataObjectCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", AssembleClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", AssembleClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", DeployClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", DeployClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", InstallClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", InstallClientFragment.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Environment", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Context", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Selection", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", RunClientFragment.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", RunClientFragment.class );
-
- //Mappings from framework to framework commands
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientAssembleCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "J2eeLevel", PreClientAssembleCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Project", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Module", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "EarProject", PreClientInstallCommand.class );
- registry.addMapping( PreClientDevelopCommand.class, "Ear", PreClientInstallCommand.class );
-
- registry.addMapping( PreClientDevelopCommand.class, "WebService", PreClientRunCommand.class );
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
deleted file mode 100644
index 15e2af3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientAssembleCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientAssembleCommand extends SimpleCommand
-{
- private IWebServiceClient webServiceClient_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private String j2eeLevel_;
-
- public Status execute(Environment environment)
- {
- System.out.println("In Pre client assemble command.");
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return new SimpleStatus("");
-
- //Create the client EAR module
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(earProject_);
- command.setModuleName(ear_);
- command.setModuleType(CreateModuleCommand.EAR);
- command.setServerFactoryId(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
- command.setServerInstanceId( webServiceClient_.getWebServiceClientInfo().getServerInstanceId() );
- command.setJ2eeLevel(j2eeLevel_);
- Status status = command.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
-
- //Associate the client module and service EAR
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(project_);
- associateCommand.setModule(module_);
- associateCommand.setEARProject(earProject_);
- associateCommand.setEar(ear_);
- status = associateCommand.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
-
- public void setJ2eeLevel( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
deleted file mode 100644
index 9ed91ca..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDeployCommand.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class PreClientDeployCommand extends SimpleCommand
-{
- public Status execute(Environment environment)
- {
- System.out.println( "In Pre client deploy command." );
-
- return super.execute(environment);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
deleted file mode 100644
index e4eac74..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientDevelopCommand.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class PreClientDevelopCommand extends SimpleCommand
-{
- /*
- private String ID_WEB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
- private String ID_EJB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
- private String ID_APP_CLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
- private String ID_JAVA = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
- */
-
- private TypeRuntimeServer typeRuntimeServer_;
- private Environment environment_;
- private IContext context_;
- private ISelection selection_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
- private IWebServiceClient webServiceClient_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
- private boolean test_;
- private String wsdlURI_;
- private Object dataObject_;
-
- public Status execute(Environment environment)
- {
- // Split up the project and module
- int index = module_.indexOf("/");
- if (index!=-1){
- project_ = module_.substring(0,index);
- module_ = module_.substring(index+1);
- }
-
- if (ear_!=null && ear_.length()>0)
- {
- int earIndex = ear_.indexOf("/");
- if (earIndex!=-1) {
- earProject_ = ear_.substring(0,earIndex);
- ear_ = ear_.substring(earIndex+1);
- }
- }
-
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils
- .getWebServiceRuntime(typeRuntimeServer_.getRuntimeId());
- WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
- System.out.println("In Pre client develop command.");
-
- wsInfo.setJ2eeLevel(j2eeLevel_);
- wsInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
- wsInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- wsInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
- wsInfo.setWsdlURL(wsdlURI_);
-
- environment_ = environment;
- webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
- WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
- context_ = new SimpleContext(true, true, true, true, true, true, test_,
- false, scenario, resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(), resourceContext_
- .isCheckoutFilesEnabled());
-
- // Create the client module
-
- int intModuleType = convertModuleType(moduleType_);
-
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(project_);
- command.setModuleName(module_);
- command.setModuleType(intModuleType);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setJ2eeLevel(j2eeLevel_);
- Status status = command.execute(environment);
-
- // rsk todo -- once the clientProjectType extension is gone, determination
- // of what type of module to create will have to be done.
- //if (moduleType_.equals(ID_WEB)) command.setModuleType(CreateModuleCommand.WEB);
- //if (moduleType_.equals(ID_EJB)) command.setModuleType(CreateModuleCommand.EJB);
- //if (moduleType_.equals(ID_APP_CLIENT)) command.setModuleType(CreateModuleCommand.APPCLIENT);
-
- command.setServerInstanceId( typeRuntimeServer_.getServerInstanceId() );
-
-
- if (status.getSeverity() == Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
-
- private int convertModuleType(String type)
- {
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- return CreateModuleCommand.WEB;
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- return CreateModuleCommand.EJB;
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- return CreateModuleCommand.APPCLIENT;
- }
- else if (type.equals(IModuleConstants.JST_EAR_MODULE))
- {
- return CreateModuleCommand.EAR;
- }
- else
- {
- return -1;
- }
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setClientJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public String getJ2eeLevel()
- {
- return j2eeLevel_;
- }
-
- public IWebServiceClient getWebService()
- {
- return webServiceClient_;
- }
-
- public Environment getEnvironment()
- {
- return environment_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- public void setSelection( ISelection selection )
- {
- selection_ = selection;
- }
-
- public String getProject()
- {
- return project_;
- }
-
- public String getModule()
- {
- return module_;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType( String moduleType)
- {
- moduleType_ = moduleType;
- }
-
- public String getEarProject()
- {
- return earProject_;
- }
-
- public String getEar()
- {
- return ear_;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setWsdlURI(String uri)
- {
- wsdlURI_ = uri;
- }
-
- public void setDataObject( Object object )
- {
- dataObject_ = object;
- }
-
- public Object getDataObject()
- {
- Object result = null;
-
- if( dataObject_ != null && dataObject_ instanceof IWebService )
- {
- // The data object has already been set with an IWebService
- // so we will keep this value.
- result = dataObject_;
- }
- else
- {
- result = webServiceClient_;
- }
-
- return result;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
deleted file mode 100644
index 22c9e07..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientInstallCommand.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientInstallCommand extends SimpleCommand
-{
- private IWebServiceClient webServiceClient_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
- public Status execute(Environment environment)
- {
- if (webServiceClient_.getWebServiceClientInfo().getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webServiceClient_.getWebServiceClientInfo().getServerFactoryId());
- Status createServerStatus = createServerCommand.execute(environment);
- if (createServerStatus.getSeverity()==Status.OK)
- {
- webServiceClient_.getWebServiceClientInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
- }
- else
- {
- if (createServerStatus.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(createServerStatus);
- }
- return createServerStatus;
- }
- }
-
-
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
- if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
- {
- command.setProject(earProject_);
- command.setModule(ear_);
- }
- else
- {
- command.setProject(project_);
- command.setModule(module_);
- }
-
- Status status = command.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
deleted file mode 100644
index 70ae569..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/extension/PreClientRunCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class PreClientRunCommand extends SimpleCommand
-{
- private IWebServiceClient webServiceClient_;
-
- public Status execute(Environment environment)
- {
- System.out.println("In Pre client run command.");
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webServiceClient_.getWebServiceClientInfo().getServerInstanceId());
- Status status = command.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
-
- public void setWebService( IWebServiceClient webServiceClient )
- {
- webServiceClient_ = webServiceClient;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
deleted file mode 100644
index 092411e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/plugin/WebServiceConsumptionUIPlugin.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceConsumptionUIPlugin extends AbstractUIPlugin
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.consumption.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceConsumptionUIPlugin instance_;
-
- private PersistentServerRuntimeContext serverRuntimeContext_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceConsumptionUIPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceConsumptionUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
- * @return The WebServiceConsumptionUIPlugin singleton.
- */
- static public WebServiceConsumptionUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
- public static String getMessage ( String key )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.consumption.ui.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See java.text.MessageFormat for
- * further details on substitution.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args The substitution values for the message
- * as required by the message in plugin.properties and
- * by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL installURL = instance_.getBundle().getEntry("/");;
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- public PersistentServerRuntimeContext getServerRuntimeContext()
- {
- if (serverRuntimeContext_ == null)
- {
- serverRuntimeContext_ = new PersistentServerRuntimeContext();
- serverRuntimeContext_.load();
- }
- return serverRuntimeContext_;
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
deleted file mode 100644
index 946f456..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/PersistentServerRuntimeContext.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-/**
- *
- */
-public class PersistentServerRuntimeContext extends PersistentContext {
-
- private String PREFERENCE_SERVER = "PREFERENCE_SERVER";
- private String PREFERENCE_RUNTIME = "PREFERENCE_RUNTIME";
- private String PREFERENCE_J2EE_VERSION = "PREFERENCE_J2EE_VERSION";
-
- private String SERVER_FACTORY_ID_DEFAULT = "org.eclipse.jst.server.tomcat.50";
- private String RUNTIME_ID_DEFAULT = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT";
- private String J2EE_VERSION_DEFAULT = "14";
-
- public PersistentServerRuntimeContext()
- {
- super(WebServiceConsumptionUIPlugin.getInstance());
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.Context#load()
- */
- public void load() {
- //Defaults will be set via the .ini customization. They are hard coded to default values in the
- //absence of a .ini file.
- String serverDefault = getDefaultString(PREFERENCE_SERVER);
- if (serverDefault==null || serverDefault.length()==0)
- {
- setDefault(PREFERENCE_SERVER, SERVER_FACTORY_ID_DEFAULT);
- }
-
- String runtimeDefault = getDefaultString(PREFERENCE_RUNTIME);
- if (runtimeDefault==null || runtimeDefault.length()==0)
- {
- setDefault(PREFERENCE_RUNTIME, RUNTIME_ID_DEFAULT);
- }
-
- String j2eeDefault = getDefaultString(PREFERENCE_J2EE_VERSION);
- if (j2eeDefault==null || j2eeDefault.length()==0)
- {
- setDefault(PREFERENCE_J2EE_VERSION, J2EE_VERSION_DEFAULT);
- }
-
-
- }
-
- public String getDefaultServerFactoryId()
- {
- return getDefaultString(PREFERENCE_SERVER);
- }
-
- public String getDefaultRuntimeId()
- {
- return getDefaultString(PREFERENCE_RUNTIME);
- }
-
- public String getDefaultJ2EEVersion()
- {
- return getDefaultString(PREFERENCE_J2EE_VERSION);
- }
-
- public String getServerFactoryId()
- {
- String value = getValueAsString(PREFERENCE_SERVER);
- /*
- if (value==null || value.length()==0)
- {
- value = SERVER_FACTORY_ID_DEFAULT;
- setServerFactoryId(value);
- }
- */
- return value;
- }
-
- public String getRuntimeId()
- {
- String value = getValueAsString(PREFERENCE_RUNTIME);
- /*
- if (value==null || value.length()==0)
- {
- value = RUNTIME_ID_DEFAULT;
- setRuntimeId(value);
- }
- */
- return value;
- }
-
- public String getJ2EEVersion()
- {
- String value = getValueAsString(PREFERENCE_J2EE_VERSION);
- /*
- if (value==null || value.length()==0)
- {
- value = J2EE_VERSION_DEFAULT;
- setJ2EEVersion(value);
- }
- */
- return value;
- }
-
- public void setServerFactoryId(String id)
- {
- setValue(PREFERENCE_SERVER,id);
- }
-
- public void setRuntimeId(String id)
- {
- setValue(PREFERENCE_RUNTIME, id);
- }
-
- public void setJ2EEVersion(String version)
- {
- setValue(PREFERENCE_J2EE_VERSION, version);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
deleted file mode 100644
index 50cf571..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/preferences/ServerRuntimePreferencePage.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.preferences;
-
-import java.util.ArrayList;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-
-
-/**
- *
- */
-public class ServerRuntimePreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
- private String pluginId_= "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_;
-
- /* CONTEXT_ID SRPF0001 for server preference on the server runtime preference page */
- private String INFOPOP_SRPF_SERVER_PREF = pluginId_ + ".SRPF0001";
- private Combo server_;
-
- /* CONTEXT_ID SRPF0002 for runtime preference on the server runtime preference page */
- private String INFOPOP_SRPF_RUNTIME_PREF = pluginId_ + ".SRPF0002";
- private Combo runtime_;
-
- /* CONTEXT_ID SRPF0003 for J2EE version preference on the server runtime preference page */
- private String INFOPOP_SRPF_J2EE_PREF = pluginId_ + ".SRPF0003";
- private Combo j2eeVersion_;
-
- SelectionListChoices serverToRuntimeToJ2EE_;
-
- public void init(IWorkbench workbench) { }
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
- protected Control createContents(Composite parent)
- {
-
- msgUtils_ = new MessageUtils(pluginId_ + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- Composite page = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- page.setLayout(gl);
- GridData gd = new GridData(GridData.VERTICAL_ALIGN_FILL | GridData.HORIZONTAL_ALIGN_FILL);
- page.setLayoutData(gd);
-
- server_ = uiUtils.createCombo(page,"LABEL_SERVERS_LIST",
- "TOOLTIP_SRPF_COMBO_SERVER",
- INFOPOP_SRPF_SERVER_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- runtime_ = uiUtils.createCombo(page,"LABEL_RUNTIMES_LIST",
- "TOOLTIP_SRPF_COMBO_RUNTIME",
- INFOPOP_SRPF_RUNTIME_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- j2eeVersion_ = uiUtils.createCombo(page,"LABEL_J2EE_VERSION",
- "TOOLTIP_SRPF_COMBO_J2EE",
- INFOPOP_SRPF_J2EE_PREF,
- SWT.SINGLE|SWT.BORDER|SWT.READ_ONLY);
-
- initializeValues();
- startListening();
- return page;
- }
-
- private void initializeValues()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- //serverToRuntimeToJ2EE_ = WebServiceServerRuntimeTypeRegistry.getInstance().getServerToRuntimeToJ2EE();
- serverToRuntimeToJ2EE_ = WebServiceRuntimeExtensionUtils.getServerToRuntimeToJ2EE();
-
-
- setServerItems(serverToRuntimeToJ2EE_.getList().getList());
- String defaultServerText = context.getServerFactoryId();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
- setServerSelection(defaultServerText);
-
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- String defaultRuntimeText = context.getRuntimeId();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
- setRuntimeSelection(defaultRuntimeText);
-
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- String defaultJ2EEVersion = context.getJ2EEVersion();
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
- setJ2EESelection(defaultJ2EEVersion);
-
- }
-
- public void handleEvent(Event event)
- {
- if (server_ == event.widget)
- {
- handleServerSelected();
- }
- else if (runtime_ == event.widget)
- {
- handleRuntimeSelected();
- }
- else if (j2eeVersion_ == event.widget)
- {
- handleJ2EESelected();
- }
- }
-
- private void handleServerSelected()
- {
- stopListening();
-
- String selectedText = getServerSelection();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(selectedText);
-
- //Update the runtime -------------------------------
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- if (serverToRuntimeToJ2EE_.getChoice().getList().getList().length > 0)
- serverToRuntimeToJ2EE_.getChoice().getList().setIndex(0);
-
- String newRuntimeText = serverToRuntimeToJ2EE_.getChoice().getList().getSelection();
- if (newRuntimeText!=null && newRuntimeText.length()>0)
- setRuntimeSelection(newRuntimeText);
-
- //Update the j2ee version -------------------------------
- if (newRuntimeText!=null && newRuntimeText.length()>0)
- {
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-
- String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
- if (newJ2EEText!=null && newJ2EEText.length()>0)
- setJ2EESelection(newJ2EEText);
- }
- else
- {
- setJ2EEItems(new String[0]);
- }
-
- startListening();
- }
-
- private void handleRuntimeSelected()
- {
- stopListening();
-
- String selectedText = getRuntimeSelection();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(selectedText);
-
- //Update the j2ee version -------------------------------
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- if (serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList().length > 0)
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setIndex(0);
-
- String newJ2EEText = serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getSelection();
- if (newJ2EEText!=null && newJ2EEText.length()>0)
- setJ2EESelection(newJ2EEText);
-
- startListening();
- }
-
- private void handleJ2EESelected()
- {
- stopListening();
-
- String selectedText = getJ2EESelection();
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(selectedText);
-
- startListening();
- }
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- setToDefaults();
- }
-
- private void setToDefaults()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
-
- String defaultServerText = context.getDefaultServerFactoryId();
- serverToRuntimeToJ2EE_.getList().setSelectionValue(defaultServerText);
- setServerSelection(defaultServerText);
-
- setRuntimeItems(serverToRuntimeToJ2EE_.getChoice().getList().getList());
- String defaultRuntimeText = context.getDefaultRuntimeId();
- serverToRuntimeToJ2EE_.getChoice().getList().setSelectionValue(defaultRuntimeText);
- setRuntimeSelection(defaultRuntimeText);
-
- setJ2EEItems(serverToRuntimeToJ2EE_.getChoice().getChoice().getList().getList());
- String defaultJ2EEVersion = context.getDefaultJ2EEVersion();
- serverToRuntimeToJ2EE_.getChoice().getChoice().getList().setSelectionValue(defaultJ2EEVersion);
- setJ2EESelection(defaultJ2EEVersion);
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- private void storeValues()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- context.setServerFactoryId(getServerSelection());
- context.setRuntimeId(getRuntimeSelection());
- context.setJ2EEVersion(getJ2EESelection());
- }
-
- protected void performApply()
- {
- performOk();
- }
-
-
- private void startListening()
- {
- server_.addListener(SWT.Selection,this);
- runtime_.addListener(SWT.Selection,this);
- j2eeVersion_.addListener(SWT.Selection,this);
- }
-
- private void stopListening()
- {
- server_.removeListener(SWT.Selection, this);
- runtime_.removeListener(SWT.Selection, this);
- j2eeVersion_.removeListener(SWT.Selection, this);
- }
-
- private void setServerItems(String[] factoryIds)
- {
-
- if (factoryIds != null)
- {
- ArrayList serverLabelsList = new ArrayList();
- for (int i=0;i<factoryIds.length;i++)
- {
- String thisFactoryId = factoryIds[i];
- //String thisServerLabel = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryIds[i]);
- String thisServerLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(factoryIds[i]);
- if (thisServerLabel!=null && thisServerLabel.length()>0)
- {
- serverLabelsList.add(thisServerLabel);
- }
-
- }
- String[] serverLabels = convertToStringArray(serverLabelsList.toArray());
- server_.setItems(serverLabels);
- }
-
- }
-
- private void setRuntimeItems(String[] ids)
- {
- if (ids != null)
- {
- String[] runtimeLabels = new String[ids.length];
- for (int i=0;i<ids.length;i++)
- {
- //runtimeLabels[i] = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(ids[i]);
- runtimeLabels[i] = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(ids[i]);
- }
- runtime_.setItems(runtimeLabels);
- }
-
- }
-
- private void setJ2EEItems(String[] versions)
- {
- if (versions != null)
- {
- String[] j2eeLabels = new String[versions.length];
- for (int i = 0; i < versions.length; i++)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- if (label != null && label.length()>0)
- j2eeLabels[i] = label;
- else
- j2eeLabels[i] = msgUtils_.getMessage("LABEL_NA");
- }
- j2eeVersion_.setItems(j2eeLabels);
-
- //Disable the combo if it has no items.
- if (j2eeLabels.length > 0)
- j2eeVersion_.setEnabled(true);
- else
- j2eeVersion_.setEnabled(false);
- }
-
- }
-
- private String getServerSelection()
- {
- String serverLabel = server_.getText();
- //return WebServiceServerRuntimeTypeRegistry.getInstance().getServerFactoryId(serverLabel);
- return WebServiceRuntimeExtensionUtils.getServerFactoryId(serverLabel);
- }
-
- private String getRuntimeSelection()
- {
- String runtimeLabel = runtime_.getText();
- //return WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeId(runtimeLabel);
- return WebServiceRuntimeExtensionUtils.getRuntimeId(runtimeLabel);
- }
-
- private String getJ2EESelection()
- {
- String j2eeLabel = j2eeVersion_.getText();
- return J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
- }
-
- private void setServerSelection(String factoryId)
- {
- //String label = WebServiceServerRuntimeTypeRegistry.getInstance().getServerLabel(factoryId);
- String label = WebServiceRuntimeExtensionUtils.getServerLabelById(factoryId);
- setSelection(server_,label);
- }
-
- private void setRuntimeSelection(String id)
- {
- //String label = WebServiceServerRuntimeTypeRegistry.getInstance().getRuntimeLabel(id);
- String label = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(id);
- setSelection(runtime_,label);
- }
-
- private void setJ2EESelection(String version)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(version);
- setSelection(j2eeVersion_, label);
- }
-
- private void setSelection(Combo combo, String s)
- {
- String[] items = combo.getItems();
- for (int i=0; i<items.length; i++)
- {
- if (items[i].equals(s))
- {
- combo.select(i);
- return;
- }
- }
- }
-
- private String[] convertToStringArray(Object[] a)
- {
- if (a==null) return new String[0];
-
- int length = a.length;
- String[] sa = new String[length];
- for (int i=0; i<length; i++)
- {
- Object obj = a[i];
- if (obj instanceof String)
- {
- sa[i] = (String)obj;
- }
- }
- return sa;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
deleted file mode 100644
index 96b9860..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/selection/SelectionTransformer.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.selection;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.Selection;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class SelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- IStructuredSelection inSelection = (IStructuredSelection)value;
- Selection outSelection = new Selection();
-
- outSelection.setSelection( inSelection.toArray() );
-
- return outSelection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
deleted file mode 100644
index fa328a1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AbstractHandlersWidgetDefaultingCmd.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
- * AbstractHandlersWidgetDefaultingCmd
- *
- * Initialize and load the handlers data
- */
-public abstract class AbstractHandlersWidgetDefaultingCmd extends SimpleCommand {
-
- private IStructuredSelection initialSelection_;
- private IProject project_;
- private String componentName_;
-
- public Status execute(Environment env){
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- Status status = new SimpleStatus("");
-
- IStructuredSelection selection = initialSelection_;
- if (selection == null) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- return status;
-
- }
-
-
- public List getClientHandlers(){
- return null;
- }
-
- public void setInitialSelection(IStructuredSelection initSelection){
- this.initialSelection_ = initSelection;
- }
-
- public IStructuredSelection getInitialSelection(){
- return this.initialSelection_;
- }
-
- protected IResource getResourceFromInitialSelection()
- {
- if (initialSelection_ != null && initialSelection_.size() == 1)
- {
- Object obj = initialSelection_.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- return resource;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- public IProject getProject(){
-
- IResource resource = getResourceFromInitialSelection();
- if (resource != null)
- {
- return ResourceUtils.getProjectOf( resource.getFullPath() );
- }
-
- return null;
- }
-
- public String getComponentName(){
- IResource resource = getResourceFromInitialSelection();
- if (resource!=null) {
- IPath absolutePath = resource.getFullPath();
- if (absolutePath.isAbsolute()) {
- return absolutePath.segment(1);
- }
- }
- return null;
- }
-
-// public WebServiceEditModel getWebServiceEditModel() {
-// WebServicesManager wsm = new WebServicesManager();
-// IProject project = getProject();
-// return wsm.getWSEditModel(project);
-// }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
deleted file mode 100644
index 8a95a5a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/AddHandlerDialog.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 12, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-
-public class AddHandlerDialog extends Dialog implements Listener {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_;
- private boolean validateOn_;
- private boolean isClient_;
- private String className;
- private String name;
- private String[] portNames;
- private String selectedPortName;
-
- private Text classNameText;
- private Text nameText;
- private Combo portNameCombo;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID AHDL0001 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_NAME = "AHDL0001"; //$NON-NLS-1$
- private final String TOOLTIP_TEXT_HANDLER_NAME = "TOOLTIP_TEXT_HANDLER_NAME";
-
- /* CONTEXT_ID AHDL0002 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_CLASS = "AHDL0002"; //$NON-NLS-1$
- private final String TOOLTIP_TEXT_HANDLER_CLASS = "TOOLTIP_TEXT_HANDLER_CLASS";
-
- /* CONTEXT_ID AHDL0001 for the Handler Config Page */
- private final String INFOPOP_TEXT_HANDLER_PORT = "AHDL0003"; //$NON-NLS-1$
- private final String TOOLTIP_TEXT_HANDLER_PORT = "TOOLTIP_TEXT_HANDLER_PORT";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- public AddHandlerDialog( Shell shell, boolean isClientHandler)
- {
- super(shell);
- isClient_ = isClientHandler;
- }
-
- protected Control createContents(Composite parent) {
- Composite comp = (Composite) super.createContents(parent);
- parent.getShell().pack();
- return comp;
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- Shell thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- thisShell.setText(msgUtils_.getMessage("DIALOG_TITLE_WS_ADD_HANDLER"));
-
- Composite composite = (Composite) super.createDialogArea(parent);
-
- Composite sourceLocationComp = uiUtils.createComposite(composite, 3);
-
- classNameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_CLASS", TOOLTIP_TEXT_HANDLER_CLASS, INFOPOP_TEXT_HANDLER_CLASS, SWT.SINGLE | SWT.BORDER);
- classNameText.addListener(SWT.Modify,this);
-
- beanClassBrowseButton_ = uiUtils.createPushButton( sourceLocationComp, "BUTTON_BROWSE_CLASSES",
- "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- nameText = uiUtils.createText(sourceLocationComp, "LABEL_TEXT_HANDLER_NAME", TOOLTIP_TEXT_HANDLER_NAME, INFOPOP_TEXT_HANDLER_NAME, SWT.SINGLE | SWT.BORDER );
- nameText.addListener(SWT.Modify, this);
-
- // dummy label for column 3.
- new Label( sourceLocationComp, SWT.NONE );
-
- if (!isClient_){
- portNameCombo = uiUtils.createCombo(sourceLocationComp, "LABEL_TEXT_HANDLER_PORT", TOOLTIP_TEXT_HANDLER_PORT, INFOPOP_TEXT_HANDLER_PORT, SWT.SINGLE | SWT.BORDER );
- portNameCombo.addListener(SWT.Modify, this);
-
- // dummy label for column 3.
- new Label( sourceLocationComp, SWT.NONE );
- }
- validateOn_ = true;
- return composite;
- }
-
- private void handleBrowseClasses()
- {
- Shell shell = getShell();
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
-
- if( itype != null )
- {
- classNameText.setText(itype.getFullyQualifiedName());
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.widgets.Listener#handleEvent(org.eclipse.swt.widgets.Event)
- */
- public void handleEvent(Event event) {
- if (!validateOn_)
- return;
- if (classNameText == event.widget) {
- handleClassNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- if (nameText == event.widget) {
- handleNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- if (portNameCombo == event.widget) {
- handlePortNameTextEvent();
- validateTextFieldEntries();
- return;
- }
- }
-
- private void handleClassNameTextEvent(){
- className = classNameText.getText();
- if (className.lastIndexOf(".java") != -1){
- nameText.setText(className.substring(0, className.lastIndexOf(".java")));
- }
- else {
- nameText.setText(className);
- }
-
- if (className.lastIndexOf(".") != -1){
- nameText.setText(className.substring(className.lastIndexOf(".")+1, className.length()));
- }
- name = nameText.getText();
- }
-
- private void handleNameTextEvent() {
- name = nameText.getText();
-
- }
-
- private void handlePortNameTextEvent(){
- selectedPortName = portNameCombo.getText();
- }
-
- private void disableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(false);
- }
-
- private void enableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(true);
- }
-
- private void validateTextFieldEntries(){
- if (classNameText.getText().equals("")){
- disableOKButton();
- return;
- }
- if (nameText.getText().equals("")){
- disableOKButton();
- return;
- }
- if (!isClient_){
- if (portNameCombo.getText()!=null && portNameCombo.getText().equals("")){
- disableOKButton();
- return;
- }
- else if (portNameCombo.getText()==null) {
- disableOKButton();
- return;
- }
- }
-
- enableOKButton();
-
-
- }
-
- /**
- * @return Returns the className.
- */
- public String getClassName() {
- if (className.lastIndexOf(".java") != -1){
- return className.substring(0, className.lastIndexOf(".java"));
- }
- else {
- return className;
- }
- }
- /**
- * @param className The className to set.
- */
- public void setClassName(String className) {
- this.className = className;
- }
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @param name The name to set.
- */
- public void setName(String name) {
- this.name = name;
- }
- /**
- * @return Returns the portName.
- */
- public String getPortName() {
- return selectedPortName;
- }
- /**
- * @param portName The portName to set.
- */
- public void setPortNames(String[] portNames) {
- this.portNames = portNames;
- portNameCombo.setItems(portNames);
- portNameCombo.select(0);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index 60443a3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Collection;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.ApplicationClientNatureRuntime;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * ClientHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ClientHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private HandlerTableItem[] handlers_;
-
- private MessageUtils msgUtils_;
-
- private boolean isGenSkeletonEnabled_;
-
- private IPath sourceOutputLocation_;
-
- private Hashtable wsRefsToHandlersTable_;
-
- private Hashtable refNameToServiceRefObj_;
-
-// private WebServiceEditModel wsEditModel_;
-
- private WebServicesManager webServicesManager_;
-
- private IProject project_;
-
- private String componentName_;
-
- private WebServicesResource wsClientRes_;
-
- private String serviceRefName_ = null;
-
- private Collection wsServiceRefs_;
-
- public Status execute(Environment env) {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- Status status = new SimpleStatus("");
-
- webServicesManager_ = new WebServicesManager();
-
- IStructuredSelection selection = getInitialSelection();
- if (selection == null) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- status = processHandlers();
- return status;
-
- }
-
- public Status processHandlers() {
- try {
- Vector handlers = new Vector();
- wsRefsToHandlersTable_ = new Hashtable();
- refNameToServiceRefObj_ = new Hashtable();
-
-// wsEditModel_ = getWebServiceEditModel();
-
- wsServiceRefs_ = getWSServiceRefsFromSelection();
-
- if (wsServiceRefs_ != null) {
- Iterator wsRefsIter = wsServiceRefs_.iterator();
- for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
- ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
- List wsHandlers = wsServiceRef.getHandlers();
- HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];
- for (int k = 0; k < wsHandlers.size(); k++) {
-
- Handler wsHandler = (Handler) wsHandlers.get(k);
-
- HandlerTableItem handlerItem = new HandlerTableItem();
- handlerItem.setHandler(wsHandler);
- handlerItem.setHandlerName(wsHandler.getHandlerName());
- handlerItem.setHandlerClassName(wsHandler.getHandlerClass().getQualifiedName());
- handlerItem.setWsDescRef(wsServiceRef);
- handlerItems[k] = handlerItem;
- handlers.add(handlerItem);
- }
- String wsServiceRefName = wsServiceRef.getServiceRefName();
- wsRefsToHandlersTable_.put(wsServiceRefName, handlerItems);
- refNameToServiceRefObj_.put(wsServiceRefName, wsServiceRef);
-
- }
-
- handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
- }
- }
- catch (Exception e) {
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, e);
- }
- return new SimpleStatus("");
- }
-
- public HandlerTableItem[] getAllHandlers() {
- return this.handlers_;
- }
-
- public Hashtable getHandlers() {
- return wsRefsToHandlersTable_;
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean getGenSkeletonEnabled() {
- return true;
- }
-
- /**
- * @return Returns the sourceOutputLocation_.
- */
- public IPath[] getSourceOutputLocation() {
- IPath[] locations = null;
- if (project_==null)
- project_ = getProject();
- if (project_ != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project_);
- }
-
- return locations;
- }
-
- /**
- * @return Returns the wsEditModel.
- */
-// public WebServiceEditModel getWsEditModel() {
-// return wsEditModel_;
-// }
-
- public String getServiceRefName() {
- return this.serviceRefName_;
- }
-
- public WebServicesResource getWsClientResource() {
- return wsClientRes_;
- }
-
- public IProject getClientProject() {
- return project_;
- }
-
- private Collection getWSServiceRefsFromSelection() {
-
- IStructuredSelection initSel = getInitialSelection();
- if (initSel != null && initSel.size() == 1) {
- Object obj = initSel.getFirstElement();
- ServiceRef serviceRef = null;
- if (obj instanceof ServiceRef) {
- // Client ServiceRef
- serviceRef = (ServiceRef) obj;
- serviceRefName_ = serviceRef.getServiceRefName();
- project_ = ProjectUtilities.getProject(serviceRef);
- }
- else if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- serviceRef = wsngt.getServiceRef();
- serviceRefName_ = serviceRef.getServiceRefName();
- project_ = ProjectUtilities.getProject(serviceRef);
- }
-
- if (project_==null){
- project_ = getProject();
- }
- if (project_==null){
- return null;
- }
-
- // get module name
- componentName_ = getComponentName();
-
- ComponentHandle ch = ComponentHandle.create(project_, componentName_);
-
- List clientWSResourceList = webServicesManager_.get13ServiceRefs(ch);
- if (!clientWSResourceList.isEmpty())
- wsClientRes_ = (WebServicesResource)clientWSResourceList.get(0);
-
- if (J2EEUtils.isWebComponent(project_, componentName_)) {
- WebArtifactEdit webEdit = null;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project_, componentName_);
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(vc);
- if (webEdit != null)
- {
- WebApp webApp = (WebApp) webEdit.getDeploymentDescriptorRoot();
- if (webApp != null) {
- return webServicesManager_.getServiceRefs(webApp);
- }
- }
- }
- finally{
- if(webEdit!=null)
- webEdit.dispose();
- }
- }
- else if (J2EEUtils.isAppClientComponent(project_, componentName_)){
- ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
- if (rt!=null) {
- ApplicationClient appClient = rt.getApplicationClient();
- if (appClient != null){
- return webServicesManager_.getServiceRefs(appClient);
- }
- }
- }
- else if (J2EEUtils.isEJBComponent(project_, componentName_)){
- EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
- if(rt!=null){
- EJBJar ejbJar = rt.getEJBJar();
- if (ejbJar !=null){
- return webServicesManager_.getServiceRefs(ejbJar);
- }
- }
- }
-
-
- }
- return null;
- }
-
- public Hashtable getRefNameToServiceRef() {
- return this.refNameToServiceRefObj_;
- }
-
- public Collection getWsServiceRefs(){
- return this.wsServiceRefs_;
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
deleted file mode 100644
index d6301b0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.ApplicationClientNatureRuntime;
-import org.eclipse.jst.j2ee.internal.J2EEEditModel;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.Webservice_clientFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.wsclient.Handler;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsclient.Webservice_clientFactory;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *
- */
-public class ClientHandlersWidgetOutputCommand extends SimpleCommand {
-
- //private List handlerTableItems_;
- private Hashtable oldWSServiceRefsToHandlersTable_;
-
- private Hashtable newWSServiceRefsToHandlersTable_;
-
-// private WebServiceEditModel wsEditModel_;
-
- private Hashtable handlersTable_;
-
- private IProject project_;
-
- private WebServicesResource wsClientRes_;
-
- private Collection wsServiceRefs_;
-
- private J2EEEditModel editModel_;
-
- private Object accessorKey_;
-
- public Status execute(Environment env) {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- Status status = new SimpleStatus("");
-
- try {
-
- JavaEMFNature jMOF = (JavaEMFNature) JavaEMFNature.createRuntime(project_);
-
- oldWSServiceRefsToHandlersTable_ = new Hashtable();
- newWSServiceRefsToHandlersTable_ = new Hashtable();
-
- if (wsServiceRefs_ != null) {
- Iterator wsRefsIter = wsServiceRefs_.iterator();
- for (int i = 0; i < wsServiceRefs_.size(); i++) {
-
- ServiceRef wsServiceRef = (ServiceRef) wsRefsIter.next();
-
- List wsHandlers = wsServiceRef.getHandlers();
- oldWSServiceRefsToHandlersTable_.put(wsServiceRef, wsHandlers);
- newWSServiceRefsToHandlersTable_.put(wsServiceRef, new ArrayList());
- }
-
- Enumeration e = handlersTable_.keys();
- while (e.hasMoreElements()) {
-
- String serviceRefName = (String) e.nextElement();
- List handlerTableItems_ = (List) handlersTable_.get(serviceRefName);
- if (handlerTableItems_ != null) {
- // form Handler tables
- for (int i = 0; i < handlerTableItems_.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems_.get(i);
- Object wsModelRef = hti.getWsDescRef();
- if (wsModelRef != null && wsModelRef instanceof ServiceRef) {
- ServiceRef wsRef = (ServiceRef) wsModelRef;
-
- Object handler = hti.getHandler();
- if (handler != null && handler instanceof Handler) {
- // clone it
- Handler clonedHandler = (Handler) EtoolsCopyUtility.createCopy((Handler) handler);
- ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(clonedHandler);
- }
- else {
- // create it
- Webservice_clientFactory wsClientFactory = new Webservice_clientFactoryImpl();
- Handler newHandler = wsClientFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
-
- JavaClass javaClass = (JavaClass) JavaClassImpl.reflect(hti.getHandlerClassName(), jMOF.getResourceSet());
- if (javaClass != null) {
- newHandler.setHandlerClass(javaClass);
- }
-
- ((List) newWSServiceRefsToHandlersTable_.get(wsRef)).add(newHandler);
- }
-
- }
-
- }
- }
- }
-
- // add handlers to ports
- addHandlersToServiceRefs();
- getJ2EEEditModel();
-
- // save the resource
- if (J2EEUtils.getJ2EEVersion(project_) == J2EEVersionConstants.J2EE_1_4_ID) {
- editModel_.save(accessorKey_);
- }
- else {
- if (wsClientRes_!=null)
- wsClientRes_.save(new HashMap());
- }
- }
- }
- catch (Exception e) {
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, e);
- }
- finally {
- if (editModel_ != null)
- editModel_.releaseAccess(accessorKey_);
- }
- return status;
- }
-
- private void addHandlersToServiceRefs() {
- try {
- int key = 0;
- Enumeration refsToHandlers = newWSServiceRefsToHandlersTable_.keys();
- while (refsToHandlers.hasMoreElements()) {
- ServiceRef serviceRef = (ServiceRef) refsToHandlers.nextElement();
- if (serviceRef != null) {
-
- List handlers = (List) newWSServiceRefsToHandlersTable_.get(serviceRef);
- List modelHandlers = (List) oldWSServiceRefsToHandlersTable_.get(serviceRef);
- modelHandlers.clear();
- modelHandlers.addAll(handlers);
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @param handlerTableItems
- * The handlerTableItems to set.
- */
- // public void setAllHandlersList(List handlerTableItems) {
- // this.handlerTableItems_ = handlerTableItems;
- // }
- public void setHandlersTable(Hashtable handlersTable) {
- this.handlersTable_ = handlersTable;
- }
-
- /**
- * @param wsEditModel
- * The wsEditModel to set.
- */
-// public void setWsEditModel(WebServiceEditModel wsEditModel) {
-// this.wsEditModel_ = wsEditModel;
-// }
-
- public void setClientProject(IProject project) {
- this.project_ = project;
- }
-
- public void setWsClientResource(WebServicesResource wsRes) {
- this.wsClientRes_ = wsRes;
- }
-
- public void setWsServiceRefs(Collection wsRefs) {
- this.wsServiceRefs_ = wsRefs;
- }
-
- public void getJ2EEEditModel() {
- accessorKey_ = new Object();
- if (ResourceUtils.isWebProject(project_)) {
- J2EEWebNatureRuntime rt = J2EEWebNatureRuntime.getRuntime(project_);
- if (rt != null) {
- editModel_ = rt.getWebAppEditModelForWrite(accessorKey_);
- }
- }
- else if (ResourceUtils.isAppClientProject(project_)){
- ApplicationClientNatureRuntime rt = ApplicationClientNatureRuntime.getRuntime(project_);
- if (rt!=null) {
- editModel_ = rt.getAppClientEditModelForWrite(accessorKey_);
- }
- }
- else if (ResourceUtils.isEJBProject(project_)){
- EJBNatureRuntime rt = EJBNatureRuntime.getRuntime(project_);
- if(rt!=null){
- editModel_ = rt.getEJBEditModelForWrite(accessorKey_);
- }
- }
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
deleted file mode 100644
index 82b37bf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidget.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidget extends SimpleWidgetDataContributor
-{
- private WebServiceClientTypeWidget clientWidget_;
- private PreferencesSelectionWidget preferencesWidget_;
-
- /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/
- private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
- private Button testService_;
-
- /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the project page*/
- private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWRPR0014";
- private Button monitorService;
-
- /*CONTEXT_ID PWPR0001 for the Project Page*/
- private String INFOPOP_PWPR_PAGE = "PWPR0001";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, pluginId );
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PWPR_PAGE );
-
- Composite clientComposite = utils.createComposite( parent, 1 );
-
- clientWidget_ = new WebServiceClientTypeWidget();
- clientWidget_.addControls(clientComposite, statusListener );
-
-
- // Create test service check box.
- Composite testGroup = utils.createComposite(clientComposite,1);
-
- testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
- "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
- INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
- // Create monitor service check box.
- monitorService = utils.createCheckbox(testGroup, "CHECKBOX_MONITOR_WEBSERVICE", "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE", INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE);
-
- // Create the preferences controls.
- preferencesWidget_ = new PreferencesSelectionWidget();
- preferencesWidget_.addControls( clientComposite, statusListener );
-
- return this;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- preferencesWidget_.setResourceContext( context );
- }
-
- public ResourceContext getResourceContext()
- {
- return preferencesWidget_.getResourceContext();
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testService_.getSelection() );
- }
-
- public void setTestService( Boolean value )
- {
- testService_.setSelection( value.booleanValue() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(monitorService.getSelection());
- }
-
- public void setMonitorService(Boolean value)
- {
- monitorService.setSelection(value.booleanValue());
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 3129a7e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidgetDefaultingCommand extends SimpleCommand
-{
- public Boolean getTestService()
- {
- return new Boolean( getScenarioContext().getTestWebService() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean( getScenarioContext().getMonitorWebService());
- }
-
- public ResourceContext getResourceContext()
- {
- return WebServicePlugin.getInstance().getResourceContext();
- }
-
- // Current ScenarioContext is used to default the first page of the wizard. The
- // properties in ScenarioContext are mapped individual. Therefore, ScenarioContext
- // should not also be mapped.
- protected ScenarioContext getScenarioContext()
- {
- return WebServicePlugin.getInstance().getScenarioContext();
- }
-
- // TODO Set client name defaults here.
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- // rskreg
- //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
- String type = getScenarioContext().getClientWebServiceType();
- //String runtime = registry.getAllClientRuntimes()[0];
- String runtime = WebServiceRuntimeExtensionUtils.getAllClientRuntimes()[0];
- //String server = registry.getAllClientServerFactoryIds()[0];
- String server = WebServiceRuntimeExtensionUtils.getAllClientServerFactoryIds()[0];
- TypeRuntimeServer result = new TypeRuntimeServer();
- // rskreg
-
- result.setTypeId( type );
- result.setRuntimeId( runtime );
- result.setServerId( server );
-
- return result;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
deleted file mode 100644
index 69436a0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ClientWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ClientWizardWidgetOutputCommand extends SimpleCommand
-{
- private boolean testService_;
- private boolean monitorService;
- private ResourceContext resourceContext_;
- private TypeRuntimeServer clientIds_;
-
- public boolean getTestService()
- {
- return testService_;
- }
-
- public void setTestService( boolean testService )
- {
- testService_ = testService;
- }
-
- public boolean getMonitorService()
- {
- return monitorService;
- }
-
- public void setMonitorService(boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public ResourceContext getResourceContext()
- {
-
- return resourceContext_;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- resourceContext_ = context;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientIds_;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer clientIds )
- {
- clientIds_ = clientIds;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
deleted file mode 100644
index 5a8499a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigClientHandlersTableWidget.java
+++ /dev/null
@@ -1,594 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * ConfigClientHandlersTreeWidget
- *
- */
-public class ConfigClientHandlersTableWidget extends SimpleWidgetDataContributor {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_ = null;
- private Listener statusListener_;
- private Composite parent_;
- private boolean isGenSkeletonEnabled_;
- private String outputLocation_;
- private Combo webServiceRefCombo_;
- private Table handlersTable_;
- private TableViewer tableViewer_;
- private Button addButton_;
- private Button removeButton_;
- private Button genSkeletonRadioButton_;
- private Combo sourceLocationCombo_;
-
- private Hashtable pathsTable_ = new Hashtable();
- private Hashtable wsRefsToHandlers_;
- private Hashtable refNameToServiceRef_;
- private Vector orderedHandlers_;
- //private ServiceRef serviceRef_;
- private String serviceRefName_;
- private int DEFAULT_COLUMN_WIDTH = 150;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID HDLR0001 for the Handler Config Page */
- private final String INFOPOP_HDLR_WS_HANDLERS = "HDLR0001"; //$NON-NLS-1$
- private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
- /* CONTEXT_ID HDLR0002 for the Handler Config Page */
- private final String INFOPOP_HDLR_GEN_SKELETON = "HDLR0002"; //$NON-NLS-1$
- private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
- /* CONTEXT_ID HDLR0003 for the Handler Config Page */
- private final String INFOPOP_COMBO_SOURCE_LOC = "HDLR0003"; //$NON-NLS-1$
- private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
- /* CONTEXT_ID HDLR0004 for the Handler Config Page */
- private final String INFOPOP_WS_CLIENT_REF = "HDLR0004"; //$NON-NLS-1$
- private final String TOOLTIP_WS_CLIENT_REF = "TOOLTIP_WS_CLIENT_REF";
-
- // ------------------------
-
- public ConfigClientHandlersTableWidget() {
- super();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- parent_ = parent;
- statusListener_ = statusListener;
-
- // Web service reference combo
- Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
- webServiceRefCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_CLIENT_REF", TOOLTIP_WS_CLIENT_REF, INFOPOP_WS_CLIENT_REF,
- SWT.READ_ONLY);
- webServiceRefCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleWebServiceRefCombo(evt);
- }
- });
-
- Composite displayComp = new Composite(parent_, SWT.NONE);
- GridLayout gridlayout = new GridLayout(2, false);
- displayComp.setLayout(gridlayout);
- displayComp.setLayoutData(uiUtils.createFillAll());
-
- Composite handlersComp = uiUtils.createComposite(displayComp, 1);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_FILL);
- handlersComp.setLayoutData(griddata);
- handlersComp.setSize(130, 600);
-
- Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonsComp.setLayoutData(griddata);
-
- Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
- handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- handlersText.setLayoutData(gd);
-
- handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
- handlersTable_.setHeaderVisible(true);
- handlersTable_.setLinesVisible(true);
-
- // empty space
- Label wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveUpButton.setLayoutData(griddata);
- moveUpButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveUpButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveDownButton.setLayoutData(griddata);
- moveDownButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveDownButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- // empty space
- wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- addButton_.setLayoutData(griddata);
- addButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- removeButton_.setLayoutData(griddata);
- removeButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
- enableRemove(false);
-
- // table stuff
- String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS")};
-
- for (int i = 0; i < columns_.length; i++) {
- TableColumn tableColumn = new TableColumn(handlersTable_, i);
- tableColumn.setText(columns_[i]);
- tableColumn.setAlignment(SWT.LEFT);
- tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
- tableColumn.setResizable(true);
- }
-
- tableViewer_ = new TableViewer(handlersTable_);
- Control control = tableViewer_.getControl();
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- control.setLayoutData(data);
-
- tableViewer_.setColumnProperties(columns_);
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- enableRemove(true);
- }
- });
-
- // gen skeleton check box
- genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
- genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleGenSkeletonRadioButton();
- }
- });
-
- // source location combo
- Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
- sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
- SWT.READ_ONLY);
- sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleSourceLocationCombo(evt);
- }
- });
-
- return this;
- }
-
- // Called at start
- private void populateHandlersTable() {
- try {
-
- int sizeOfHandlers = wsRefsToHandlers_.size();
- String[] wsRefs = new String[sizeOfHandlers];
-
- String[] wsRefNames = (String[]) wsRefsToHandlers_.keySet().toArray(new String[0]);
- webServiceRefCombo_.setItems(wsRefNames);
- webServiceRefCombo_.select(0);
-
- if (sizeOfHandlers < 1) {
- webServiceRefCombo_.select(0);
- webServiceRefCombo_.setEnabled(false);
- }
- else {
- if (serviceRefName_ != null) {
- int index = webServiceRefCombo_.indexOf(serviceRefName_);
- if (index != -1) webServiceRefCombo_.select(index);
- }
- else
- webServiceRefCombo_.select(0);
- }
-
- // get webServiceRef hint
- String wsRef = webServiceRefCombo_.getText();
-
- if (wsRefsToHandlers_.get(wsRef) != null) {
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRef);
- tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- /**
- * @return Returns the handlers.
- */
- public List getAllHandlersList() {
- // convert to a ArrayList and return as List
- List list = new ArrayList();
- if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
- return list;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus() {
- Status finalStatus = new SimpleStatus("");
-
- return finalStatus;
- }
-
- private void handleAddButtonSelected(SelectionEvent event) {
-
- AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), true);
- dialog.create();
- dialog.getShell().setSize( 500, 200 );
-
- int result = dialog.open();
-
- if (result == Window.OK) {
- String name = dialog.getName();
- String className = dialog.getClassName();
-
- HandlerTableItem hi = new HandlerTableItem();
- hi.setHandlerName(name);
- hi.setHandlerClassName(className);
- String wsRefName = webServiceRefCombo_.getText();
- ServiceRef serviceRef = (ServiceRef) refNameToServiceRef_.get(wsRefName);
- hi.setWsDescRef(serviceRef);
-
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
- orderedHandlers_.add(hi);
-
- }
-
- refresh();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event) {
- handleDeleteKeyPressed();
- }
-
- private void handleMoveUpButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- ISelection selected = tableViewer_.getSelection();
- if (index != -1) {
- if (index > 0) {
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index - 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- private void handleMoveDownButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- ISelection selected = tableViewer_.getSelection();
- if (index != -1) {
- if (index < orderedHandlers_.size() - 1) {
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index + 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- public void handleSourceLocationCombo(SelectionEvent event) {
- outputLocation_ = sourceLocationCombo_.getText();
- }
-
- public void handleGenSkeletonRadioButton() {
- if (genSkeletonRadioButton_.isEnabled()) {
- if (genSkeletonRadioButton_.getSelection())
- this.isGenSkeletonEnabled_ = true;
- else
- this.isGenSkeletonEnabled_ = false;
- }
- }
-
- public void handleWebServiceRefCombo(SelectionEvent event) {
-
- if (webServiceRefCombo_.isEnabled()) {
- String webServiceRefName = webServiceRefCombo_.getText();
- Vector hndlers = (Vector) wsRefsToHandlers_.get(webServiceRefName);
- //HandlerTableItem item = (HandlerTableItem)hndlers.get(0);
- //serviceRef_ = (ServiceRef)item.getWsDescRef();
- if (hndlers != null) {
- tableViewer_.setInput(hndlers);
- tableViewer_.refresh();
- }
- }
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean isGenSkeletonEnabled_() {
- return isGenSkeletonEnabled_;
- }
-
- protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object object, int columnIndex) {
-
- if (object instanceof HandlerTableItem) {
- HandlerTableItem hti = (HandlerTableItem) object;
- if (columnIndex == 0) {
-
- return hti.getHandlerName() != null ? hti.getHandlerName() : "";
- }
- else if (columnIndex == 1) { return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : ""; }
- }
- return null;
- }
-
- }
-
- private void enableRemove(boolean enabled) {
- removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- protected class ListContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object element) {
- if (element instanceof Vector) { return ((Vector) element).toArray(); }
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj) {
- }
-
- public boolean isDeleted(Object object) {
- return false;
- }
- }
-
- private void handleDeleteKeyPressed() {
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- int selectionIndex = handlersTable_.getSelectionIndex();
- int selectionCount = handlersTable_.getItemCount();
-
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(webServiceRefCombo_.getText());
- orderedHandlers_.remove(selectionIndex);
- refresh();
- }
- }
-
- public void refresh() {
- try {
- tableViewer_.setInput(null);
- if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
- this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
- genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
- }
-
- public boolean getGenSkeletonEnabled() {
- return this.isGenSkeletonEnabled_;
- }
-
- public void setSourceOutputLocation(IPath[] locations) {
- if (locations[0]!=null)
- this.outputLocation_ = locations[0].toString();
- else
- return;
-
- String[] paths = new String[locations.length];
- for (int i = 0; i < locations.length; i++) {
- paths[i] = locations[i].toString();
- pathsTable_.put(paths[i], locations[i]);
- }
- sourceLocationCombo_.setItems(paths);
- sourceLocationCombo_.select(0);
-
- }
-
- public IPath getSourceOutputLocation() {
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- return outputPath;
- }
-
- /**
- * @return Returns the handlerClassNames.
- */
- public String[] getHandlerClassNames() {
- Vector handlerClasses = new Vector();
-
- Enumeration e = wsRefsToHandlers_.keys();
- while (e.hasMoreElements()) {
-
- String wsRefName = (String) e.nextElement();
- orderedHandlers_ = (Vector) wsRefsToHandlers_.get(wsRefName);
-
- if (orderedHandlers_ != null) {
- for (int i = 0; i < orderedHandlers_.size(); i++) {
- HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
- handlerClasses.add(hti.getHandlerClassName());
- }
- }
- }
- return (String[])handlerClasses.toArray(new String[0]);
- }
-
- /**
- * @return Returns the wsRefsToHandlers_.
- */
- public Hashtable getWsRefsToHandlers() {
- return wsRefsToHandlers_;
- }
-
- /**
- * @param wsRefsToHandlers_
- * The wsRefsToHandlers_ to set.
- */
- public void setWsRefsToHandlers(Hashtable wsRefsToHandlersArray) {
-
- wsRefsToHandlers_ = new Hashtable();
- try {
-
- if (wsRefsToHandlersArray != null) {
- int sizeOfHandlers = wsRefsToHandlersArray.size();
- String[] wsRefs = new String[sizeOfHandlers];
- // store the wsRefs
- Enumeration wsRef = wsRefsToHandlersArray.keys();
- while (wsRef.hasMoreElements()) {
- String wsRefName = (String) wsRef.nextElement();
-
- HandlerTableItem[] handlers = (HandlerTableItem[]) wsRefsToHandlersArray.get(wsRefName);
- // process the handlersTable
- orderedHandlers_ = new Vector();
- for (int i = 0; i < handlers.length; i++) {
- orderedHandlers_.add(handlers[i]);
- }
- wsRefsToHandlers_.put(wsRefName, orderedHandlers_);
-
- }
- }
- populateHandlersTable();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void setServiceRefName(String wsRefName) {
- serviceRefName_ = wsRefName;
- }
-
- public void setRefNameToServiceRef(Hashtable refName2SF) {
- this.refNameToServiceRef_ = refName2SF;
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
deleted file mode 100644
index 78a6343..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ConfigServiceHandlersTableWidget.java
+++ /dev/null
@@ -1,633 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * ConfigServiceHandlersTreeWidget
- *
- */
-public class ConfigServiceHandlersTableWidget extends SimpleWidgetDataContributor {
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private MessageUtils msgUtils_ = null;
- private Listener statusListener_;
- private Composite parent_;
- private boolean isGenSkeletonEnabled_;
- private String outputLocation_;
-
- private Table handlersTable_;
- private TableViewer tableViewer_;
- private Combo webServiceDescCombo_;
- private Button addButton_;
- private Button removeButton_;
- private Button genSkeletonRadioButton_;
- private Combo sourceLocationCombo_;
- private Text text_; // selected Text
-
- private HandlerTableItem[] handlers;
- private Hashtable pathsTable_ = new Hashtable();
- private Hashtable wsDescToHandlers_;
- private Hashtable wsDescToPorts_;
- private Hashtable serviceDescNameToDescObj_;
- private String descriptionName_ = null;
-
- private Vector orderedHandlers_;
-
- private int DEFAULT_COLUMN_WIDTH = 90;
-
- // ----TOOLTIPS Section----
- /* CONTEXT_ID SHLD0001 for the Handler Config Page */
- private final String INFOPOP_HDLR_WS_HANDLERS = "SHDL0001"; //$NON-NLS-1$
- private final String TOOLTIP_EDIT_WS_HANDLERS = "TOOLTIP_EDIT_WS_HANDLERS";
-
- /* CONTEXT_ID SHDL0002 for the Handler Config Page */
- private final String INFOPOP_HDLR_GEN_SKELETON = "SHDL0002"; //$NON-NLS-1$
- private final String TOOLTIP_BUTTON_GEN_SKELETON = "TOOLTIP_BUTTON_GEN_SKELETON";
-
- /* CONTEXT_ID SHDL0003 for the Handler Config Page */
- private final String INFOPOP_COMBO_SOURCE_LOC = "SHDL0003"; //$NON-NLS-1$
- private final String TOOLTIP_COMBO_SOURCE_LOC = "TOOLTIP_COMBO_SOURCE_LOC";
-
- /* CONTEXT_ID SHDL0004 for the Handler Config Page */
- private final String INFOPOP_WS_SERVICE_DESC = "SHDL0004"; //$NON-NLS-1$
- private final String TOOLTIP_WS_SERVICE_DESC = "TOOLTIP_WS_SERVICE_DESC";
-
- // ------------------------
-
- public ConfigServiceHandlersTableWidget() {
- super();
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- msgUtils_ = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_);
-
- parent_ = parent;
- statusListener_ = statusListener;
-
- // Web service reference combo
- Composite webServiceRefComp = uiUtils.createComposite(parent_, 2);
- webServiceDescCombo_ = uiUtils.createCombo(webServiceRefComp, "LABEL_COMBO_WS_SERVICE_DESC", TOOLTIP_WS_SERVICE_DESC, TOOLTIP_WS_SERVICE_DESC,
- SWT.READ_ONLY);
- webServiceDescCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleWebServiceDescCombo(evt);
- }
- });
-
- Composite displayComp = new Composite(parent, SWT.NONE);
-
- GridLayout gridlayout = new GridLayout(2, false);
- displayComp.setLayout(gridlayout);
- displayComp.setLayoutData(uiUtils.createFillAll());
-
- Composite handlersComp = uiUtils.createComposite(displayComp, 1);
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING
- | GridData.VERTICAL_ALIGN_FILL);
- handlersComp.setLayoutData(griddata);
- handlersComp.setSize(130, 600);
-
- Composite buttonsComp = uiUtils.createComposite(displayComp, 1);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- buttonsComp.setLayoutData(griddata);
-
- Text handlersText = new Text(handlersComp, SWT.READ_ONLY);
- handlersText.setText(msgUtils_.getMessage("LABEL_HANDLERS_CONFIG"));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- handlersText.setLayoutData(gd);
-
- handlersTable_ = uiUtils.createTable(handlersComp, TOOLTIP_EDIT_WS_HANDLERS, INFOPOP_HDLR_WS_HANDLERS, SWT.MULTI | SWT.FULL_SELECTION);
- handlersTable_.setHeaderVisible(true);
- handlersTable_.setLinesVisible(true);
-
- // empty space
- Label wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- Button moveUpButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_UP", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveUpButton.setLayoutData(griddata);
- moveUpButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveUpButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- Button moveDownButton = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_MOVE_DOWN", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- moveDownButton.setLayoutData(griddata);
- moveDownButton.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleMoveDownButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- // empty space
- wsLabel = new Label(buttonsComp, SWT.NONE);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
-
- addButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_ADD", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- addButton_.setLayoutData(griddata);
- addButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleAddButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
-
- removeButton_ = uiUtils.createPushButton(buttonsComp, "LABEL_BUTTON_REMOVE", null, null);
- griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_BEGINNING);
- removeButton_.setLayoutData(griddata);
- removeButton_.addSelectionListener(new SelectionListener() {
-
- public void widgetSelected(SelectionEvent event) {
- handleRemoveButtonSelected(event);
- }
-
- public void widgetDefaultSelected(SelectionEvent event) {
- }
- });
- enableRemove(false);
-
- // table stuff here
- String[] columns_ = new String[] { msgUtils_.getMessage("LABEL_HANDLER_NAME"), msgUtils_.getMessage("LABLE_HANDLER_CLASS"),
- msgUtils_.getMessage("LABEL_HANDLER_PORT")};
-
- for (int i = 0; i < columns_.length; i++) {
- TableColumn tableColumn = new TableColumn(handlersTable_, i);
- tableColumn.setText(columns_[i]);
- tableColumn.setAlignment(SWT.LEFT);
- tableColumn.setWidth(DEFAULT_COLUMN_WIDTH);
- tableColumn.setResizable(true);
- }
-
- tableViewer_ = new TableViewer(handlersTable_);
- Control control = tableViewer_.getControl();
-
- GridData data = new GridData();
- data.horizontalAlignment = GridData.FILL;
- data.grabExcessHorizontalSpace = true;
- data.verticalAlignment = GridData.FILL;
- data.grabExcessVerticalSpace = true;
- control.setLayoutData(data);
-
- tableViewer_.setColumnProperties(columns_);
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.addSelectionChangedListener(new ISelectionChangedListener() {
-
- public void selectionChanged(SelectionChangedEvent event) {
- enableRemove(true);
- }
- });
-
- genSkeletonRadioButton_ = uiUtils.createCheckbox(parent_, "LABEL_BUTTON_GEN_SKELETON", TOOLTIP_BUTTON_GEN_SKELETON, INFOPOP_HDLR_GEN_SKELETON);
- genSkeletonRadioButton_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleGenSkeletonRadioButton();
- }
- });
-
- Composite sourceLocationComp = uiUtils.createComposite(parent_, 2);
- sourceLocationCombo_ = uiUtils.createCombo(sourceLocationComp, "LABEL_COMBO_SOURCE_LOC", TOOLTIP_COMBO_SOURCE_LOC, INFOPOP_COMBO_SOURCE_LOC,
- SWT.READ_ONLY);
- sourceLocationCombo_.addSelectionListener(new SelectionAdapter() {
-
- public void widgetSelected(SelectionEvent evt) {
- handleSourceLocationCombo(evt);
- }
- });
-
- return this;
- }
-
- // Called at start
- private void populateHandlersTable() {
- try {
-
- int sizeOfHandlers = wsDescToHandlers_.size();
- String[] wsRefs = new String[sizeOfHandlers];
-
- String[] wsRefNames = (String[]) wsDescToHandlers_.keySet().toArray(new String[0]);
- webServiceDescCombo_.setItems(wsRefNames);
-
- if (sizeOfHandlers < 1) {
- webServiceDescCombo_.select(0);
- webServiceDescCombo_.setEnabled(false);
- }
- else {
- if (descriptionName_ != null) {
- int index = webServiceDescCombo_.indexOf(descriptionName_);
- if (index != -1) webServiceDescCombo_.select(index);
- }
- else
- webServiceDescCombo_.select(0);
- }
- // get webServiceRef hint
- String wsRef = webServiceDescCombo_.getText();
-
- if (wsDescToHandlers_.get(wsRef) != null) {
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsRef);
- tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- /**
- * @return Returns the handlers.
- */
- public List getHandlersList() {
- // convert to a ArrayList and return as List
- List list = new ArrayList();
- if (orderedHandlers_ != null && !orderedHandlers_.isEmpty()) list.addAll(orderedHandlers_);
-
- return list;
- }
-
- public Hashtable getWsDescToHandlers() {
- return this.wsDescToHandlers_;
- }
-
- /**
- * @param handlers
- * The handlers to set.
- */
- public void setHandlers(HandlerTableItem[] handlers) {
- this.handlers = handlers;
- populateHandlersTable();
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus() {
- Status finalStatus = new SimpleStatus("");
-
- return finalStatus;
- }
-
- private void handleAddButtonSelected(SelectionEvent event) {
-
- String descName = webServiceDescCombo_.getText();
- WebServiceDescription serviceDesc = (WebServiceDescription) serviceDescNameToDescObj_.get(descName);
-
- AddHandlerDialog dialog = dialog = new AddHandlerDialog(parent_.getShell(), false);
- dialog.create();
-
- String[] portNames = getPortComponentNames(serviceDesc);
- dialog.setPortNames(portNames);
- dialog.getShell().setSize( 500, 200 );
-
- int result = dialog.open();
-
- if (result == Window.OK) {
- String name = dialog.getName();
- String className = dialog.getClassName();
- String port = dialog.getPortName();
-
- HandlerTableItem hi = new HandlerTableItem();
- hi.setHandlerName(name);
- hi.setHandlerClassName(className);
- hi.setPortName(port);
-
-
- hi.setWsDescRef(serviceDesc);
-
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(descName);
- orderedHandlers_.add(hi);
-
- }
-
- refresh();
- }
-
- private String[] getPortComponentNames(WebServiceDescription webServiceDesc) {
-
- List ports = webServiceDesc.getPortComponents();
- if (ports!=null){
- String[] portNames = new String[ports.size()];
- for(int i=0;i<ports.size();i++){
- PortComponent pc = (PortComponent)ports.get(i);
- String pcName = pc.getPortComponentName();
- portNames[i] = pcName;
- }
- return portNames;
- }
- return new String[0];
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event) {
- handleDeleteKeyPressed();
- }
-
- private void handleMoveUpButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- ISelection selected = tableViewer_.getSelection();
- if (index != -1) {
- if (index > 0) {
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index - 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- private void handleMoveDownButtonSelected(SelectionEvent event) {
-
- int index = tableViewer_.getTable().getSelectionIndex();
- ISelection selected = tableViewer_.getSelection();
- if (index != -1) {
- if (index < orderedHandlers_.size() - 1) {
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
- Object object = orderedHandlers_.remove(index);
- orderedHandlers_.insertElementAt(object, index + 1);
- tableViewer_.refresh();
- }
- }
-
- }
-
- public void handleSourceLocationCombo(SelectionEvent event) {
- outputLocation_ = sourceLocationCombo_.getText();
- }
-
- public void handleGenSkeletonRadioButton() {
- if (genSkeletonRadioButton_.isEnabled()) {
- if (genSkeletonRadioButton_.getSelection())
- this.isGenSkeletonEnabled_ = true;
- else
- this.isGenSkeletonEnabled_ = false;
- }
- }
-
- public void handleWebServiceDescCombo(SelectionEvent event) {
-
- if (webServiceDescCombo_.isEnabled()) {
- String webServiceRefName = webServiceDescCombo_.getText();
- Vector hndlers = (Vector) wsDescToHandlers_.get(webServiceRefName);
- if (hndlers != null) {
- tableViewer_.setInput(hndlers);
- tableViewer_.refresh();
- }
- }
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean isGenSkeletonEnabled_() {
- return isGenSkeletonEnabled_;
- }
-
- protected class ListLabelProvider extends LabelProvider implements ITableLabelProvider {
-
- public Image getColumnImage(Object element, int columnIndex) {
- return null;
- }
-
- public String getColumnText(Object object, int columnIndex) {
-
- if (object instanceof HandlerTableItem) {
- HandlerTableItem hti = (HandlerTableItem) object;
- if (columnIndex == 0) {
- return hti.getHandlerName() != null ? hti.getHandlerName() : "";
- }
- else if (columnIndex == 1) {
- return hti.getHandlerClassName() != null ? hti.getHandlerClassName() : "";
- }
- else {
- return hti.getPortName() != null ? hti.getPortName() : "";
- }
- }
- return null;
- }
-
- }
-
- private void enableRemove(boolean enabled) {
- removeButton_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- protected class ListContentProvider implements IStructuredContentProvider {
-
- public Object[] getElements(Object element) {
- if (element instanceof Vector) { return ((Vector) element).toArray(); }
- return null;
- }
-
- public void dispose() {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj) {
- }
-
- public boolean isDeleted(Object object) {
- return false;
- }
- }
-
- private void handleDeleteKeyPressed() {
- //internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection)) {
- int selectionIndex = handlersTable_.getSelectionIndex();
- int selectionCount = handlersTable_.getItemCount();
-
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(webServiceDescCombo_.getText());
- orderedHandlers_.remove(selectionIndex);
- refresh();
- }
- }
-
- public void refresh() {
- try {
- tableViewer_.setInput(null);
- if (orderedHandlers_ != null) tableViewer_.setInput(orderedHandlers_);
- tableViewer_.refresh();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void setGenSkeletonEnabled(boolean isGenSkeletonEnabled) {
- this.isGenSkeletonEnabled_ = isGenSkeletonEnabled;
- genSkeletonRadioButton_.setSelection(isGenSkeletonEnabled);
-
- }
-
- public boolean getGenSkeletonEnabled() {
- return this.isGenSkeletonEnabled_;
- }
-
- public void setSourceOutputLocation(IPath[] locations) {
- this.outputLocation_ = locations[0].toString();
-
- String[] paths = new String[locations.length];
- for (int i = 0; i < locations.length; i++) {
- paths[i] = locations[i].toString();
- pathsTable_.put(paths[i], locations[i]);
- }
- sourceLocationCombo_.setItems(paths);
- sourceLocationCombo_.select(0);
-
- }
-
- public IPath getSourceOutputLocation() {
- IPath outputPath = (IPath) pathsTable_.get(outputLocation_);
- return outputPath;
- }
-
- /**
- * @return Returns the handlerClassNames.
- */
- public String[] getHandlerClassNames() {
-
- Vector handlerClasses = new Vector();
- Enumeration e = wsDescToHandlers_.keys();
- while (e.hasMoreElements()) {
-
- String wsDescName = (String)e.nextElement();
- orderedHandlers_ = (Vector) wsDescToHandlers_.get(wsDescName);
-
- if (orderedHandlers_ != null) {
-
- for (int i = 0; i < orderedHandlers_.size(); i++) {
- HandlerTableItem hti = (HandlerTableItem) orderedHandlers_.get(i);
- handlerClasses.add(hti.getHandlerClassName());
- }
- }
- }
- return (String[])handlerClasses.toArray(new String[0]);
- }
-
- /**
- * @param wsDescToHandlersArray_
- * The wsDescToHandlersArray_ to set.
- */
- public void setWsRefsToHandlers(Hashtable wsDescToHandlersArray) {
-
- wsDescToHandlers_ = new Hashtable();
- wsDescToPorts_ = new Hashtable();
- try {
-
- if (wsDescToHandlersArray != null) {
- int sizeOfHandlers = wsDescToHandlersArray.size();
- String[] wsRefs = new String[sizeOfHandlers];
- // store the wsRefs
- Enumeration wsDesc = wsDescToHandlersArray.keys();
- while (wsDesc.hasMoreElements()) {
- String wsDescName = (String) wsDesc.nextElement();
-
- HandlerTableItem[] handlers = (HandlerTableItem[]) wsDescToHandlersArray.get(wsDescName);
- // process the handlersTable
- orderedHandlers_ = new Vector();
- HashSet portNameVector = new HashSet();
-
- for (int i = 0; i < handlers.length; i++) {
- orderedHandlers_.add(handlers[i]);
- String portName = handlers[i].getPortName();
- portNameVector.add(new String(portName));
- }
- wsDescToHandlers_.put(wsDescName, orderedHandlers_);
- wsDescToPorts_.put(wsDescName, (String[]) portNameVector.toArray(new String[0]));
- }
- }
- populateHandlersTable();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void setDescriptionName(String wsDescName) {
- descriptionName_ = wsDescName;
- }
-
- public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
- this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
deleted file mode 100644
index 870ba79..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/HandlersDefaultingCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.wsdl.Service;
-
-
-/**
- * HandlersDefaultingCommand
- *
- * Determine if Handlers belongs to service or client side
- */
-public class HandlersDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private MessageUtils msgUtils_;
-
- private boolean isClientHandler_ = false;
- private boolean isServiceHandler_ = false;
-
- public Status execute(Environment env) {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- Status status = new SimpleStatus("");
-
- IStructuredSelection selection = getInitialSelection();
- if (selection != null && selection.size() == 1) {
- Object obj = selection.getFirstElement();
-
- if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- Service service = (Service)wsngt.getWsdlService();
- if (wsngt.getWsdlService()!=null){
- isServiceHandler_ = true;
- }
-
- if (wsngt.getServiceRef()!=null){
- isClientHandler_ = true;
- }
-
- }
- }
- else {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
-
- }
-
-
-/**
- * @return Returns the isClientHandler_.
- */
-public boolean getIsClientHandler() {
- return isClientHandler_;
-}
-/**
- * @return Returns the isServiceHandler_.
- */
-public boolean getIsServiceHandler() {
- return isServiceHandler_;
-}
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
deleted file mode 100644
index e1f7be2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ImportWSILWidget.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.net.MalformedURLException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.Arguments;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.TableViewerEditor;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.swt.SWT;
-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.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
-* Page for importing WSDL references into a WSIL in the workbench.
-*/
-public class ImportWSILWidget extends SimpleWidgetDataContributor
-{
- /*CONTEXT_ID WSIL0001 for the WSIL Import Page*/
- private final String INFOPOP_WSIL_IMPORT_PAGE = WebServiceConsumptionUIPlugin.ID + ".WSIL0001";
-
- /*CONTEXT_ID WSIL0002 for the WSIL text field*/
- private final String INFOPOP_WSIL_TEXT_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0002";
-
- /*CONTEXT_ID WSIL0003 for the WSIL browse button*/
- private final String INFOPOP_WSIL_BUTTON_BROWSE_WSIL = WebServiceConsumptionUIPlugin.ID + ".WSIL0003";
-
- /*CONTEXT_ID WSIL0004 for the WSDL table*/
- private final String INFOPOP_WSIL_TABLE_WSDL = WebServiceConsumptionUIPlugin.ID + ".WSIL0004";
-
- private final String INSPECTION_WSIL = "inspection.wsil";
-
- private Text wsil_;
- private Button browse_;
- private TableViewerEditor wsdls_;
-
- private MessageUtils msgUtils;
- private IStructuredSelection selection;
-
- /**
- * Constructs a new page.
- */
- public ImportWSILWidget()
- {
- msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- //super(msgUtils.getMessage("PAGE_WSIL_IMPORT"), msgUtils.getMessage("TITLE_WSIL_IMPORT"), msgUtils.getMessage("DESC_WSIL_IMPORT"));
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- parent.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_IMPORT_PAGE"));
- helpSystem.setHelp(parent, INFOPOP_WSIL_IMPORT_PAGE);
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 3;
- composite.setLayout(gl);
- GridData gd = new GridData(GridData.GRAB_VERTICAL | GridData.VERTICAL_ALIGN_BEGINNING | GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_FILL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- Label label = new Label(composite, SWT.WRAP);
- label.setText(msgUtils.getMessage("LABEL_WSIL_URI"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- wsil_ = new Text(composite, SWT.WRAP | SWT.SINGLE | SWT.BORDER);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- gd.widthHint = 256;
- wsil_.setLayoutData(gd);
- wsil_.addListener(SWT.Modify, statusListener);
- wsil_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TEXT_WSIL"));
- helpSystem.setHelp(wsil_, INFOPOP_WSIL_TEXT_WSIL);
-
- browse_ = new Button(composite, SWT.PUSH);
- browse_.setText(msgUtils.getMessage("LABEL_BROWSE"));
- browse_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- browse_.addListener(SWT.Selection,
- new Listener()
- {
- public void handleEvent(Event event)
- {
- handleBrowseEvent(event);
- }
- }
- );
- browse_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_BUTTON_BROWSE_WSIL"));
- helpSystem.setHelp(browse_, INFOPOP_WSIL_BUTTON_BROWSE_WSIL);
-
- Composite wsdlComposite = new Composite(composite, SWT.NONE);
- wsdlComposite.setLayout(new GridLayout());
- gd = new GridData(GridData.FILL_BOTH);
- gd.horizontalSpan = 3;
- wsdlComposite.setLayoutData(gd);
- label = new Label(wsdlComposite, SWT.WRAP);
- label.setText(msgUtils.getMessage("LABEL_WSDL"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- String[] columns = {msgUtils.getMessage("LABEL_WSDL_URI")};
- wsdls_ = new TableViewerEditor(wsdlComposite, columns, new ArrayList(), "http://");
- wsdls_.setToolTipText(msgUtils.getMessage("TOOLTIP_WSIL_TABLE_WSDL"));
- wsdls_.setInfopop(INFOPOP_WSIL_TABLE_WSDL);
- return this;
- }
-
- private IResource[] getWSDLResources()
- {
- ArrayList list = new ArrayList();
- if (selection != null && !selection.isEmpty())
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- Object object = it.next();
- if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl"))
- list.add(object);
- }
- }
- IResource[] res = new IResource[list.size()];
- for (int i = 0; i < res.length; i++)
- res[i] = (IResource)list.get(i);
- return res;
- }
-
- public void handleBrowseEvent(Event event)
- {
- DialogResourceBrowser dialog = new DialogResourceBrowser(browse_.getShell(), null, new FileExtensionFilter(new String[] {"wsil"}));
- dialog.open();
- IResource res = dialog.getFirstSelection();
- if (res != null)
- {
- if (res instanceof IFile)
- wsil_.setText(res.getFullPath().toString());
- else
- wsil_.setText(res.getFullPath().addTrailingSeparator().append(INSPECTION_WSIL).toString());
- }
- }
-
- public Status getStatus()
- {
- if (!wsil_.getText().endsWith(".wsil"))
- return new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_INVALID_WSIL_FILE_NAME"), Status.ERROR);
- else
- return new SimpleStatus("");
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- this.selection = selection;
- ArrayList list = new ArrayList();
- if (selection != null && !selection.isEmpty())
- {
- for (Iterator it = selection.iterator(); it.hasNext();)
- {
- Object object = it.next();
- if ((object instanceof IFile) && ((IFile)object).getFileExtension() != null && ((IFile)object).getFileExtension().equals("wsdl"))
- list.add(((IFile)object).getFullPath().toString());
- if (object instanceof ServiceImpl)
- list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceImpl)(object))));
- if (object instanceof ServiceRef)
- list.add(J2EEActionAdapterFactory.getWSILPath(((ServiceRef)(object))));
- if (object instanceof WSDLResourceImpl)
- list.add(J2EEActionAdapterFactory.getWSILPath(((WSDLResourceImpl)(object))));
- }
- }
- wsdls_.setInput(list);
- wsdls_.refresh();
- if (list.size() > 0)
- {
- StringBuffer path = new StringBuffer(list.get(0).toString());
- // change extension from .wsdl to .wsil
- int length = path.length();
- path = path.replace(length-4, length, "wsil");
- wsil_.setText(path.toString());
- }
- }
-
- public Arguments getGenWSILArguments()
- {
- Arguments args = new Arguments();
- String wsilPath = wsil_.getText();
- if (wsilPath.indexOf(':') < 0)
- args.add(AddWSDLToWSILCommand.ARG_WSIL, URI.createPlatformResourceURI(wsil_.getText()).toString());
- else
- args.add(AddWSDLToWSILCommand.ARG_WSIL, wsilPath);
- TableItem[] items = wsdls_.getItems();
- for (int i = 0; i < items.length; i++)
- {
- String uri = items[i].getText(0);
- if (uri.indexOf(':') < 0)
- {
- IResource res = ResourceUtils.findResource(uri);
- if (res != null)
- {
- try
- {
- uri = res.getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- murle.getMessage();
- }
- }
- }
- args.add(AddWSDLToWSILCommand.ARG_WSDL, uri);
- }
- args.add(AddWSDLToWSILCommand.ARG_RESOLVE_WSDL, null);
- return args;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
deleted file mode 100644
index 1d1f706..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PreferencesSelectionWidget.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class PreferencesSelectionWidget extends SimpleWidgetDataContributor
-{
- private ResourceContext context_;
-
- /*CONTEXT_ID PWPR0003 for the Overwrite Files check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES = "PWPR0003";
- private Button overwriteFilesCheckbox_;
-
- /*CONTEXT_ID PWPR0004 for the Create Folders check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS = "PWPR0004";
- private Button createFoldersCheckbox_;
-
- /*CONTEXT_ID PWPR0015 for the Check Out Files check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES = "PWPR0015";
- private Button checkoutFilesCheckbox_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.ui";
- String conPluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, conPluginId );
-
- Composite resourcesGroup = utils.createComposite( parent, 1 );
-
- overwriteFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_OVERWRITE_FILES",
- "TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES",
- INFOPOP_PWPR_CHECKBOX_OVERWRITE_FILES );
-
- createFoldersCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CREATE_FOLDERS",
- "TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS" ,
- INFOPOP_PWPR_CHECKBOX_CREATE_FOLDERS );
-
- checkoutFilesCheckbox_ = utils.createCheckbox( resourcesGroup, "BUTTON_CHECKOUT_FILES",
- "TOOLTIP_PPRM_CHECKBOX_CHECK_OUT",
- INFOPOP_PWPR_CHECKBOX_CHECKOUT_FILES );
-
- return this;
- }
-
- public void setResourceContext( ResourceContext context )
- {
- overwriteFilesCheckbox_.setSelection( context.isOverwriteFilesEnabled() );
- createFoldersCheckbox_.setSelection( context.isCreateFoldersEnabled() );
- checkoutFilesCheckbox_.setSelection( context.isCheckoutFilesEnabled() );
-
- context_ = context;
- }
-
- public ResourceContext getResourceContext()
- {
- context_.setOverwriteFilesEnabled( overwriteFilesCheckbox_.getSelection() );
- context_.setCreateFoldersEnabled( createFoldersCheckbox_.getSelection() );
- context_.setCheckoutFilesEnabled( checkoutFilesCheckbox_.getSelection() );
-
- return context_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
deleted file mode 100644
index 27dfbe0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishToPrivateUDDICommandFragment.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PublishToPrivateUDDICommandFragment extends AbstractCommandFragment
-{
- private DataMappingRegistry dataMappingRegistry;
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private boolean publishToPrivateUDDI;
- private CommandWidgetBinding privateUDDIBinding;
-
- public PublishToPrivateUDDICommandFragment()
- {
- super((CommandFactory)null, "");
- privateUDDIBinding = PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().getBinding();
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- if (privateUDDIBinding != null && publishToPrivateUDDI && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
- {
- privateUDDIBinding.registerCanFinish(canFinishRegistry);
- privateUDDIBinding.registerDataMappings(dataMappingRegistry);
- privateUDDIBinding.registerWidgetMappings(widgetRegistry);
- return privateUDDIBinding.create().create();
- }
- else
- return null;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment(CommandFragment fragment)
- {
- return null;
- }
-
- /*
- * This method is called to retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry registry)
- {
- dataMappingRegistry = registry;
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- }
-
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- }
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public Object clone()
- {
- PublishToPrivateUDDICommandFragment fragment = new PublishToPrivateUDDICommandFragment();
- fragment.registerDataMappings(dataMappingRegistry);
- fragment.registerCanFinish(canFinishRegistry);
- fragment.registerWidgetMappings(widgetRegistry);
- fragment.setPublishToPrivateUDDI(publishToPrivateUDDI);
- return fragment;
- }
-
- public void setPublishToPrivateUDDI(boolean publish)
- {
- publishToPrivateUDDI = publish;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
deleted file mode 100644
index 9a40b1a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/PublishWSWidget.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.PublicUDDIRegistryTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-
-
-public class PublishWSWidget extends SimpleWidgetDataContributor
-{
- /* CONTEXT_ID PWPB0001 for the UDDI Publish Page */
- private String INFOPOP_PWPB_PAGE = WebServiceConsumptionUIPlugin.ID + ".PWPB0001";
- /* CONTEXT_ID PWPB0002 for the UDDI Launch check box of the UDDI Publish Page */
- private String INFOPOP_PWPB_CHECKBOX_WS_LAUNCH = WebServiceConsumptionUIPlugin.ID + ".PWPB0002";
- private Button launchUDDICheckbox_;
- private Button launchPrivateUDDICheckbox_;
- private Label pubilcUDDIRegComboLabel_;
- private Combo publicUDDIRegCombo_;
- private MessageUtils msgUtils;
- private Listener statusListener;
- private Boolean publish;
-
- public PublishWSWidget(boolean publish)
- {
- msgUtils = new MessageUtils(WebServiceConsumptionUIPlugin.ID + ".plugin", this);
- this.publish = new Boolean(publish);
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.statusListener = statusListener;
- Listener selListener = new Listener()
- {
- public void handleEvent(Event event)
- {
- handleSelectionEvent(event);
- }
- };
- parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_PAGE"));
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
- helpSystem.setHelp(parent, INFOPOP_PWPB_PAGE);
- launchPrivateUDDICheckbox_ = new Button(parent, SWT.CHECK);
- if (publish.booleanValue())
- launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH_PRIVATE_UDDI"));
- else
- launchPrivateUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND_PRIVATE_UDDI"));
- launchPrivateUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
- launchPrivateUDDICheckbox_.addListener(SWT.Selection, selListener);
- helpSystem.setHelp(launchPrivateUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
- launchUDDICheckbox_ = new Button(parent, SWT.CHECK);
- if (publish.booleanValue())
- launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_PUBLISH"));
- else
- launchUDDICheckbox_.setText(msgUtils.getMessage("BUTTON_WS_FIND"));
- launchUDDICheckbox_.setToolTipText(msgUtils.getMessage("TOOLTIP_PWPB_CHECKBOX_WS_LAUNCH"));
- launchUDDICheckbox_.addListener(SWT.Selection, selListener);
- helpSystem.setHelp(launchUDDICheckbox_, INFOPOP_PWPB_CHECKBOX_WS_LAUNCH);
- Composite c = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 3;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- c.setLayout(gl);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- c.setLayoutData(gd);
- new Label(c, SWT.WRAP);
- pubilcUDDIRegComboLabel_ = new Label(c, SWT.WRAP);
- pubilcUDDIRegComboLabel_.setText(msgUtils.getMessage("LABEL_PUBLIC_UDDI_REGISTRIES"));
- publicUDDIRegCombo_ = new Combo(c, SWT.DROP_DOWN | SWT.READ_ONLY);
- publicUDDIRegCombo_.setEnabled(false);
- initPublicUDDI();
- initPrivateUDDI();
- return this;
- }
-
- private void initPublicUDDI()
- {
- PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
- PublicUDDIRegistryType[] types = reg.getAllPublicUDDIRegistryTypes();
- for (int i = 0; i < types.length; i++)
- {
- if (publish.booleanValue())
- {
- // Ignore read-only registries.
- String publishURL = types[i].getPublishURL();
- if (publishURL == null || publishURL.indexOf("://") == -1)
- continue;
- }
- publicUDDIRegCombo_.add(types[i].getName());
- }
- if (types.length > 0)
- publicUDDIRegCombo_.setText(publicUDDIRegCombo_.getItem(0));
- }
-
- private void initPrivateUDDI()
- {
- if (!publish.booleanValue() && !PrivateUDDIRegistryTypeRegistry.getInstance().getPrivateUDDIRegistryType().isPrivateUDDIRegistryInstalled())
- launchPrivateUDDICheckbox_.setEnabled(false);
- }
-
- private void handleSelectionEvent(Event event)
- {
- if (launchUDDICheckbox_ == event.widget)
- publicUDDIRegCombo_.setEnabled(launchUDDICheckbox_.getSelection());
- statusListener.handleEvent(event);
- }
-
- public void setPublishToPublicUDDI(boolean publish)
- {
- launchUDDICheckbox_.setSelection(publish);
- publicUDDIRegCombo_.setEnabled(publish);
- }
-
- public void setPublishToPublicUDDI(Boolean publish)
- {
- setPublishToPublicUDDI(publish.booleanValue());
- }
-
- public void setPublishToPrivateUDDI(boolean publish)
- {
- launchPrivateUDDICheckbox_.setSelection(publish);
- }
-
- public void setPublishToPrivateUDDI(Boolean publish)
- {
- setPublishToPrivateUDDI(publish.booleanValue());
- }
-
- public boolean getPublishToPublicUDDI()
- {
- return launchUDDICheckbox_.getSelection();
- }
-
- public boolean getPublishToPrivateUDDI()
- {
- return launchPrivateUDDICheckbox_.getSelection();
- }
-
- public boolean getForceLaunchOutsideIDE()
- {
- return false;
- }
-
- public LaunchOption[] getLaunchOptions()
- {
- Vector launchOptionVector = new Vector();
- if (launchUDDICheckbox_.getSelection())
- {
- PublicUDDIRegistryTypeRegistry reg = PublicUDDIRegistryTypeRegistry.getInstance();
- int UDDIRegSelectionIndex = publicUDDIRegCombo_.getSelectionIndex();
- if (UDDIRegSelectionIndex != -1)
- {
- String name = publicUDDIRegCombo_.getItem(UDDIRegSelectionIndex);
- String id = reg.getPublicUDDIRegistryTypeIDByName(name);
- PublicUDDIRegistryType type = reg.getPublicUDDIRegistryTypeByID(id);
- launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, type.getInquiryURL()));
- launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, type.getPublishURL()));
- }
- }
- if (launchPrivateUDDICheckbox_.getSelection())
- {
- PrivateUDDIRegistryTypeRegistry privateReg = PrivateUDDIRegistryTypeRegistry.getInstance();
- PrivateUDDIRegistryType privateType = privateReg.getPrivateUDDIRegistryType();
- String[] privateInquiryURL = privateType.getPrivateUDDIRegistryInquiryAPI();
- String[] privatePublishURL = privateType.getPrivateUDDIRegistryPublishAPI();
- for (int i = 0; i < privateInquiryURL.length; i++)
- {
- launchOptionVector.add(new LaunchOption(LaunchOptions.INQUIRY_URL, privateInquiryURL[i]));
- launchOptionVector.add(new LaunchOption(LaunchOptions.PUBLISH_URL, privatePublishURL[i]));
- }
- }
- return (LaunchOption[]) launchOptionVector.toArray(new LaunchOption[0]);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
deleted file mode 100644
index 5750275..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.webservice.WebServiceNavigatorGroupType;
-import org.eclipse.jst.j2ee.internal.webservice.helper.WebServicesManager;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.wsdl.Service;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-/**
- * ServiceHandlersWidgetDefaultingCommand
- *
- * Initialize and load the handlers data
- */
-public class ServiceHandlersWidgetDefaultingCommand extends AbstractHandlersWidgetDefaultingCmd {
-
- private HandlerTableItem[] handlers_;
- private MessageUtils msgUtils_;
- private boolean isGenSkeletonEnabled_;
- private IPath sourceOutputLocation_;
- private WebServiceDescription wsDescription_;
- private WsddResource wsddResource_;
- private WebServicesManager webServicesManager_;
- private IProject project_;
- private Hashtable wsDescToHandlers_;
- private Hashtable serviceDescNameToDescObj_;
- private String descriptionName_ = null;
-
- public Status execute(Environment env) {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- Status status = new SimpleStatus("");
-
- webServicesManager_ = new WebServicesManager();
- IStructuredSelection selection = getInitialSelection();
- if (selection == null) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- status = processHandlers(env);
- return status;
-
- }
-
- public Status processHandlers(Environment env) {
- try {
- Vector handlers = new Vector();
- wsDescToHandlers_ = new Hashtable();
- serviceDescNameToDescObj_ = new Hashtable();
-
-// WebServiceEditModel wsed = getWebServiceEditModel();
- // if (wsed == null)
- wsddResource_ = getWsddResourceFromSelection();
- // else
- // wsddResource_ = wsed.getWebServicesXmlResource();
-
- if (wsddResource_ == null) {
- Status status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- WebServices webServices = wsddResource_.getWebServices();
- if (webServices != null) {
- List wsDescriptions = wsddResource_.getWebServices().getWebServiceDescriptions();
- for (int i = 0; i < wsDescriptions.size(); i++) {
-
- wsDescription_ = (WebServiceDescription) wsDescriptions.get(i);
-
- List wsPortComponents = wsDescription_.getPortComponents();
- for (int j = 0; j < wsPortComponents.size(); j++) {
- PortComponent wsPort = (PortComponent) wsPortComponents.get(j);
- String portName = wsPort.getPortComponentName();
- List wsHandlers = wsPort.getHandlers();
- HandlerTableItem[] handlerItems = new HandlerTableItem[wsHandlers.size()];
- for (int k = 0; k < wsHandlers.size(); k++) {
-
- Handler wsHandler = (Handler) wsHandlers.get(k);
-
- HandlerTableItem handlerItem = new HandlerTableItem();
- handlerItem.setHandler(wsHandler);
- handlerItem.setHandlerName(wsHandler.getHandlerName());
- handlerItem.setHandlerClassName(wsHandler.getHandlerClass());
- handlerItem.setPort(wsPort);
- handlerItem.setPortName(portName);
- handlerItem.setWsDescRef(wsDescription_);
- handlerItems[k] = handlerItem;
-
- handlers.add(handlerItem);
- }
- String wsDescName = wsDescription_.getWebServiceDescriptionName();
- wsDescToHandlers_.put(wsDescName, handlerItems);
- serviceDescNameToDescObj_.put(wsDescName, wsDescription_);
-
- }
-
- }
-
- handlers_ = (HandlerTableItem[]) handlers.toArray(new HandlerTableItem[0]);
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED"), Status.ERROR, e);
- }
- return new SimpleStatus("");
- }
-
- public HandlerTableItem[] getHandlers() {
- return this.handlers_;
- }
-
- /**
- * @return Returns the isGenSkeletonEnabled_.
- */
- public boolean getGenSkeletonEnabled() {
- return true;
- }
-
- /**
- * @return Returns the sourceOutputLocation_.
- */
- public IPath[] getSourceOutputLocation() {
- IPath[] locations = null;
- IProject project = getProject();
-
- if (project != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project);
- }
- else {
- project = project_;
- if (project != null) {
- locations = ResourceUtils.getAllJavaSourceLocations(project);
- }
- }
- return locations;
- }
-
- public WsddResource getWsddResource() {
- return wsddResource_;
- }
-
- private WsddResource getWsddResourceFromSelection() {
- IStructuredSelection initSel = getInitialSelection();
- if (initSel != null && initSel.size() == 1) {
- Object obj = initSel.getFirstElement();
- if (obj instanceof ServiceImpl) {
- // Service object
- Service service = (Service) obj;
- descriptionName_ = service.getQName().getLocalPart();
- project_ = ProjectUtilities.getProject(service);
- return webServicesManager_.getWsddResource(service);
- }
- else if (obj instanceof WSDLResourceImpl) {
- // WSDL resource
- WSDLResourceImpl res = (WSDLResourceImpl) obj;
- project_ = ProjectUtilities.getProject(res);
- List wsdlResources = webServicesManager_.getWSDLServices(res);
- return webServicesManager_.getWsddResource((Service) wsdlResources.get(0));
- }
- else if (obj instanceof WebServiceNavigatorGroupType) {
- WebServiceNavigatorGroupType wsngt = (WebServiceNavigatorGroupType) obj;
- Service service = (Service)wsngt.getWsdlService();
- descriptionName_ = service.getQName().getLocalPart();
- project_ = ProjectUtilities.getProject(service);
- return webServicesManager_.getWsddResource(service);
- }
- }
-
- return null;
-
- }
-
- /**
- * @deprecated
- */
- public WebServiceDescription getWsDescription() {
- return wsDescription_;
- }
-
- public String getDescriptionName(){
- return descriptionName_;
- }
-
- public Hashtable getWsRefsToHandlers(){
- return wsDescToHandlers_;
- }
-
- public Hashtable getServiceDescNameToDescObj(){
- return this.serviceDescNameToDescObj_;
- }
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
deleted file mode 100644
index 667c432..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/ServiceHandlersWidgetOutputCommand.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.List;
-
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.WsddFactoryImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.HandlerTableItem;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.internal.emf.utilities.EtoolsCopyUtility;
-
-/*
- * Provide a way to externalize the edited fields and create new handlers
- *
- */
-public class ServiceHandlersWidgetOutputCommand extends SimpleCommand {
-
- private List handlerTableItems;
- private WebServiceDescription wsDescription_;
- private WsddResource wsddResource_;
- private Hashtable wsDescToHandlers_;
- private Hashtable serviceDescNameToDescObj_;
-
- public Status execute(Environment env) {
-
- Status status = new SimpleStatus("");
- try {
- Enumeration e = wsDescToHandlers_.keys();
- while (e.hasMoreElements()) {
-
- Hashtable wsPortsTable = new Hashtable();
- Hashtable wsPortToHandlerTable = new Hashtable();
-
- String serviceDescName = (String) e.nextElement();
- // load PortName -> PortComponent table
- WebServiceDescription wsDescription_ = (WebServiceDescription) serviceDescNameToDescObj_.get(serviceDescName);
- if (wsDescription_ != null) {
-
- List wsPorts = wsDescription_.getPortComponents();
- for (int k = 0; k < wsPorts.size(); k++) {
- PortComponent port = (PortComponent) wsPorts.get(k);
- wsPortsTable.put(port.getPortComponentName(), port);
- wsPortToHandlerTable.put(port.getPortComponentName(), new ArrayList());
- }
- }
-
- List handlerTableItems = (List) wsDescToHandlers_.get(serviceDescName);
- if (handlerTableItems != null) {
-
- WsddFactory wsddFactory = new WsddFactoryImpl();
-
- //form port components tables first
- for (int i = 0; i < handlerTableItems.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
- PortComponent wsPort = (PortComponent) hti.getPort();
- if (wsPort == null) {
- //find it
- if (wsPortsTable.get(hti.getPortName()) != null)
- wsPort = (PortComponent) wsPortsTable.get(hti.getPortName());
- else {
- // create it; should not get into here
- wsPort = wsddFactory.createPortComponent();
- wsPort.setPortComponentName(hti.getPortName());
- wsPortsTable.put(wsPort.getPortComponentName(), wsPort);
- }
- }
- wsPortToHandlerTable.put(wsPort.getPortComponentName(), new ArrayList());
- }
-
- // form Handler and ports table
- for (int i = 0; i < handlerTableItems.size(); i++) {
-
- HandlerTableItem hti = (HandlerTableItem) handlerTableItems.get(i);
- String portName = hti.getPortName();
-
- PortComponent port = (PortComponent) wsPortsTable.get(portName);
- if (port == null) return status;
-
- List existingHandlers = port.getHandlers();
-
- Object handler = hti.getHandler();
- if (!existingHandlers.contains(handler)) {
- // create it
- Handler newHandler = wsddFactory.createHandler();
- newHandler.setHandlerName(hti.getHandlerName());
- newHandler.setHandlerClass(hti.getHandlerClassName());
- ((List) wsPortToHandlerTable.get(portName)).add(newHandler);
-
- }
- else if (handler instanceof Handler) {
- // clone it
- EtoolsCopyUtility copyUtil = new EtoolsCopyUtility();
- copyUtil.setCopyAdapters(true);
- Handler clonedHandler = (Handler) copyUtil.copy((Handler) handler);
- ((List) wsPortToHandlerTable.get(portName)).add(clonedHandler);
- }
- }
-
- }
-
- // remove existing handlers from ports
- removeExistingHandlers(wsPortsTable, wsPortToHandlerTable);
-
- // add ports to wsDescription
- addPortsToDescriptions(wsPortsTable, wsDescription_);
-
- // add handlers to ports
- addHandlersToPorts(wsPortsTable, wsPortToHandlerTable);
- }
- if (wsddResource_ != null) {
- wsddResource_.save(new HashMap());
- }
-
- }
- catch (Exception e) {
- //status = new
- e.printStackTrace();
- }
- return status;
- }
-
- private void removeExistingHandlers(Hashtable portsTable, Hashtable portsToHandlersTable) {
- try {
- int key = 0;
- Enumeration ports = portsToHandlersTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- Object port = portsTable.get(portName);
- if (port != null && port instanceof PortComponent) {
- List handlers = ((PortComponent) port).getHandlers();
- handlers.clear();
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addPortsToDescriptions(Hashtable portsTable, WebServiceDescription wsDescription_) {
- try {
- Enumeration ports = portsTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- // newly edited port
- Object port = portsTable.get(portName);
-
- // existing port
- List emfPorts = wsDescription_.getPortComponents();
- if (!emfPorts.contains(port) && port != null && port instanceof PortComponent) {
- emfPorts.add((PortComponent) port);
- }
- }
- }
-
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- private void addHandlersToPorts(Hashtable portsTable, Hashtable portsToHandlersTable) {
- try {
- int key = 0;
- Enumeration ports = portsToHandlersTable.keys();
- while (ports.hasMoreElements()) {
- String portName = (String) ports.nextElement();
- Object port = portsTable.get(portName);
- if (port != null && port instanceof PortComponent) {
- List handlers = (List) portsToHandlersTable.get(portName);
-
- List modelHandlers = ((PortComponent) port).getHandlers();
- modelHandlers.addAll(handlers);
- }
- }
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * @param handlerTableItems
- * The handlerTableItems to set.
- */
- public void setHandlersList(List handlerTableItems) {
- this.handlerTableItems = handlerTableItems;
- }
-
- public void setWsDescToHandlers(Hashtable wsDescToHandlers) {
- this.wsDescToHandlers_ = wsDescToHandlers;
- }
-
-// public void setWsDescription(WebServiceDescription wsDesc) {
-// this.wsDescription_ = wsDesc;
-// }
-
- public void setWsddResource(WsddResource wsddRes) {
- this.wsddResource_ = wsddRes;
- }
-
- public void setServiceDescNameToDescObj(Hashtable serviceDescNameToDescObj) {
- this.serviceDescNameToDescObj_ = serviceDescNameToDescObj;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
deleted file mode 100644
index 8a18713..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/TableViewerWidget.java
+++ /dev/null
@@ -1,619 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.PropertiesResourceFilter;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-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.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class TableViewerWidget extends SimpleWidgetDataContributor
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private int DEFAULT_COLUMN_WIDTH = 80;
-
- public static byte MAP_ONE_TO_ONE = 3;
- public static byte MAP_MANY_TO_ONE = 1;
- public static byte MAP_MANY_TO_MANY = 0;
-
- private String[] columns_;
- private TableViewer tableViewer_;
- private Table table_;
- private TableEditor editor_;
- private TableEditorListener tableEditorListener_;
- private Text text_;
- private Button import_;
- private Button add_;
- private Button remove_;
-
- private Composite parent_;
- private Listener statusListener_;
-
- private String message = null;
- private byte rescriction = MAP_MANY_TO_MANY;
-
- private List values_;
- private Object defaultValue_;
-
- private PropertiesResourceFilter filter_ = new PropertiesResourceFilter();
-
- public TableViewerWidget(String[] columns, List initValues, Object defaultValue, byte rescriction)
- {
- columns_ = columns;
- values_ = new ArrayList();
- if (initValues != null && initValues.size() > 0)
- values_.addAll(initValues);
- defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
- this.rescriction = rescriction;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- parent_ = parent;
- statusListener_ = statusListener;
-
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
-
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- TableLayout tableLayout = new TableLayout();
- int maxWidth = DEFAULT_COLUMN_WIDTH;
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
- maxWidth = Math.max(maxWidth, tableColumnWidth);
- ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
- // initialize the table editor
- editor_ = new TableEditor(table_);
- // The editor must have the same size as the cell and must
- // not be any smaller than 50 pixels.
- editor_.horizontalAlignment = SWT.LEFT;
- editor_.grabHorizontal = true;
- editor_.minimumWidth = maxWidth;
- tableEditorListener_ = new TableEditorListener();
- table_.addMouseListener(tableEditorListener_);
- tableViewer_ = new TableViewer(table_);
- tableViewer_.getControl().addKeyListener(
- new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- int asciiDel = (int)e.character;
- // Del
- if (asciiDel == 127)
- handleDeleteKeyPressed();
- // Enter or space
- if (((int)e.character) == 13 || ((int)e.character) == 32)
- tableEditorListener_.editSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.setInput(values_);
- tableViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- enableRemove(true);
- }
- }
- );
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 3;
- gl.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(gl);
- buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- import_ = new Button(buttonComposite, SWT.PUSH);
- import_.setText(msgUtils.getMessage("LABEL_IMPORT"));
- import_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- import_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleImportButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
- add_ = new Button(buttonComposite, SWT.PUSH);
- add_.setText(msgUtils.getMessage("LABEL_ADD"));
- add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- add_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
-
- remove_ = new Button(buttonComposite, SWT.PUSH);
- remove_.setText(msgUtils.getMessage("LABEL_REMOVE"));
- remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- remove_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
- enableRemove(false);
-
- return this;
- }
-
- private void enableRemove(boolean enabled)
- {
- remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- private void handleImportButtonSelected(SelectionEvent event)
- {
- IResource resource = DialogUtils.browseResources(
- parent_.getShell(),
- ResourceUtils.getWorkspaceRoot(),
- null,
- filter_
- );
- if (resource != null && resource instanceof IFile)
- {
- try
- {
- Properties props = new Properties();
- props.load(((IFile)resource).getContents());
- Set set = props.entrySet();
- java.util.List list = new LinkedList();
- Iterator i = set.iterator();
- while (i.hasNext())
- {
- Map.Entry me = (Map.Entry)i.next();
- String key = (String)me.getKey();
- String val = (String)me.getValue();
- list.add(new String[] {key,val});
- }
- values_.addAll(list);
- }
- catch (Exception e)
- {
- // TODO Report some error here.
- }
- }
- refresh();
- }
-
- private void handleAddButtonSelected(SelectionEvent event)
- {
- values_.add(defaultValue_);
- refresh();
- setSelectionAsObject(values_.get(table_.getItemCount()-1));
- tableEditorListener_.editSelection();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event)
- {
- handleDeleteKeyPressed();
- }
-
- private void handleDeleteKeyPressed()
- {
- internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
- {
- int selectionIndex = table_.getSelectionIndex();
- int selectionCount = table_.getItemCount();
- values_.remove(selectionIndex);
- if (selectionIndex < selectionCount-1)
- setSelectionAsObject(values_.get(selectionIndex));
- else if (selectionCount -2 >= 0)
- setSelectionAsObject(values_.get(selectionCount-2));
- refresh();
- }
- }
-
- private void internalRefresh()
- {
- // synchronize text field, previously selected table cell and model (inputObject)
- if (text_ != null)
- {
- TableItem oldTableItem = editor_.getItem();
- int oldColumnIndex = editor_.getColumn();
- if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
- {
- String oldText = text_.getText();
- oldTableItem.setText(oldColumnIndex, oldText);
- int oldRowIndex = table_.indexOf(oldTableItem);
- values_.set(oldRowIndex, new String[] {oldTableItem.getText(0), oldTableItem.getText(1)});
- }
- }
- checkMappingConstraints();
- statusListener_.handleEvent( null );
- }
-
- private void checkMappingConstraints() {
-
- HashMap map = new HashMap();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
-
- for(int cnt=0; cnt<values_.size(); cnt++){
- String[] value = (String[])values_.get(cnt);
- if(map.containsKey(value[0]) && ((rescriction & 1)!=0)){
- message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[0],columns_[1]});
- return;
- }
- if(map.containsValue(value[1]) && ((rescriction & 2)!=0)){
- message = msgUtils.getMessage("MSG_MAPPING_DUPLICATE_ENTRIES", new String[]{columns_[1],columns_[0]});
- return;
- }
- map.put(value[0],value[1]);
-
- }
- message = null;
-
- }
-
- public Status getStatus()
- {
- return message == null ? new SimpleStatus("") :
- new SimpleStatus( "", message, Status.ERROR );
- }
-
- private void setSelectionAsObject(Object object)
- {
- tableViewer_.setSelection(new StructuredSelection(object), true);
- }
-
- public void refresh()
- {
- internalRefresh();
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- //internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- add_.setEnabled(enabled);
- enableRemove(enabled);
- }
-
- public void dispose()
- {
- internalDispose();
- if (editor_ != null)
- editor_.dispose();
- if (table_ != null)
- table_.dispose();
- if (add_ != null)
- add_.dispose();
- if (remove_ != null)
- remove_.dispose();
- }
-
- private void internalDispose()
- {
- if (text_ != null)
- text_.dispose();
- text_ = null;
- }
-
- protected class TableEditorListener implements MouseListener
- {
- private int currSelectionIndex_;
- private int editRow_;
- private int editColumn_;
-
- public TableEditorListener()
- {
- super();
- currSelectionIndex_ = -1;
- editRow_ = -1;
- editColumn_ = -1;
- }
-
- public void mouseDoubleClick(MouseEvent e)
- {
- mouseDown(e);
- }
-
- public void mouseDown(MouseEvent e)
- {
- // refresh table
- internalRefresh();
- // Clean up previous text editor control
- internalDispose();
- // update table
- if (table_.isFocusControl())
- {
- int selectedRowIndex = getSelectedRow(table_, e.y);
- if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
- {
- TableItem tableItem = table_.getItem(selectedRowIndex);
- int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
- if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
- editSelection(selectedRowIndex, selectedColumnIndex);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- public void mouseUp(MouseEvent e)
- {
- }
-
- private int getSelectedRow(Table table, int y)
- {
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++)
- {
- Rectangle rectangle = tableItems[i].getBounds(0);
- if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
- return i;
- }
- return -1;
- }
-
- private int getSelectedColumn(TableItem tableItem, int x, int y)
- {
- for (int i = 0; i < columns_.length; i++)
- {
- if (tableItem.getBounds(i).contains(x, y))
- return i;
- }
- return -1;
- }
-
- private void editSelection(int row, int column)
- {
- editRow_ = row;
- editColumn_ = column;
- TableItem tableItem = table_.getItem(row);
- // Setup adapter for the new selection
- text_ = new Text(table_, SWT.NONE);
- String text = tableItem.getText(column);
- text_.setText((text != null) ? text : "");
- text_.addKeyListener(new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Esc
- if (((int)e.character) == 27)
- cancelSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- text_.addTraverseListener(new TraverseListener()
- {
- public void keyTraversed(TraverseEvent e)
- {
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- traverseTabNext();
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- traverseTabPrevious();
- }
- }
- );
- editor_.setEditor(text_, tableItem, column);
- text_.setFocus();
- text_.selectAll();
- }
-
- protected void traverseTabNext()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
- {
- if (editColumn_ < columns_.length-1)
- editColumn_++;
- else
- {
- editColumn_ = 0;
- editRow_++;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- protected void traverseTabPrevious()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == 0 && editColumn_ == 0))
- {
- if (editColumn_ > 0)
- editColumn_--;
- else
- {
- editColumn_ = columns_.length-1;
- editRow_--;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- public void cancelSelection()
- {
- internalDispose();
- internalRefresh();
- }
-
- public void editSelection()
- {
- int selectedRowIndex = table_.getSelectionIndex();
- if (selectedRowIndex != -1 && columns_.length > 0)
- {
- // refresh table
- internalRefresh();
- // Clean up any previous editor control
- internalDispose();
- editSelection(selectedRowIndex, 0);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof List)
- {
- List list = (List)inputElement;
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- return ((String[])element)[columnIndex];
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
deleted file mode 100644
index 4b501b6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionConditionCommand.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.DialogWWWAuthentication;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionConditionCommand extends SimpleCommand implements Condition
-{
- private String pluginId_;
- private MessageUtils msgUtils_;
- private WebServicesParser webServicesParser;
- private String webServiceURI;
- private String httpBasicAuthUsername;
- private String httpBasicAuthPassword;
- private boolean needWSDLSelectionTreeWidget;
-
- public WSDLSelectionConditionCommand()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser == null)
- webServicesParser = new WebServicesParserExt();
- return webServicesParser;
- }
-
- public Status execute(Environment env)
- {
- needWSDLSelectionTreeWidget = false;
- WebServicesParser parser = getWebServicesParser();
- parser.setURI(webServiceURI);
- try
- {
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
- }
- catch (WWWAuthenticationException wwwae)
- {
- DialogWWWAuthentication dialog = new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell());
- dialog.handleWWWAuthentication(wwwae);
- String username = dialog.getUsername();
- String password = dialog.getPassword();
- httpBasicAuthUsername = username;
- httpBasicAuthPassword = password;
- if (username != null && password != null)
- {
- parser.setHTTPBasicAuthUsername(username);
- parser.setHTTPBasicAuthPassword(password);
- try
- {
- parser.parse(WebServicesParser.PARSE_WSIL | WebServicesParser.PARSE_DISCO | WebServicesParser.PARSE_LINKS);
- }
- catch (Throwable t)
- {
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), Status.ERROR, t);
- }
- finally
- {
- parser.setHTTPBasicAuthUsername(null);
- parser.setHTTPBasicAuthPassword(null);
- }
- }
- }
- catch (Throwable t)
- {
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_URI_NOT_RESOLVABLE", new Object[] {webServiceURI}), Status.ERROR, t);
- }
- WebServiceEntity wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
- if (wsEntity != null)
- {
- int type = wsEntity.getType();
- if (type != WebServiceEntity.TYPE_WSDL)
- needWSDLSelectionTreeWidget = true;
- }
- return new SimpleStatus("");
- }
-
- public boolean evaluate()
- {
- return needWSDLSelectionTreeWidget;
- }
-
- public String getWebServiceURI()
- {
- return webServiceURI;
- }
-
- public void setWebServiceURI(String webServiceURI)
- {
- this.webServiceURI = webServiceURI;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-/**
- * @return Returns the httpBasicAuthPassword.
- */
-public String getHttpBasicAuthPassword() {
- return httpBasicAuthPassword;
-}
-/**
- * @return Returns the httpBasicAuthUsername.
- */
-public String getHttpBasicAuthUsername() {
- return httpBasicAuthUsername;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
deleted file mode 100644
index df255bf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionOutputCommand.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.Map;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class WSDLSelectionOutputCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private IProject project;
- private String componentName;
-
- private boolean testService;
-
-
- public boolean getTestService() {
- return testService;
- }
-
-
- public void setTestService(boolean testService) {
- this.testService = testService;
- }
-
- /**
- * @return Returns the project.
- */
- public IProject getProject()
- {
- return project;
- }
-
- /**
- * @param project
- * The project to set.
- */
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
-
-
- public String getComponentName()
- {
- return componentName;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName = componentName;
- }
-
- public String getWsdlURI()
- {
- return wsdlURI;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser != null)
- return webServicesParser;
- else
- return new WebServicesParserExt();
- }
-
- /**
- * @param webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public Status execute(Environment env)
- {
- MessageUtils msgUtils = new MessageUtils("org.eclipse.jst.ws.consumption.ui.plugin", this);
- if (wsdlURI != null && getWebServicesParser().getWSDLDefinition(wsdlURI) != null) {
- Status status = new SimpleStatus("");
- Map services = getWebServicesParser().getWSDLDefinition(wsdlURI).getServices();
- if (services.isEmpty()){
- if (testService==true){
- testService = false;
- status = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NO_SERVICE_ELEMENT"), Status.WARNING);
- try{
- env.getStatusHandler().report(status);
- }catch(Exception e){
- status = new SimpleStatus("", msgUtils.getMessage("MSG_WARNING_NO_SERVICE_ELEMENT"), Status.ERROR);
- }
- }
- }
- return status;
- }
- else
- {
- Status status = new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
deleted file mode 100644
index 84d8ac2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionTreeWidget.java
+++ /dev/null
@@ -1,295 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import java.util.List;
-
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITreeContentProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-/**
-* This wizard page allows the user to select the WSDL URI for consumption
-*/
-public class WSDLSelectionTreeWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_;
- private MessageUtils msgUtils_;
-
- /*CONTEXT_ID PWWS0001 for the WSDL Selection Page*/
- private final String INFOPOP_PWWS_PAGE = ".PWWS0001";
-
- /*CONTEXT_ID PWWS0002 for the WSDL Document text field of the WSDL Selection Page*/
- private final String INFOPOP_PWWS_TEXT_WSDL = ".PWWS0002";
-
- /*CONTEXT_ID PWWS0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
- private final String INFOPOP_PWWS_BUTTON_BROWSE_WSDL = ".PWWS0003";
-
- private WebServicesParser webServicesParser;
- private String webServiceURI;
-
- private Composite parent;
- private Listener statusListener;
- private TreeViewer treeViewer_;
- private TreeContentProvider treeContentProvider;
- private Tree tree_;
- private int pageWidth_;
-
- /**
- * Default constructor.
- */
- public WSDLSelectionTreeWidget()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- this.parent = parent;
- this.statusListener = statusListener;
- parent.setToolTipText(msgUtils_.getMessage("TOOLTIP_PWWS_PAGE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, pluginId_ + INFOPOP_PWWS_PAGE);
-
- Label wsdlLabel = new Label(parent, SWT.WRAP);
- wsdlLabel.setText(msgUtils_.getMessage("LABEL_SELECT_WSDL"));
- wsdlLabel.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- tree_ = new Tree(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = 200;
- tree_.setLayoutData(gd);
- pageWidth_ = tree_.getShell().getSize().x;
- treeViewer_ = new TreeViewer(tree_);
- treeContentProvider = new TreeContentProvider();
- treeViewer_.setContentProvider(treeContentProvider);
- treeViewer_.setLabelProvider(new TreeLabelProvider());
- treeViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- handleTreeSelectionChangedEvent(event);
- }
- }
- );
- return this;
- }
-
- private void handleTreeSelectionChangedEvent(SelectionChangedEvent event)
- {
- statusListener.handleEvent(new Event());
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- return webServicesParser;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- treeViewer_.setInput(this.webServicesParser);
- refreshTreeViewer();
- }
-
- public void setWebServiceURI(String wsURI)
- {
- webServiceURI = wsURI;
- treeContentProvider.setWebServiceURI(webServiceURI);
- refreshTreeViewer();
- }
-
- public void refreshTreeViewer()
- {
- if (webServicesParser != null && webServiceURI != null)
- {
- treeViewer_.refresh();
- Control shell = tree_.getShell();
- if (tree_.getSize().x > pageWidth_ || shell.getSize().x > pageWidth_)
- {
- tree_.setSize(pageWidth_, tree_.getSize().y);
- shell.setSize(pageWidth_, shell.getSize().y);
- shell.computeSize(SWT.DEFAULT, SWT.DEFAULT);
- shell.redraw();
- }
- }
- }
-
- public void setEnabled(boolean enabled)
- {
- tree_.setEnabled(enabled);
- }
-
- public boolean isEnabled()
- {
- return tree_.isEnabled();
- }
-
- public String getWsdlURI()
- {
- WebServiceEntity entity = getSelectionAsWebServiceEntity();
- if (entity != null)
- return entity.getURI();
- else
- return webServiceURI;
- }
-
- private WebServiceEntity getSelectionAsWebServiceEntity()
- {
- if (treeViewer_ != null)
- {
- ISelection sel = treeViewer_.getSelection();
- if (!sel.isEmpty() && (sel instanceof IStructuredSelection))
- {
- IStructuredSelection ssel = (IStructuredSelection)sel;
- Object object = ssel.getFirstElement();
- if (object instanceof WebServiceEntity)
- return (WebServiceEntity)object;
- }
- }
- return null;
- }
-
- public Status getStatus()
- {
- WebServiceEntity wsEntity = getSelectionAsWebServiceEntity();
- if (wsEntity == null || wsEntity.getType() != WebServiceEntity.TYPE_WSDL)
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL"), Status.ERROR);
- else
- return new SimpleStatus("");
- }
-
- private class TreeContentProvider implements ITreeContentProvider
- {
- private String webServiceURI;
-
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof WebServicesParser)
- {
- WebServicesParser parser = (WebServicesParser)inputElement;
- Object wsEntity = parser.getWebServiceEntityByURI(webServiceURI);
- if (wsEntity != null)
- return new Object[] {wsEntity};
- }
- return new Object[0];
- }
-
- public Object[] getChildren(Object parentElement)
- {
- if (parentElement instanceof WebServiceEntity)
- {
- List list = ((WebServiceEntity)parentElement).getChildren();
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- return new Object[0];
- }
-
- public Object getParent(Object element)
- {
- if (element instanceof WebServiceEntity)
- return ((WebServiceEntity)element).getParent();
- return new Object[0];
- }
-
- public boolean hasChildren(Object element)
- {
- return (getChildren(element).length > 0);
- }
-
- public void setWebServiceURI(String wsURI)
- {
- webServiceURI = wsURI;
- }
- }
-
- private class TreeLabelProvider implements ILabelProvider
- {
- public Image getImage(Object element)
- {
- switch (((WebServiceEntity)element).getType())
- {
- case WebServiceEntity.TYPE_HTML:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/html.gif").createImage();
- case WebServiceEntity.TYPE_WSIL:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsil.gif").createImage();
- case WebServiceEntity.TYPE_WSDL:
- return WebServiceConsumptionUIPlugin.getImageDescriptor("icons/wsil/wsdl.gif").createImage();
- default:
- return null;
- }
- }
-
- public String getText(Object element)
- {
- return ((WebServiceEntity)element).getURI();
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index 96dc1d5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,148 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidgetDefaultingCommand extends SimpleCommand
-{
- private IStructuredSelection selection_;
-
- public String getWebServiceURI()
- {
- if (selection_ != null && !selection_.isEmpty())
- {
- Object firstSel = selection_.getFirstElement();
- if (firstSel instanceof IFile)
- {
- IFile ifile = (IFile)firstSel;
- String ext = ifile.getFileExtension();
- if (ext != null && (ext.equals("wsdl") || ext.equals("wsil") || ext.equals("html")))
- {
- return ifile.getFullPath().toString();
- }
- }
- if (firstSel instanceof ServiceImpl)
- {
- ServiceImpl serviceImpl = (ServiceImpl)firstSel;
- return J2EEActionAdapterFactory.getWSDLURI(serviceImpl);
- }
- if (firstSel instanceof ServiceRef)
- {
- ServiceRef serviceRef = (ServiceRef)firstSel;
- return J2EEActionAdapterFactory.getWSDLURI(serviceRef);
- }
- if (firstSel instanceof WSDLResourceImpl)
- {
- WSDLResourceImpl wsdlRI = (WSDLResourceImpl)firstSel;
- return J2EEActionAdapterFactory.getWSDLURI(wsdlRI);
- }
- if (firstSel instanceof String)
- return (String)firstSel;
- }
- return "";
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- selection_ = selection;
- }
-
- public boolean getGenWSIL()
- {
- return false;
- }
-
- public String getWsilURI()
- {
- String wsURI = getWebServiceURI();
- if (wsURI != null && wsURI.length() > 0 && wsURI.endsWith("wsdl"))
- {
- StringBuffer sb = new StringBuffer(wsURI.substring(0, wsURI.length()-4));
- sb.append("wsil");
- return sb.toString();
- }
- return "";
- }
-
- public IProject getProject()
- {
- IProject p = getProjectFromInitialSelection(selection_);
- return p;
- }
-
- public String getComponentName()
- {
- String cname = getComponentNameFromInitialSelection(selection_);
- return cname;
- }
-
- private IProject getProjectFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
deleted file mode 100644
index 9b3397c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WSDLSelectionWidgetWrapper.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWrapper;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class WSDLSelectionWidgetWrapper extends SimpleWidgetDataContributor
-{
- private String pluginId;
- private MessageUtils msgUtils;
-
- private Composite parent;
- private Listener statusListener;
-
- private WSDLSelectionWidget wsdlSelectionWidget;
- private String webServiceURI;
- private IProject project;
- private String componentName;
-
- public WSDLSelectionWidgetWrapper()
- {
- pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.parent = parent;
- this.statusListener = statusListener;
- wsdlSelectionWidget = new WSDLSelectionWidget();
- wsdlSelectionWidget.addControls(parent, statusListener);
- return this;
- }
-
- public Status getStatus()
- {
- return wsdlSelectionWidget.getStatus();
- }
-
- public void setWebServiceURI(String wsUri)
- {
- IStructuredSelection sel;
- if (wsUri != null)
- sel = new StructuredSelection(wsUri);
- else
- sel = new StructuredSelection();
- wsdlSelectionWidget.setInitialSelection(sel);
- }
-
- public String getWebServiceURI()
- {
- IStructuredSelection sel = wsdlSelectionWidget.getObjectSelection();
- Object object = sel.getFirstElement();
- String result = null;
-
- if (object != null )
- {
- if( object instanceof WSDLSelectionWrapper )
- {
- // Get at the inner structured selection object.
- WSDLSelectionWrapper wrapper = (WSDLSelectionWrapper)object;
- IStructuredSelection innerSelection = wrapper.wsdlSelection;
- Object innerObject = innerSelection.getFirstElement();
-
- result = innerObject == null ? null : innerObject.toString();
- }
- else
- {
- result = object.toString();
- }
- }
-
- return result;
- }
-
- public String getWsdlURI()
- {
- return getWebServiceURI();
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return wsdlSelectionWidget.getWebServicesParser();
- }
-
- public void setProject(IProject project)
- {
- this.project = project;
- }
-
- public IProject getProject()
- {
- IProject p = wsdlSelectionWidget.getProject();
- if (p==null)
- {
- return project;
- }
- else
- return p;
- }
-
- public String getComponentName()
- {
- String cname = wsdlSelectionWidget.getComponentName();
- if (cname==null)
- {
- return componentName;
- }
- else
- return cname;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName = componentName;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
deleted file mode 100644
index 934623c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/WebServiceClientTypeWidget.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class WebServiceClientTypeWidget extends SimpleWidgetDataContributor
-{
- /*CONTEXT_ID PWPR0013 for the Wizard Scenario Client group of the Project Page*/
- private String INFOPOP_PWPR_GROUP_SCENARIO_CLIENT = "PWPR0013";
-
- /*CONTEXT_ID PWPR0014 for the Web Service Client Type combo box of the Project Page*/
- private String INFOPOP_PWPR_COMBO_CLIENTTYPE = "PWPR0014";
- private Combo clientTypeCombo_;
-
- /*CONTEXT_ID PWPR0006 for the Test Proxy check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_TEST_PROXY = "PWPR0006";
- private Button testProxyCheckbox_;
-
- private TypeRuntimeServer ids_;
- private LabelsAndIds labelIds_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, pluginId );
-
- Group clientGroup = utils.createGroup( parent,
- "GROUP_SCENARIO_CLIENT",
- "TOOLTIP_PWPR_GROUP_SCENARIO_CLIENT",
- INFOPOP_PWPR_GROUP_SCENARIO_CLIENT,
- 2, 10, 10 );
-
-
- int comboStyle = SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY;
- clientTypeCombo_ = utils.createCombo( clientGroup,
- "LABEL_WEBSERVICECLIENTTYPE",
- "TOOLTIP_PWPR_COMBO_CLIENTTYPE",
- INFOPOP_PWPR_COMBO_CLIENTTYPE,
- comboStyle );
-
-
-
- return this;
- }
-
- public void enableWidget( boolean enable )
- {
- clientTypeCombo_.setEnabled( enable );
- }
-
- public void setTypeRuntimeServer( TypeRuntimeServer ids )
- {
- // rskreg
- //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
- //LabelsAndIds labelIds = registry.getClientTypeLabels();
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils.getClientTypeLabels();
- int selection = 0;
- String[] clientIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- // rskreg
- clientTypeCombo_.setItems( labelIds.getLabels_() );
-
- // Now find the selected one.
- for( int index = 0; index < clientIds.length; index++ )
- {
- if( selectedId.equals( clientIds[index ]) )
- {
- selection = index;
- break;
- }
- }
-
- clientTypeCombo_.select( selection );
- ids_ = ids;
- labelIds_ = labelIds;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- int selectionIndex = clientTypeCombo_.getSelectionIndex();
-
- ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-
- return ids_;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
deleted file mode 100644
index 6d721c7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ClientWidgetBinding.java
+++ /dev/null
@@ -1,466 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ClientServerDeployableConfigCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.CheckForServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetWrapper;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.AddModuleDependenciesCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishJavaTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.extensions.AssembleClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployClientFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopClientFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallClientFragment;
-import org.eclipse.wst.ws.internal.extensions.RunClientFragment;
-
-
-public class ClientWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new ClientRootCommandFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- canFinishRegistry_ = canFinishRegistry;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry_ = dataRegistry;
-
- // Before ClientWizardWidget
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidget.class );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidget.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidget.class );
-
- // After ClientWizardWidget
- dataRegistry.addMapping(ClientWizardWidget.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidget.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- // Before ClientRuntimeSelectionWidget
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientRuntimeSelectionWidget.class, "J2EEVersion", null);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientRuntimeSelectionWidget.class,"NeedEAR",null);
-
- // After ClientRuntimeSelectionWidget
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "J2EEVersion", ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", null);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
- // The ClientRuntimeSelectionWidget can control what client extension comes up.
- dataRegistry.addMapping(ClientRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- // Before WSDLSelectionWidgetWrapper
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionWidgetWrapper.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionWidgetWrapper.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionWidgetWrapper.class );
-
- // After WSDLSelectionWidgetWrapper
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WsdlURI", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "WebServicesParser", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "Project", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetWrapper.class, "ComponentName", WSDLSelectionOutputCommand.class);
-
- // Before Client Test widget.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
- // After the client test widget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- widgetRegistry_ = widgetRegistry;
-
- widgetRegistry.add( "ClientWizardWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
- msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientWizardWidget();
- }
- } );
-
- widgetRegistry.add( "ClientRuntimeSelectionWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_CLIENT_RUNTIME_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientRuntimeSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "WSDLSelectionWidgetWrapper",
- msgUtils.getMessage("PAGE_TITLE_WS_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new WSDLSelectionWidgetWrapper();
- }
- } );
-
- widgetRegistry.add( "ClientTestWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
- msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
- }
-
- private class InitClientRegistry extends SimpleCommand
- {
- private WebServiceClientTypeRegistry clientRegistry_ = WebServiceClientTypeRegistry.getInstance();
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment)
- {
- clientRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
- clientRegistry_.setWidgetRegistry( widgetRegistry_ );
- clientRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-
- return new SimpleStatus( "" );
- }
- }
-
- private class ClientRootCommandFragment extends SequenceFragment
- {
- public ClientRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- //add( new SimpleFragment( new CheckForMissingFiles(), "" ) );
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
- add( new SimpleFragment( new InitClientRegistry(), "" ));
- add( new SimpleFragment( "ClientWizardWidget" ) );
- //add( new TestCommandFactoryFragment() );
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "WSDLSelectionWidgetWrapper" ) );
- add( new SimpleFragment( new WSDLSelectionOutputCommand(), ""));
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
- //add( new TestCommandFactoryFragment2() );
- add( new SimpleFragment( "ClientRuntimeSelectionWidget" ) );
- //add( new SimpleFragment( new CheckForServiceProjectCommand(), ""));
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- //add(new SimpleFragment(new ClientServerDeployableConfigCommand(false), "")); //Note: added here for client
- //add( new SimpleFragment( new CreateClientProjectCommand(), ""));
- //add( new ClientExtensionFragment() );
- add( new ClientRootFragment() );
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- add( new SimpleFragment(new GetMonitorCommand(), ""));
- add( new SimpleFragment(new TestDefaultingFragment(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add(new FinishFragment());
-
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- //Map SelectionCommand
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "InitialInitialSelection", null);
-
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "MonitorService", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "TestService", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "MonitorService", GetMonitorCommand.class);
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", CheckForServiceProjectCommand.class);
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", WSDLSelectionOutputCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "Project", WSDLSelectionOutputCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "ComponentName", WSDLSelectionOutputCommand.class);
-
- // WSDLSelectionOutputCommand
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", GetMonitorCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", GetMonitorCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "Project", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "ComponentName", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WsdlURI", CheckForServiceProjectCommand.class);
- dataRegistry.addMapping(WSDLSelectionOutputCommand.class, "WebServicesParser", CheckForServiceProjectCommand.class);
-
- //ServerDeployableConfigurationCommand for client
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ClientServerDeployableConfigCommand.class, "SampleProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientServerDeployableConfigCommand.class, "ClientTypeRuntimeServer", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientServerDeployableConfigCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientServerDeployableConfigCommand.class,"SampleServerTypeID", null);
-
- // Setup the PreClientDevelopCommand.
- //
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- //
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class );
-
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", CreateClientProjectCommand.class, "ProxyProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", CreateClientProjectCommand.class, "ProxyProjectEAR", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectType", CreateClientProjectCommand.class, "ClientProjectTypeId", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", CreateClientProjectCommand.class, "ServerFactoryId", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", CreateClientProjectCommand.class, "J2EEVersion", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", CreateClientProjectCommand.class, "NeedEAR", null);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "Runtime2ClientTypes", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", WebServiceClientTestArrivalCommand.class, "ClientIds", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", WebServiceClientTestArrivalCommand.class, "J2eeVersion", null);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AddModuleDependenciesCommand.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishJavaTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // GetMonitorCommand
- dataRegistry.addMapping(GetMonitorCommand.class, "Endpoints", ClientTestDelegateCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "SampleExistingServerInstId", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
-
- // Map ClientServerDeployableConfigCommand
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "SampleExistingServerInstId", CreateClientProjectCommand.class, "ExistingServerId", null);
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "AddedProjectToServer", CreateClientProjectCommand.class);
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "SampleExistingServerInstId", FinishDefaultCommand.class, "ExistingServerId", null);
-
- // Map WebServiceClientTestArrivalCommand command.
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "ProxyBean",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",AddModuleDependenciesCommand.class);
-
- //Mappings to enable peek-ahead for Page 3 of the client wizard
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DevelopClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DevelopClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DevelopClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DevelopClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DevelopClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", AssembleClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", AssembleClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", AssembleClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", AssembleClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", AssembleClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", DeployClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", DeployClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", DeployClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", DeployClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", DeployClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", InstallClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", InstallClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", InstallClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", InstallClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", InstallClientFragment.class, "Ear", null );
-
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "WebService", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Environment", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Context", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "Selection", RunClientFragment.class );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", RunClientFragment.class, "Project", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", RunClientFragment.class, "Module", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", RunClientFragment.class, "EarProject", null );
- dataRegistry.addMapping( ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", RunClientFragment.class, "Ear", null );
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
deleted file mode 100644
index c72ae88..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigClientHandlersWidgetBinding.java
+++ /dev/null
@@ -1,144 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- *
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigClientHandlersWidgetBinding implements CommandWidgetBinding {
-
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
-
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- widgetRegistry_ = widgetRegistry;
-
- widgetRegistry.add("ConfigClientHandlersTableWidget",
- msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"),
- new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigClientHandlersTableWidget();
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataMappingRegistry_ = dataRegistry;
-
-
-// dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"AllHandlers", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"Handlers", ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ServiceRefName", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-
- //dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"AllHandlersList", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class,"HandlersTable",null);
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
- canFinishRegistry_ = canFinishRegistry;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
-
- return new ClientHandlersConfigCommandFragment();
- }
- };
- }
-
- private class ClientHandlersConfigCommandFragment extends SequenceFragment{
-
- public ClientHandlersConfigCommandFragment()
- {
- add( new SimpleFragment( new ClientHandlersWidgetDefaultingCommand(), "" ));
- add( new SimpleFragment( "ConfigClientHandlersTableWidget" ) );
- add( new SimpleFragment( new ClientHandlersWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
deleted file mode 100644
index a0eebe2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigServiceHandlersWidgetBinding.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.OpenJavaEditorCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- *
- * Handler Configuration Window - Preferences - Java - Code Generation - Code
- * and Comments
- */
-public class ConfigServiceHandlersWidgetBinding implements CommandWidgetBinding {
-
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
-
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- widgetRegistry_ = widgetRegistry;
-
- widgetRegistry.add("ConfigServiceHandlersTableWidget",
- msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"),
- new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigServiceHandlersTableWidget();
- }
- });
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataMappingRegistry_ = dataRegistry;
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"DescriptionName", ConfigServiceHandlersTableWidget.class);
-
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlersList", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class,"ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"SourceOutputLocation", GenerateHandlerSkeletonCommand.class,"OutputLocation",null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"HandlerClassNames", GenerateHandlerSkeletonCommand.class,"HandlerNames",null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class,"GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"Project", OpenJavaEditorCommand.class);
- dataRegistry.addMapping(GenerateHandlerSkeletonCommand.class,"ClassNames", OpenJavaEditorCommand.class);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
- canFinishRegistry_ = canFinishRegistry;
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
-
- return new ServiceHandlersConfigCommandFragment();
- }
- };
- }
-
- private class ServiceHandlersConfigCommandFragment extends SequenceFragment{
-
- public ServiceHandlersConfigCommandFragment()
- {
- add( new SimpleFragment( new ServiceHandlersWidgetDefaultingCommand(), "" ));
- add( new SimpleFragment( "ConfigServiceHandlersTableWidget" ) );
- add( new SimpleFragment( new ServiceHandlersWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new GenerateHandlerSkeletonCommand(), ""));
- add( new SimpleFragment( new OpenJavaEditorCommand(), ""));
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
-
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
deleted file mode 100644
index 1a65d94..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ConfigureHandlersWidgetBinding.java
+++ /dev/null
@@ -1,253 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.command.GenerateHandlerSkeletonCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientHandlersWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigClientHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ConfigServiceHandlersTableWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.HandlersDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ServiceHandlersWidgetOutputCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class ConfigureHandlersWidgetBinding implements CommandWidgetBinding {
-
- private CanFinishRegistry canFinishRegistry_;
-
- private WidgetRegistry widgetRegistry_;
-
- private DataMappingRegistry dataMappingRegistry_;
-
- public ConfigureHandlersWidgetBinding() {
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create() {
- return new CommandFragmentFactory() {
-
- public CommandFragment create() {
- return new HandlersCommandFragment();
- }
- };
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
- canFinishRegistry_ = canFinishRegistry;
- }
-
- /*
- * (non-Javadoc),
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataMappingRegistry_ = dataRegistry;
-
- // Map client-side widgets to commands
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "Handlers", ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ServiceRefName", ConfigClientHandlersTableWidget.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "RefNameToServiceRef", ConfigClientHandlersTableWidget.class);
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "WsRefsToHandlers", ClientHandlersWidgetOutputCommand.class, "HandlersTable", null);
-
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
- dataRegistry.addMapping(ConfigClientHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- // Map service-side widgets to commands
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsRefsToHandlers", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "GenSkeletonEnabled", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "SourceOutputLocation", ConfigServiceHandlersTableWidget.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ConfigServiceHandlersTableWidget.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "DescriptionName", ConfigServiceHandlersTableWidget.class);
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlersList", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "WsDescToHandlers", ServiceHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "ServiceDescNameToDescObj", ServiceHandlersWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "SourceOutputLocation", GenerateHandlerSkeletonCommand.class, "OutputLocation", null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "HandlerClassNames", GenerateHandlerSkeletonCommand.class, "HandlerNames", null);
- dataRegistry.addMapping(ConfigServiceHandlersTableWidget.class, "GenSkeletonEnabled", GenerateHandlerSkeletonCommand.class);
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry) {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
-
- widgetRegistry.add("ConfigServiceHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_SERVICE_HDLR_CONFIG"), msgUtils
- .getMessage("PAGE_DESC_SERVICE_HDLR_CONFIG"), new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigServiceHandlersTableWidget();
- }
- });
-
- widgetRegistry.add("ConfigClientHandlersTableWidget", msgUtils.getMessage("PAGE_TITLE_CLIENT_HDLR_CONFIG"), msgUtils
- .getMessage("PAGE_DESC_CLIENT_HDLR_CONFIG"), new WidgetContributorFactory() {
-
- public WidgetContributor create() {
- return new ConfigClientHandlersTableWidget();
- }
- });
-
- }
-
- private class HandlersCommandFragment extends SequenceFragment {
-
- public HandlersCommandFragment() {
-
- add(new SimpleFragment(new HandlersDefaultingCommand(), ""));
-
- add(new ServiceHandlersFragment());
- add(new ClientHandlersFragment());
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", HandlersDefaultingCommand.class);
-
- dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsClientHandler", ClientHandlersFragment.class, "ClientHandlersEnabled", null);
- dataRegistry.addMapping(HandlersDefaultingCommand.class, "IsServiceHandler", ServiceHandlersFragment.class, "ServiceHandlersEnabled", null);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsClientResource", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"WsServiceRefs", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class,"ClientProject", ClientHandlersWidgetOutputCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry) {
- canFinishRegistry_ = canFinishRegistry;
- }
- }
-
- private class ClientHandlersFragment extends BooleanFragment {
-
- boolean isClient_ = false;
-
- public ClientHandlersFragment() {
- setCondition(new Condition() {
-
- public boolean evaluate() {
- return isClient_;
- }
- });
-
- SequenceFragment clientHandlersRootFragment = new SequenceFragment();
-
- clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetDefaultingCommand(), ""));
-
- clientHandlersRootFragment.add(new SimpleFragment("ConfigClientHandlersTableWidget"));
- clientHandlersRootFragment.add(new SimpleFragment(new ClientHandlersWidgetOutputCommand(), ""));
- clientHandlersRootFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
- setTrueFragment(clientHandlersRootFragment);
- }
-
- public void setClientHandlersEnabled(boolean isClient) {
- isClient_ = isClient;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "WsClientResource", ClientHandlersWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientHandlersWidgetDefaultingCommand.class, "ClientProject", ClientHandlersWidgetOutputCommand.class);
-
- }
-
- }
-
- private class ServiceHandlersFragment extends BooleanFragment {
-
- boolean isService_ = false;
-
- public ServiceHandlersFragment() {
- setCondition(new Condition() {
-
- public boolean evaluate() {
- return isService_;
- }
- });
-
- SequenceFragment serviceHandlersRootFragment = new SequenceFragment();
- serviceHandlersRootFragment.add(new SimpleFragment(new ServiceHandlersWidgetDefaultingCommand(), ""));
-
- SequenceFragment serviceHandlersFragment = new SequenceFragment();
- serviceHandlersFragment.add(new SimpleFragment("ConfigServiceHandlersTableWidget"));
- serviceHandlersFragment.add(new SimpleFragment(new ServiceHandlersWidgetOutputCommand(), ""));
- serviceHandlersFragment.add(new SimpleFragment(new GenerateHandlerSkeletonCommand(), ""));
-
- serviceHandlersRootFragment.add(serviceHandlersFragment);
-
- setTrueFragment(serviceHandlersRootFragment);
- }
-
- public void setServiceHandlersEnabled(boolean isService) {
- isService_ = isService;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry) {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServiceHandlersWidgetDefaultingCommand.class);
-
- dataRegistry.addMapping(ServiceHandlersWidgetDefaultingCommand.class, "WsddResource", ServiceHandlersWidgetOutputCommand.class);
-
- }
-
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
deleted file mode 100644
index 5f5414f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/GenSampleWidgetBinding.java
+++ /dev/null
@@ -1,438 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.EclipseIPath2URLStringTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.AddModuleDependenciesCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishJavaTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestWebServiceClient;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-
-
-public class GenSampleWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new GenSampleRootCommandFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- canFinishRegistry_ = canFinishRegistry;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry_ = dataRegistry;
-
- // Before Client Test widget.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
- // After the client test widget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleMethods",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- widgetRegistry_ = widgetRegistry;
-
- widgetRegistry.add( "ClientTestWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
- msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
- }
-
- private class InitClientRegistry extends SimpleCommand
- {
- private WebServiceClientTypeRegistry clientRegistry_ = WebServiceClientTypeRegistry.getInstance();
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment)
- {
- clientRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
- clientRegistry_.setWidgetRegistry( widgetRegistry_ );
- clientRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-
- return new SimpleStatus( "" );
- }
- }
-
- private class InitializeProxyCommand extends SimpleCommand
- {
- private IStructuredSelection selection_;
- private TypeRuntimeServer typeRuntimeServer_;
- private IContext context_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
- private IWebServiceClient webServiceClient_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
- private boolean test_;
- private String wsdlURI_;
-
- public Status execute(Environment environment_){
- Status status = new SimpleStatus( "" );
-
- // Split up the project and module
- int index = module_.indexOf("/");
- if (index!=-1){
- project_ = module_.substring(0,index);
- module_ = module_.substring(index+1);
- }
-
- if (ear_!=null && ear_.length()>0)
- {
- int earIndex = ear_.indexOf("/");
- if (earIndex!=-1) {
- earProject_ = ear_.substring(0,earIndex);
- ear_ = ear_.substring(earIndex+1);
- }
- }
-
- WebServiceClientInfo clientInfo = new WebServiceClientInfo();
- clientInfo.setImplURL(getProxyBean());
- clientInfo.setJ2eeLevel(j2eeLevel_);
- clientInfo.setServerFactoryId(typeRuntimeServer_.getServerId());
- clientInfo.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- clientInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- clientInfo.setWebServiceRuntimeId(typeRuntimeServer_.getRuntimeId());
- clientInfo.setWsdlURL(wsdlURI_);
- if (clientInfo.getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(clientInfo.getServerFactoryId());
- Status createServerStatus = createServerCommand.execute(environment_);
- if (createServerStatus.getSeverity()==Status.OK){
- clientInfo.setServerInstanceId(createServerCommand.getServerInstanceId());
- }
- else if (createServerStatus.getSeverity()==Status.ERROR){
- environment_.getStatusHandler().reportError(createServerStatus);
- }
-
- }
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(clientInfo.getServerInstanceId());
- if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
- {
- command.setProject(earProject_);
- command.setModule(ear_);
- }
- else
- {
- command.setProject(project_);
- command.setModule(module_);
- }
-
- status = command.execute(environment_);
- if (status.getSeverity()==Status.ERROR)
- {
- environment_.getStatusHandler().reportError(status);
- }
-
- webServiceClient_ = new TestWebServiceClient(clientInfo);
- return status;
- }
-
- public String getProxyBean()
- {
- String proxyBean = "";
-
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection( selection_.getFirstElement() );
- String beanPackage = ResourceUtils.getJavaResourcePackageName( resource.getFullPath() );
-
- if( beanPackage==null )
- beanPackage = "";
- else
- beanPackage = beanPackage + ".";
-
- proxyBean = beanPackage + resource.getName();
-
- if( proxyBean.toLowerCase().endsWith(".java") || proxyBean.toLowerCase().endsWith(".class"))
- {
- proxyBean = proxyBean.substring(0,proxyBean.lastIndexOf('.'));
- }
- }
- catch( CoreException exc )
- {
- }
-
- return proxyBean;
- }
-
- public IWebServiceClient getWebServiceClient()
- {
- return webServiceClient_;
- }
-
- public boolean getGenerateProxy()
- {
- return true;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setClientJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType( String moduleType)
- {
- moduleType_ = moduleType;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- selection_ = selection;
- }
- }
-
- private class GenSampleRootCommandFragment extends SequenceFragment
- {
- public GenSampleRootCommandFragment()
- {
- add( new SimpleFragment( new ClientWizardWidgetDefaultingCommand(), "" ) );
- add( new SimpleFragment( new InitClientRegistry(), "" ));
- add( new SimpleFragment( new ClientWizardWidgetOutputCommand(), "" ));
- add( new SimpleFragment( new WSDLSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ClientRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( new ClientExtensionDefaultingCommand( true ), ""));
- add( new SimpleFragment( new InitializeProxyCommand(), "" ));
- add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ) );
- add( new SimpleFragment( new TestDefaultingFragment(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add( new FinishFragment() );
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- //Map SelectionCommand
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", InitializeProxyCommand.class );
-
- // Map ClientWizardWidgetDefaultingCommand command.
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "TestService", ClientWizardWidgetOutputCommand.class, "TestService", new ForceTrue() );
- dataRegistry.addMapping(ClientWizardWidgetDefaultingCommand.class, "ResourceContext", ClientWizardWidgetOutputCommand.class);
-
- // Map ClientWizardWidgetOutputCommand command.
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ClientRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- // Map ClientRuntimeSelectionWidgetDefaultingCommand command
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ClientRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
-
- // Map WSDLSelectionWidgetDefaultingCommand command.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", WSDLSelectionWidgetDefaultingCommand.class );
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "GenWSIL", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WsilURI", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(WSDLSelectionWidgetDefaultingCommand.class, "WebServiceURI", ClientExtensionDefaultingCommand.class, "WsdlURI", new EclipseIPath2URLStringTransformer());
-
- // Map ClientExtensionDefaultingCommand command.
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "Runtime2ClientTypes", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", WebServiceClientTestArrivalCommand.class, "ClientIds", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", WebServiceClientTestArrivalCommand.class, "J2eeVersion", null);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ServiceServerInstanceId", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AddModuleDependenciesCommand.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", InitializeProxyCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", InitializeProxyCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", InitializeProxyCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", InitializeProxyCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", InitializeProxyCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientWizardWidgetOutputCommand.class, "ResourceContext", InitializeProxyCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", InitializeProxyCommand.class );
-
-
-
-
- // Map InitializeProxyCommand command.
- dataRegistry.addMapping(InitializeProxyCommand.class, "WebServiceClient", ClientExtensionOutputCommand.class);
- dataRegistry.addMapping(InitializeProxyCommand.class, "GenerateProxy", ClientExtensionOutputCommand.class);
-
- // Map ClientExtensionOutputCommand command.
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishJavaTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EARProjectName", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
-
- // Map WebServiceClientTestArrivalCommand command.
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "ProxyBean",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
-
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",AddModuleDependenciesCommand.class);
- }
- }
-
- private class ForceTrue implements Transformer
- {
- public Object transform(Object value)
- {
- return new Boolean(true);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
deleted file mode 100644
index 837b0f3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSILWidgetBinding.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ImportWSILWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class ImportWSILWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
-
- public ImportWSILWidgetBinding()
- {
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment("ImportWSILWidget"));
- root.add(new SimpleFragment(new AddWSDLToWSILWrapperCommand(), ""));
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- this.dataMappingRegistry = dataRegistry;
-
- // ImportWSILWidget
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ImportWSILWidget.class);
-
- // AddWSDLToWSILWrapperCommand
- dataRegistry.addMapping(ImportWSILWidget.class, "GenWSILArguments", AddWSDLToWSILWrapperCommand.class, "Args", null);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- this.widgetRegistry = widgetRegistry;
-
- widgetRegistry.add("ImportWSILWidget",
- msgUtils.getMessage("TITLE_WSIL_IMPORT"),
- msgUtils.getMessage("DESC_WSIL_IMPORT"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ImportWSILWidget();
- }
- }
- );
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
deleted file mode 100644
index eeaf629..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/binding/ImportWSWidgetBinding.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ImportWSWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ImportWSWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment("WSImport"));
- root.add(publishToPrivateUDDICmdFrag);
- root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- this.dataMappingRegistry = dataRegistry;
- publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-
- // PublishToPrivateUDDICommandFragment
- dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- this.widgetRegistry = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("WSImport",
- msgUtils.getMessage("PAGE_TITLE_WS_FIND"),
- msgUtils.getMessage("PAGE_DESC_WS_FIND"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(false);
- }
- }
- );
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
deleted file mode 100644
index d177d8d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,403 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ClientExtensionDefaultingCommand extends SimpleCommand
-{
- // ClientWizardWidget
- private TypeRuntimeServer clientIds_;
- private Boolean testService;
- private ResourceContext resourceContext;
-
- // ClientRuntimeSelectionWidget
- private SelectionListChoices clientChoices_;
- private String clientProjectName_;
- private String clientEarProjectName_;
- private String clientComponentName_;
- private String clientEarComponentName_;
- private String clientComponentType_;
- private String j2eeVersion;
- private boolean clientNeedEAR_;
-
- private String serviceServerFactoryId_;
- private String serviceServerInstanceId_;
-
- // WSDLSelectionWidget
- private boolean genWSIL;
- private String wsilURI;
-
- // WSDLSelectionConditionCommand
- private WebServicesParser webServicesParser;
-
- // WSDLSelectionTreeWidget
- private String wsdlURI;
-
- private boolean isClientScenario_;
- private boolean genProxy_ = true;
- private String launchedServiceTestName;
-
- //ServerDeployableConfigurationCommand
- private String serverInstId_;
-
- public ClientExtensionDefaultingCommand( boolean isClientScenario )
- {
- isClientScenario_ = isClientScenario;
- }
-
- /**
- *
- * @return returns true if this command is running in the client wizard and
- * false if this command is running in the create web service wizard.
- */
- public boolean getIsClientScenario()
- {
- return isClientScenario_;
- }
-
-
- public void setRuntime2ClientTypes( SelectionListChoices choices )
- {
- clientChoices_ = choices;
- }
-
- public SelectionListChoices getRuntime2ClientTypes()
- {
- return clientChoices_;
- }
-
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
- {
- clientIds_ = ids;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- if (clientIds_.getServerInstanceId()==null || clientIds_.getServerInstanceId().length()==0)
- {
- //Set the instance id from the service side if the factory ids match
- if (serviceServerInstanceId_!=null && serviceServerInstanceId_.length()>0)
- {
- if (serviceServerFactoryId_!=null && serviceServerFactoryId_.length()>0)
- {
- if (serviceServerFactoryId_.equals(clientIds_.getServerId()))
- {
- clientIds_.setServerInstanceId(serviceServerInstanceId_);
- }
- }
- }
- }
- return clientIds_;
- }
-
- public void setServiceExistingServerInstId(String serverInstId) {
- this.serverInstId_ = serverInstId;
- }
-
- public String getServiceExistingServerInstId(){
- return this.serverInstId_;
- }
-
- /**
- * @return Returns the clientIsExistingServer.
- */
- public boolean isClientIsExistingServer()
- {
- return clientIds_.getServerInstanceId() != null;
- }
-
- /**
- * @return Returns the clientProject.
- */
- public String getClientProject()
- {
- return clientProjectName_ + "/" + clientComponentName_;
- }
-
- /**
- * @return Returns the clientProjectEAR.
- */
- public String getClientProjectEAR()
- {
- if (clientEarProjectName_!=null && clientEarProjectName_.length()>0
- && clientEarComponentName_!=null && clientEarComponentName_.length()>0)
- {
- return clientEarProjectName_ + "/" + clientEarComponentName_;
- }
- else
- {
- return "";
- }
- }
-
- /*
- private String getModuleProjectName( String projectName )
- {
- String result = "";
-
- if( projectName != null && !projectName.equals("") )
- {
- IPath projectPath = new Path( projectName );
- IProject project = (IProject)ResourceUtils.findResource( projectPath );
- String moduleName = J2EEUtils.getFirstWebModuleName( project );
-
- result = projectName + "/" + moduleName;
- }
-
- return result;
- }
- */
- /**
- * @return Returns the clientProjectType.
- */
-
- public String getClientProjectType()
- {
- //return clientChoices_.getChoice().getList().getSelection();
- return clientComponentType_;
- }
-
- /**
- * @return Returns the clientRuntime.
- */
- public String getClientRuntime()
- {
- return clientIds_.getRuntimeId();
- }
-
- /**
- * @return Returns the clientServer.
- */
- public String getClientServer()
- {
- return clientIds_.getServerId();
- }
-
- public String getClientServerInstance()
- {
- return clientIds_.getServerInstanceId();
- }
-
- public void setClientExistingServerInstanceId(String serverInstId){
-
- if (clientIds_.getServerInstanceId()==null)
- clientIds_.setServerInstanceId(serverInstId);
- }
-
- /**
- * @return Returns the genWSIL.
- */
- public boolean isGenWSIL()
- {
- return genWSIL;
- }
-
- /**
- * @param genWSIL
- * The genWSIL to set.
- */
- public void setGenWSIL(boolean genWSIL)
- {
- this.genWSIL = genWSIL;
- }
-
- /**
- * @return Returns the resourceContext.
- */
- public ResourceContext getResourceContext()
- {
- return resourceContext;
- }
-
- /**
- * @param resourceContext
- * The resourceContext to set.
- */
- public void setResourceContext(ResourceContext resourceContext)
- {
- this.resourceContext = resourceContext;
- }
-
- /**
- * @return Returns the testProxySelected.
- */
- public Boolean getTestService()
- {
- return testService;
- }
-
- /**
- * @param testProxySelected
- * The testProxySelected to set.
- */
- public void setTestService(Boolean testService)
- {
- this.testService = testService;
- }
-
- /**
- * @return Returns the wsdlURI.
- */
- public String getWsdlURI()
- {
- return wsdlURI;
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- /**
- * @return Returns the wsilURI.
- */
- public String getWsilURI()
- {
- return wsilURI;
- }
-
- /**
- * @param wsilURI
- * The wsilURI to set.
- */
- public void setWsilURI(String wsilURI)
- {
- this.wsilURI = wsilURI;
- }
-
- /**
- * @return Returns the webServicesParser.
- */
- public WebServicesParser getWebServicesParser()
- {
- if (webServicesParser != null)
- return webServicesParser;
- else
- return new WebServicesParserExt();
- }
-
- /**
- * @param webServicesParser
- * The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- /**
- * @return Returns the j2eeVersion.
- */
- public String getClientJ2EEVersion()
- {
- return j2eeVersion;
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- public void setClientJ2EEVersion(String version)
- {
- j2eeVersion = version;
- }
-
- /**
- *
- * @return returns true if a proxy should be generated and false otherwise.
- */
- public boolean getGenerateProxy()
- {
- return genProxy_;
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- /**
- *
- * @return returns the name of the test facility to launch.
- */
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
-
- /**
- *
- * @return returns true if the client project needs an EAR project.
- */
- public boolean getClientNeedEAR()
- {
- return clientNeedEAR_;
- }
-
- public void setClientNeedEAR(boolean clientNeedEAR)
- {
- clientNeedEAR_ = clientNeedEAR;
- }
-
-
- public void setClientComponentType(String clientComponentType)
- {
- this.clientComponentType_ = clientComponentType;
- }
-
- public void setClientProjectName(String clientProjectName)
- {
- this.clientProjectName_ = clientProjectName;
- }
-
- public void setClientComponentName(String clientComponentName)
- {
- this.clientComponentName_ = clientComponentName;
- }
-
- public void setClientEarProjectName(String clientEarProjectName)
- {
- this.clientEarProjectName_ = clientEarProjectName;
- }
-
- public void setClientEarComponentName(String clientEarComponentName)
- {
- this.clientEarComponentName_ = clientEarComponentName;
- }
-
- public void setServiceServerFactoryId(String id)
- {
- serviceServerFactoryId_ = id;
- }
-
- public void setServiceServerInstanceId(String id)
- {
- serviceServerInstanceId_ = id;
- }
-
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
deleted file mode 100644
index c119562..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionFragment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ClientExtensionFragment extends ExtensionFragment
-{
- public ClientExtensionFragment()
- {
- setExtensionRegistry( WebServiceClientTypeRegistry.getInstance() );
- }
-
- protected ClientExtensionFragment( ClientExtensionFragment fragment )
- {
- super( fragment );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ClientExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
deleted file mode 100644
index fef5a9f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ClientExtensionOutputCommand.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AbstractStartServer;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-
-public class ClientExtensionOutputCommand extends SimpleCommand
-{
- private String proxyBean_;
- private boolean genProxy_;
- private String setEndpointMethod;
- private IWebServiceClient webServiceClient_;
-
- private String existingServerId_;
- private String earProjectName_;
- private IServer fExistingServer = null;
-
- public boolean isUndoable(){
- return true;
- }
-
- public Status undo(Environment env){
- Status stat = new SimpleStatus("");
-
- try {
-
- // check existingServer
- if (fExistingServer!=null) {
-
- // get EAR project
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = null;
- if (earProjectName_!=null && earProjectName_.length()>0) {
- earProject = root.getProject(earProjectName_);
- }
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
- if (earProject!=null) {
- startServerCommand.runPreServerConfig(fExistingServer, earProject);
- }
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(stat);
- return stat;
- }
-
- return stat;
- }
-
- public Status execute(Environment env){
-
- Status status = new SimpleStatus("");
-
- IServer[] servers = ServerCore.getServers();
- IServer existingServer = null;
- fExistingServer = null;
- for (int i=0; i<servers.length; i++)
- {
- IServer thisServer = (IServer)servers[i];
- IServerWorkingCopy wc = null;
- String thisServerId = null;
- if (thisServer!=null) {
- wc = thisServer.createWorkingCopy();
- thisServerId = (wc!=null ? wc.getId() : null);
- }
-
- if (thisServerId.equals(existingServerId_))
- existingServer = thisServer;
- }
- try {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = null;
- if (earProjectName_!=null && earProjectName_.length()>0)
- {
- earProject = root.getProject(earProjectName_);
- }
-
- if (existingServer!=null){
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
- if (earProject!=null){
- startServerCommand.runPostServerConfig(existingServer, earProject);
- fExistingServer = existingServer;
- }
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- /**
- * @return Returns the proxyBean.
- */
-
- public String getProxyBean()
- {
- return webServiceClient_.getWebServiceClientInfo().getImplURL();
- }
- /**
- * @param proxyBean The proxyBean to set.
- */
- /*
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean_ = proxyBean;
- }
- */
-
- public boolean getGenerateProxy()
- {
- //return genProxy_;
- return true;
- }
-
- /*
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
- */
-
- /**
- * @return Returns the setEndpointMethod.
- */
- public String getSetEndpointMethod()
- {
- //return setEndpointMethod;
- return "setEndpoint";
- }
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- /*
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
- */
- /**
- * @param earProjectName The earProjectName to set.
- */
- public void setEarProjectName(String earProjectName) {
- this.earProjectName_ = earProjectName;
- }
- /**
- * @param existingServerId The existingServerId to set.
- */
- public void setExistingServerId(String existingServerId) {
- this.existingServerId_ = existingServerId;
- }
-
- public void setWebServiceClient(IWebServiceClient wsc)
- {
- webServiceClient_ = wsc;
- }
-
- public String getServerInstanceId()
- {
- return webServiceClient_.getWebServiceClientInfo().getServerInstanceId();
- }
-
- public String getServerFactoryId()
- {
- return webServiceClient_.getWebServiceClientInfo().getServerFactoryId();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
deleted file mode 100644
index 8ddff55..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionDefaultingCommand.java
+++ /dev/null
@@ -1,304 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-
-public class ServerExtensionDefaultingCommand extends SimpleCommand
-{
- private Boolean startService;
- private Boolean testService;
- private Boolean publishService;
- private TypeRuntimeServer serviceIds_;
- //private SelectionListChoices serviceChoices_;
- private String serviceProjectName_;
- private String serviceEarProjectName_;
- private String serviceComponentName_;
- private String serviceEarComponentName_;
- private String j2eeVersion;
- private boolean serviceNeedEAR_;
- private WebServicesParser wsdlParser_;
-
-
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
- {
- serviceIds_ = ids;
- }
-
- public void setServiceExistingServerInstanceId(String serverInstId){
-
- if (serviceIds_.getServerInstanceId()==null)
- serviceIds_.setServerInstanceId(serverInstId);
- }
-
- /**
- *
- * @return returns the TypeRuntimeService object that the user has selected on
- * page 3 of the wizard.
- */
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return serviceIds_;
- }
-
- /*
- public void setServiceProject2EARProject(SelectionListChoices choices)
- {
- serviceChoices_ = choices;
- }
- */
-
- /**
- * @return Returns the publishService.
- */
- public Boolean getPublishService()
- {
- return publishService;
- }
-
- /**
- * @param publishService
- * The publishService to set.
- */
- public void setPublishService(Boolean publishService)
- {
- this.publishService = publishService;
- }
-
- /**
- * @return Returns the serverIsExistingServer.
- */
- public boolean getServerIsExistingServer()
- {
- return serviceIds_.getServerInstanceId() != null;
- }
-
- /**
-
- * @return Returns the serverInstanceId
- */
- public String getServiceServerInstanceId()
- {
- return serviceIds_.getServerInstanceId();
- }
-
- /**
- * @return Returns the serverProject.
- */
- public String getServerProject()
- {
- return serviceProjectName_ + "/" + serviceComponentName_;
- }
-
- private String getModuleProjectName( String projectName )
- {
-
- String result = "";
-
- if( projectName != null && !projectName.equals("") )
- {
- IPath projectPath = new Path( projectName );
- IProject project = (IProject)ResourceUtils.findResource( projectPath );
- String moduleName = J2EEUtils.getFirstWebModuleName( project );
-
- result = projectName + "/" + moduleName;
- }
-
- return result;
- }
-
- /**
- * @return Returns the serverProjectEAR.
- */
- public String getServerProjectEAR()
- {
- if (serviceEarProjectName_!=null && serviceEarProjectName_.length()>0 &&
- serviceEarComponentName_!=null && serviceEarComponentName_.length()>0)
- {
- return serviceEarProjectName_ + "/" + serviceEarComponentName_;
- }
- else
- {
- return "";
- }
- }
-
- /**
- * @return Returns the serverRuntime.
- */
- public String getServerRuntime()
- {
- return serviceIds_.getRuntimeId();
- }
-
- /**
- * @return Returns the serverServer.
- */
- public String getServerServer()
- {
- return serviceIds_.getServerId();
- }
-
- /**
- * @return Returns the serviceScenarioId.
- */
- public String getServiceScenarioId()
- {
- return serviceIds_.getTypeId();
- }
-
- /**
- * @return Returns the startService.
- */
- public Boolean getStartService()
- {
- return startService;
- }
-
- /**
- * @param startService
- * The startService to set.
- */
- public void setStartService(Boolean startService)
- {
- this.startService = startService;
- }
-
- /**
- * @return Returns the testService.
- */
- public Boolean getTestService()
- {
- return testService;
- }
-
- /**
- * @param testService
- * The testService to set.
- */
- public void setTestService(Boolean testService)
- {
- this.testService = testService;
- }
-
- public Boolean getPublish()
- {
- return new Boolean(true);
- }
-
- /**
- * @return Returns the j2eeVersion.
- */
- public String getServiceJ2EEVersion()
- {
- return j2eeVersion;
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- public void setServiceJ2EEVersion(String version)
- {
- j2eeVersion = version;
- }
-
- /**
- *
- * @return returns true if the web service project needs to be in an EAR project.
- */
- public boolean getServiceNeedEAR()
- {
- return serviceNeedEAR_;
- }
-
- public void setServiceNeedEAR(boolean serviceNeedEAR)
- {
- serviceNeedEAR_ = serviceNeedEAR;
- }
-
- /**
- *
- * @return returns true if the web service project is an EJB project.
- */
- public boolean getIsServiceProjectEJB()
- {
- //If the type/server/runtime suggests that an EJB project
- //is required, return true.
- boolean ejbRequired = false;
- boolean ejbRequired2 = false;
- // rskreg
- //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- if (serviceIds_ != null)
- {
- //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceIds_.getServerId()).getId();
- //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceIds_.getServerId()).getId();
- //ejbRequired = wssrtRegistry.requiresEJBModuleFor(serverTypeId, serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
- ejbRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceIds_.getServerId(), serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
- //ejbRequired2 = wssrtRegistry.requiresEJBProject(serviceIds_.getTypeId());
- ejbRequired2 = WebServiceRuntimeExtensionUtils.requiresEJBProject(serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
- }
-
- // rskreg
- return (ejbRequired || ejbRequired2);
- }
-
- /**
- * @return Returns the wsdlParser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- if( wsdlParser_ == null )
- {
- wsdlParser_ = new WebServicesParserExt();
- }
-
- return wsdlParser_;
- }
- /**
- * @param wsdlParser_ The wsdlParser_ to set.
- */
- public void setWebServicesParser(WebServicesParser wsdlParser )
- {
- wsdlParser_ = wsdlParser;
- }
-
-
- public void setServiceProjectName(String serviceProjectName)
- {
- this.serviceProjectName_ = serviceProjectName;
- }
-
- public void setServiceComponentName(String s)
- {
- serviceComponentName_ = s;
- }
-
- public void setServiceEarProjectName(String serviceEarProjectName)
- {
- this.serviceEarProjectName_ = serviceEarProjectName;
- }
-
- public void setServiceEarComponentName(String s)
- {
- serviceEarComponentName_ = s;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
deleted file mode 100644
index 6f1829e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionFragment.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeTypeRegistry;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.ExtensionFragment;
-
-
-public class ServerExtensionFragment extends ExtensionFragment
-{
- public ServerExtensionFragment()
- {
- setExtensionRegistry( WebServiceServerRuntimeTypeRegistry.getInstance() );
- }
-
- protected ServerExtensionFragment( ServerExtensionFragment fragment )
- {
- super( fragment );
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- setExtensionIds( new String[]{ ids.getTypeId(), ids.getRuntimeId(), ids.getServerId() } );
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#clone()
- */
- public Object clone()
- {
- return new ServerExtensionFragment( this );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
deleted file mode 100644
index 53e0186..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/extensions/ServerExtensionOutputCommand.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class ServerExtensionOutputCommand extends SimpleCommand
-{
- //private String wsdlURI_;
- private WebServicesParser wsdlParser_;
- private IWebService webService_;
-
- private String existingServerId_;
- private String earProjectName_;
- private boolean isWebProjectStartupRequested_ = false;
-
- private IServer fExistingServer = null;
-
- public boolean isUndoable(){
- return true;
- }
-
- public Status undo(Environment env){
-
-
- Status stat = new SimpleStatus("");
-
- //Commenting out all extranseous sever startups
- /*
- try {
-
- // check existingServer
- if (fExistingServer!=null) {
-
- // get EAR project
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = null;
- if (earProjectName_!=null && earProjectName_.length()>0) {
- earProject = root.getProject(earProjectName_);
- }
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
- if (earProject!=null) {
- startServerCommand.runPreServerConfig(fExistingServer, earProject);
- }
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(stat);
- return stat;
- }
- */
- return stat;
- }
-
- public Status execute(Environment env){
-
- Status status = new SimpleStatus("");
- // Commenting out all extraneous server startups
- /*
- IServer[] servers = ServerCore.getServers();
- IServer existingServer =null;
- fExistingServer = null;
- for (int i=0; i<servers.length; i++)
- {
- IServer thisServer = (IServer)servers[i];
- IServerWorkingCopy wc = null;
- String thisServerId = null;
- if (thisServer!=null) {
- wc = thisServer.createWorkingCopy();
- thisServerId = (wc!=null ? wc.getId() : null);
- }
-
- if (thisServerId.equals(existingServerId_))
- existingServer = thisServer;
- }
- try {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = null;
- if (earProjectName_!=null && earProjectName_.length()>0)
- {
- earProject = root.getProject(earProjectName_);
- }
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
- if (earProject!=null) {
- startServerCommand.runPostServerConfig(existingServer, earProject);
- fExistingServer = existingServer;
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(status);
- return status;
- }
- */
- return status;
- }
-
-
- /**
- * @return Returns the wsdlURI.
- */
- public String getWsdlURI()
- {
- return webService_.getWebServiceInfo().getWsdlURL();
- }
-
- /**
- * @param wsdlURI
- * The wsdlURI to set.
- */
- /*
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
- */
-
- public void setWebService(IWebService ws)
- {
- webService_ = ws;
- }
-
- /**
- * @return Returns the wsdlParser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- if( wsdlParser_ == null )
- {
- wsdlParser_ = new WebServicesParserExt();
- }
-
- return wsdlParser_;
- }
- /**
- * @param wsdlParser_ The wsdlParser_ to set.
- */
- public void setWebServicesParser(WebServicesParser wsdlParser_)
- {
- this.wsdlParser_ = wsdlParser_;
- }
-/**
- * @param earProjectName The earProjectName to set.
- */
-public void setEarProjectName(String earProjectName) {
- this.earProjectName_ = earProjectName;
-}
-/**
- * @param existingServerId The existingServerId to set.
- */
-public void setExistingServerId(String existingServerId) {
- this.existingServerId_ = existingServerId;
-}
-
-/**
- * @return Returns the isRestartProjectNeeded.
- */
-public boolean getIsWebProjectStartupRequested() {
- return isWebProjectStartupRequested_;
-}
-/**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
-public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
- this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
-}
-
-public String getServiceServerFactoryId()
-{
- return webService_.getWebServiceInfo().getServerFactoryId();
-}
-
-public String getServiceServerInstanceId()
-{
- return webService_.getWebServiceInfo().getServerInstanceId();
-}
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
deleted file mode 100644
index 7a8b886..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/AbstractObjectSelectionWidget.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public abstract class AbstractObjectSelectionWidget extends SimpleWidgetDataContributor implements IObjectSelectionWidget
-{
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- // subclass should override this method
- }
-
- public IStructuredSelection getObjectSelection()
- {
- // subclass should override this method
- return new StructuredSelection();
- }
-
- public Status validateSelection(IStructuredSelection objectSelection)
- {
- // subclass should override this method
- return new SimpleStatus("");
- }
-
- public IProject getProject()
- {
- // subclass should override this method
- return null;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
deleted file mode 100644
index 61f6e3a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionTransformer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class EJBSelectionTransformer implements Transformer
-{
-
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof EnterpriseBean)
- {
- return new StructuredSelection(((EnterpriseBean)sel).getName());
- }
- }
- return value;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
deleted file mode 100644
index 922cf67..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBSelectionWidget.java
+++ /dev/null
@@ -1,394 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class EJBSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private Combo earList;
- private EJBTableViewer beanList;
- private IVirtualComponent[] earComponents;
- //rskejb private EARNatureRuntime[] earProjects;
- private Integer selectedBeanIndex = null;
- private Vector ejbBeanNames;
- private Vector ejbComponentNames;
- private Vector ejbComponentProjectNames;
- //rskejb private Vector ejbProjectNames;
- private Listener statusListener_;
- /* CONTEXT_ID PEBD0001 for the EAR Projects drop-down box */
- private String INFOPOP_PEBD_EAR_PROJECTS = "org.eclipse.jst.ws.consumption.ui.PEBD0001";
- /* CONTEXT_ID PEBD0002 for the table containing all of the bean names */
- private String INFOPOP_PEBD_TABLE_BEAN_NAMES = "org.eclipse.jst.ws.consumption.ui.PEBD0002";
-
- public EJBSelectionWidget()
- {
- earComponents = J2EEUtils.getAllEARComponents();
- /* rskejb
- IProject[] projects = J2EEUtils.getEARProjects();
-
-
- Vector earVector = new Vector();
- for (int i = 0; i < projects.length; i++)
- {
- try
- {
- earVector.add(projects[i].getNature(IEARNatureConstants.NATURE_ID));
- }
- catch (CoreException ce)
- {
- }
- }
- earProjects = (EARNatureRuntime[]) earVector.toArray(new EARNatureRuntime[0]);
- rskejb */
- }
-
- public String getSelectedBean()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbBeanNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public String getSelectedProject()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbComponentProjectNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- statusListener_ = statusListener;
- Composite composite = new Composite(parent, SWT.NONE);
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayout(layout);
- composite.setLayoutData(gd);
- Composite projectComposite = new Composite(composite, SWT.NONE);
- layout = new GridLayout();
- layout.numColumns = 2;
- projectComposite.setLayout(layout);
- projectComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- new Label(projectComposite, SWT.NULL).setText(msgUtils.getMessage("LABEL_EAR_PROJECTS"));
- earList = new Combo(projectComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- earList.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- earList.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- Combo widget = (Combo) (evt.widget);
- setBeanList(earComponents[widget.getSelectionIndex()]);
- selectedBeanIndex = null;
- statusListener_.handleEvent(null);
- }
- });
- addEARNamesToList();
- earList.setToolTipText(msgUtils.getMessage("TOOLTIP_EAR_PROJECTS"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(earList, INFOPOP_PEBD_EAR_PROJECTS);
- Group beanComposite = new Group(composite, SWT.NONE);
- layout = new GridLayout();
- beanComposite.setLayout(layout);
- beanComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- beanComposite.setText(msgUtils.getMessage("LABEL_EJB_BEAN_NAME"));
- beanList = new EJBTableViewer(beanComposite);
- Table beanTable = beanList.getTable();
- gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.heightHint = 100;
- beanTable.setLayoutData(gd);
- beanTable.addSelectionListener(new SelectionAdapter()
- {
- public void widgetSelected(SelectionEvent evt)
- {
- Table table = (Table) (evt.widget);
- selectedBeanIndex = new Integer(table.getSelectionIndex());
- statusListener_.handleEvent(null);
- }
- });
- beanTable.setToolTipText(msgUtils.getMessage("TOOLTIP_TABLE_BEAN_NAMES"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(beanTable, INFOPOP_PEBD_TABLE_BEAN_NAMES);
- if (earComponents != null && earComponents.length > 0)
- {
- setBeanList(earComponents[0]);
- }
- beanTable.getColumn(0).pack();
- beanTable.getColumn(1).pack();
- // This is a dummy label that forces the status label into the second
- // column.
- new Label(composite, SWT.NULL).setText("");
- return this;
- }
-
- private void addEARNamesToList()
- {
- if (earComponents != null && earComponents.length > 0)
- {
- for (int index = 0; index < earComponents.length; index++)
- {
- earList.add(earComponents[index].getName());
- }
- earList.setText(earList.getItem(0));
- }
- }
-
- private void setBeanList(IVirtualComponent earComponent)
- {
- IVirtualComponent[] ejbComponentsArray = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponent.getProject(), earComponent.getName());
- Table beanTable = beanList.getTable();
- beanTable.removeAll();
- ejbBeanNames = new Vector();
- ejbComponentNames = new Vector();
- ejbComponentProjectNames = new Vector();
- for (int index = 0; index < ejbComponentsArray.length; index++)
- {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponentsArray[index]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- EJBJar jar = ejbRes.getEJBJar();
- Vector beans = J2EEUtils.getBeanNames(jar);
- String componentName = ejbComponentsArray[index].getName();
- String projectName = ejbComponentsArray[index].getProject().getName();
- ejbBeanNames.addAll(beans);
- ejbComponentNames.addAll(Collections.nCopies(beans.size(), componentName));
- ejbComponentProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- beanList.setData(ejbBeanNames, ejbComponentNames);
- beanList.setInput(ejbBeanNames);
-
- }
-
- /*
- * @deprecated
- */
- /*
- private void setBeanList(EARNatureRuntime earProject)
- {
- Vector ejbProjects = J2EEUtils.getEJBProjects(earProject);
- Table beanTable = beanList.getTable();
- beanTable.removeAll();
- ejbBeanNames = new Vector();
- //rskejb ejbProjectNames = new Vector();
- ejbComponentNames = new Vector();
- ejbComponents = new Vector();
- for (int index = 0; index < ejbProjects.size(); index++)
- {
- EJBNatureRuntime ejbNature = (EJBNatureRuntime) (ejbProjects.elementAt(index));
- EJBProjectResources ejbResource = new EJBProjectResources(ejbNature.getProject());
- EJBJar jar = ejbResource.getEJBJar();
- Vector beans = J2EEUtils.getBeanNames(jar);
- String projectName = ejbNature.getProject().getName();
- ejbBeanNames.addAll(beans);
- ejbProjectNames.addAll(Collections.nCopies(beans.size(), projectName));
- ejbResource.cleanup();
- }
- beanList.setData(ejbBeanNames, ejbProjectNames);
- beanList.setInput(ejbBeanNames);
- }
- */
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof Session)
- {
- Session session = (Session) object;
- EJBJar jar = session.getEjbJar();
- if (jar != null)
- {
- for (int i = 0; i < earComponents.length; i++)
- {
- IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(earComponents[i].getProject(), earComponents[i].getName());
- for (int j=0; j <ejbComponents.length; j++)
- {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[j]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- if (ejbRes.getEJBJar() == jar)
- {
- earList.setText(earComponents[i].getName());
- setBeanList(earComponents[i]);
- beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
- selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
- return;
- }
-
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
-
- }
- /* rskejb
- Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[i]);
- for (Iterator it = ejbProjects.iterator(); it.hasNext();)
- {
- EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
- if (ejbResource.getEJBJar() == jar)
- {
- earList.setText(earProjects[i].getProject().getName());
- setBeanList(earProjects[i]);
- beanList.setSelection(new StructuredSelection(new Integer[]{new Integer(ejbBeanNames.indexOf(session.getName()))}));
- selectedBeanIndex = new Integer(ejbBeanNames.indexOf(session.getName()));
- ejbResource.cleanup();
- return;
- }
- ejbResource.cleanup();
- }
- rskejb */
- }
- }
- }
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- IStructuredSelection sel = (IStructuredSelection) beanList.getSelection();
- if (sel != null && !sel.isEmpty())
- {
- Object object = sel.getFirstElement();
- if (object instanceof Integer)
- {
- String selEJBName = (String) ejbBeanNames.get(((Integer) object).intValue());
- if (selEJBName != null)
- {
- IProject project = earComponents[earList.getSelectionIndex()].getProject();
- String name = earComponents[earList.getSelectionIndex()].getName();
- IVirtualComponent[] ejbComponents = J2EEUtils.getReferencingEJBComponentsFromEAR(project, name);
- for (int i=0; i<ejbComponents.length; i++)
- {
- EJBArtifactEdit ejbEdit = null;
- try
- {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbComponents[i]);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- EJBJar jar = ejbRes.getEJBJar();
- java.util.List sessions = jar.getSessionBeans();
- for (Iterator it2 = sessions.iterator(); it2.hasNext();)
- {
- Session session = (Session) it2.next();
- if (selEJBName.equals(session.getName()))
- {
- return new StructuredSelection(new Session[]{session});
- }
- }
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- /* rskejb
- Vector ejbProjects = J2EEUtils.getEJBProjects(earProjects[earList.getSelectionIndex()]);
- for (Iterator it = ejbProjects.iterator(); it.hasNext();)
- {
- EJBProjectResources ejbResource = new EJBProjectResources(((EJBNatureRuntime) it.next()).getProject());
- EJBJar jar = ejbResource.getEJBJar();
- java.util.List sessions = jar.getSessionBeans();
- for (Iterator it2 = sessions.iterator(); it2.hasNext();)
- {
- Session session = (Session) it2.next();
- if (selEJBName.equals(session.getName()))
- {
- ejbResource.cleanup();
- return new StructuredSelection(new Session[]{session});
- }
- }
- ejbResource.cleanup();
- }
- rskejb */
- }
- }
- }
- return new StructuredSelection(new Object[0]);
- }
-
- public IProject getProject()
- {
- String projectName = getSelectedProject();
- if (projectName != null && projectName.length() > 0)
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- else
- return null;
- }
-
- public String getComponentName()
- {
- if (selectedBeanIndex != null)
- {
- return (String) (ejbComponentNames.elementAt(selectedBeanIndex.intValue()));
- }
- return null;
- }
-
- public Status validateSelection(IStructuredSelection objectSelection)
- {
- return new SimpleStatus("");
- }
-
- public Status getStatus()
- {
- if (selectedBeanIndex == null)
- {
- return new SimpleStatus("","",Status.ERROR);
- }
-
- return new SimpleStatus("");
- }
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
deleted file mode 100644
index 98afd64..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/EJBTableViewer.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Vector;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-public class EJBTableViewer extends TableViewer
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private Vector beanNames;
- private Vector projectNames;
-
- public EJBTableViewer(Composite parent)
- {
- super(parent, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL | SWT.FULL_SELECTION);
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- String columnProperties[] = {msgUtils.getMessage("TABLE_TITLE_EJB_BEAN_NAMES"), msgUtils.getMessage("TABLE_TITLE_EJB_PROJECT_NAME")};
- Table table = getTable();
- table.setHeaderVisible(true);
- table.setLinesVisible(true);
- TableLayout layout = new TableLayout();
- for (int i = 0; i < columnProperties.length; i++)
- {
- TableColumn column = new TableColumn(table, i);
- column.setText(columnProperties[i]);
- column.setAlignment(SWT.LEFT);
- layout.addColumnData(new ColumnWeightData(50, 80, true));
- }
- table.setLayout(layout);
- setColumnProperties(columnProperties);
- setContentProvider(new EJBContentProvider());
- setLabelProvider(new EJBLabelProvider());
- }
-
- public void setData(Vector beanNames, Vector projectNames)
- {
- this.beanNames = beanNames;
- this.projectNames = projectNames;
- }
- private class EJBLabelProvider extends LabelProvider implements ITableLabelProvider
- {
- public String getColumnText(Object object, int columnIndex)
- {
- String result = null;
- if (object instanceof Integer)
- {
- int index = ((Integer) object).intValue();
- if (columnIndex == 0)
- {
- return (String) (beanNames.elementAt(index));
- }
- else if (columnIndex == 1)
- {
- return (String) (projectNames.elementAt(index));
- }
- }
- return result;
- }
-
- public Image getColumnImage(Object object, int columnIndex)
- {
- return null;
- }
- }
- public class EJBContentProvider implements IStructuredContentProvider
- {
- public Object[] getElements(Object element)
- {
- if (beanNames != null)
- {
- int size = beanNames.size();
- Object[] result = new Object[size];
- for (int index = 0; index < size; index++)
- {
- result[index] = new Integer(index);
- }
- return result;
- }
- return null;
- }
-
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object old, Object newobj)
- {
- }
-
- public boolean isDeleted(Object object)
- {
- return false;
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
deleted file mode 100644
index a7be6f4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/HandlerTableItem.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-
-
-
-public class HandlerTableItem {
-
- private String handlerClassName;
- private String handlerName;
- private String portName;
- private int index;
-
- private PortComponent port;
- private Object handler;
- private Object wsDescRef;
-
- /**
- * @return Returns the handlerClassName.
- */
- public String getHandlerClassName() {
- return handlerClassName;
- }
- /**
- * @param handlerClassName The handlerClassName to set.
- */
- public void setHandlerClassName(String handlerClassName) {
- this.handlerClassName = handlerClassName;
- }
- /**
- * @return Returns the handlerName.
- */
- public String getHandlerName() {
- return handlerName;
- }
- /**
- * @param handlerName The handlerName to set.
- */
- public void setHandlerName(String handlerName) {
- this.handlerName = handlerName;
- }
- /**
- * @return Returns the port.
- */
- public PortComponent getPort() {
- return port;
- }
- /**
- * @param port The port to set.
- */
- public void setPort(PortComponent port) {
- this.port = port;
- }
- /**
- * @return Returns the handler.
- */
- public Object getHandler() {
- return handler;
- }
- /**
- * @param handler The handler to set.
- */
- public void setHandler(Object handler) {
- this.handler = handler;
- }
- /**
- * @return Returns the portName.
- */
- public String getPortName() {
- return portName;
- }
- /**
- * @param portName The portName to set.
- */
- public void setPortName(String portName) {
- this.portName = portName;
- }
-
- /**
- * @return Returns the index.
- */
- public int getIndex() {
- return index;
- }
- /**
- * @param index The index to set.
- */
- public void setIndex(int index) {
- this.index = index;
- }
- /**
- * @return Returns the wsDescRef.
- */
- public Object getWsDescRef() {
- return wsDescRef;
- }
- /**
- * @param wsDescRef The wsDescRef to set.
- */
- public void setWsDescRef(Object wsDescRef) {
- this.wsDescRef = wsDescRef;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
deleted file mode 100644
index 3bafa00..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/IObjectSelectionWidget.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataContributor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * This interface defines extra methods that Object Selection Widgets
- * need to implement. Object Selection Widgets are displayed on page 2
- * of the Web services wizard.
- */
-public interface IObjectSelectionWidget extends WidgetDataContributor
-{
- /**
- * The framework will call this method to set the initial selection
- * value that the user has specified.
- *
- * @param initialSelection the initial selection the user specified.
- */
- public void setInitialSelection(IStructuredSelection initialSelection);
-
- /**
- * The intent of the Object Selection Widget is that the user has
- * the opportunity change/find the object that they want to turn into
- * a Web service.
- *
- * @return returns the an IStructuredSelection object that the user
- * want to turn into a Web service. This object may be different than
- * the initialSelection passed in by the setInitialSelection method.
- */
- public IStructuredSelection getObjectSelection();
-
- /**
- * Validates whether the objectSelection parameter is valid for
- * this Object selection widget. An error status should be returned
- * if this object is not value. Otherwise, and ok status should be
- * returned
- *
- * @param objectSelection the object to be validated.
- * @return the status of the validation.
- */
- public Status validateSelection(IStructuredSelection objectSelection);
-
- /**
- *
- * @return returns the IProject that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IProject for this object.
- */
- public IProject getProject();
-
- /**
- *
- * @return returns the name of the IVirtualComponent that contains the selection
- * object that the user has chosen with this widget. The value can be
- * null if there is no IVirtualComponent for this object
- */
- public String getComponentName();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
deleted file mode 100644
index eef2d28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionTransformer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-public class JavaBeanSelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof IFile)
- {
- return new StructuredSelection(computeFullyQualifiedJavaName((IFile)sel));
- }
- else if (sel instanceof ICompilationUnit)
- {
- IResource res = ((ICompilationUnit)sel).getResource();
- if (res instanceof IFile)
- return new StructuredSelection(computeFullyQualifiedJavaName((IFile)res));
- }
- }
- return value;
- }
-
- private String computeFullyQualifiedJavaName(IFile resource)
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
- String beanClass = "";
- if (basename != null && basename.length() > 0)
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
- if (beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class"))
- beanClass = beanClass.substring(0, beanClass.lastIndexOf('.'));
- }
- return beanClass;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
deleted file mode 100644
index 41d9522..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/JavaBeanSelectionWidget.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.dialogs.ProgressMonitorDialog;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.common.componentcore.util.ComponentUtilities;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.PortComponentImpl;
-import org.eclipse.jst.j2ee.webservice.internal.wsdd.impl.ServiceImplBeanImpl;
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.JavaResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JavaBeanSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private IProject serverProject_ = null;
- private String serverComponentName_ = null;
- private Composite parent_ = null;
- private IWizardContainer context_ = null;
- private JavaResourceFilter filter_ = new JavaResourceFilter();
- private IResource initialResource_ = null;
- private Listener statusListener;
-
- /*CONTEXT_ID PBCL0001 for the Bean Selection Page*/
- private String INFOPOP_PBCL_PAGE = "PBCL0001";
-
- private Text beanClassText_;
- /*CONTEXT_ID PBCL0002 for the Bean Selection field of the Bean Selection Page*/
- private String INFOPOP_PBCL_TEXT_BEAN_CLASS = "PBCL0002";
-
- private Button beanClassBrowseButton_;
- /*CONTEXT_ID PBCL0003 for the Bean Class Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE = "PBCL0003";
-
- private Button beanResourceBrowseButton_;
- /*CONTEXT_ID PBCL0004 for the Bean Resource Browse button of the Bean Selection Page*/
- private String INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE = "PBCL0004";
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- this.statusListener = statusListener;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent_ = parent;
-
- Composite group = uiUtils.createComposite( parent, 4 );
-
- group.setToolTipText( msgUtils.getMessage("TOOLTIP_PBCL_PAGE") );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( group, pluginId_ + "." + INFOPOP_PBCL_PAGE );
-
- beanClassText_ = uiUtils.createText( group, "LABEL_BEAN_CLASS_NAME",
- "TOOLTIP_PBCL_TEXT_BEAN_CLASS",
- INFOPOP_PBCL_TEXT_BEAN_CLASS,
- SWT.SINGLE | SWT.BORDER);
- beanClassText_.addModifyListener(
- new ModifyListener()
- {
- public void modifyText(ModifyEvent e)
- {
- handleModifyBeanClassText();
- }
- }
- );
-
- beanClassBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_CLASSES",
- "TOOLTIP_PBCL_BUTTON_BEAN_CLASS_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_CLASS_BROWSE );
- beanClassBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseClasses();
- }
- } );
-
- beanResourceBrowseButton_ = uiUtils.createPushButton( group, "BUTTON_BROWSE_FILES",
- "TOOLTIP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE",
- INFOPOP_PBCL_BUTTON_BEAN_RESOURCE_BROWSE );
- beanResourceBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleBrowseFiles();
- }
- } );
- return this;
- }
-
- private void handleModifyBeanClassText()
- {
- statusListener.handleEvent(null);
- serverProject_ = null;
- serverComponentName_ = null;
- }
-
- private void handleBrowseClasses()
- {
- Shell shell = parent_.getShell();
- IType itype = DialogUtils.browseClassesAsIType(shell, ResourcesPlugin.getWorkspace().getRoot().getProjects(), new ProgressMonitorDialog(shell));
- if (itype != null)
- {
- beanClassText_.setText(itype.getFullyQualifiedName());
- try
- {
- IResource res = itype.getCorrespondingResource();
- if (res != null)
- {
- serverProject_ = res.getProject();
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
- }
- else
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- }
- catch (JavaModelException jme)
- {
- serverProject_ = null;
- serverComponentName_ = null;
- }
- }
- }
-
- private void handleBrowseFiles()
- {
- IResource topResource = ResourceUtils.getWorkspaceRoot();
- IResource resource = DialogUtils.browseResources( parent_.getShell(), topResource, initialResource_, filter_ );
- setBeanClass(resource);
- }
-
- private void setBeanClass(IResource resource)
- {
- if( resource != null && resource instanceof IFile )
- {
- IPath path = resource.getFullPath();
- String basename = path.lastSegment();
-
- if( basename != null && basename.length() > 0 )
- {
- String beanPackage = org.eclipse.jst.ws.internal.common.ResourceUtils.getJavaResourcePackageName(path);
- String beanClass = (beanPackage == null ? basename : (beanPackage + "." + basename));
-
- if( beanClass.toLowerCase().endsWith(".java") || beanClass.toLowerCase().endsWith(".class" ) )
- {
- beanClass = beanClass.substring( 0, beanClass.lastIndexOf('.') );
- }
-
- beanClassText_.setText(beanClass);
- serverProject_ = ResourceUtils.getProjectOf(path);
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- serverComponentName_ = comp.getName();
- }
-
- }
- }
- }
-
- private void setBeanClass(ServiceImplBeanImpl serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof PortComponentImpl){
- PortComponentImpl pci = (PortComponentImpl)eObject;
- String beanClass = pci.getServiceEndpointInterface();
- beanClassText_.setText(beanClass);
- }
- }
- }
-
- private void setBeanClass(BeanLink serviceImpl)
- {
- if( serviceImpl != null )
- {
- EObject eObject = serviceImpl.eContainer();
- if(eObject instanceof ServiceImplBeanImpl){
- setBeanClass((ServiceImplBeanImpl)eObject);
- }
- }
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- if (object instanceof IFile)
- {
- IFile iFile = (IFile)object;
- String fileExt = iFile.getFileExtension().toLowerCase();
- if (fileExt.equals("java") || fileExt.equals("class"))
- setBeanClass(iFile);
- }
- else if (object instanceof ICompilationUnit)
- setBeanClass(((ICompilationUnit)object).getResource());
- else if (object instanceof ServiceImplBeanImpl)
- setBeanClass((ServiceImplBeanImpl)object);
- else if(object instanceof BeanLink)
- setBeanClass((BeanLink)object);
- }
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return new StructuredSelection(beanClassText_.getText());
- }
-
- public IProject getProject()
- {
- return serverProject_;
- }
-
- public String getComponentName()
- {
- return serverComponentName_;
- }
-
- public Status getStatus()
- {
- String beanClassName = beanClassText_.getText().trim();
- if (beanClassName == null || beanClassName.length() <= 0)
- {
- MessageUtils msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- return new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_BEAN_CANNOT_BE_EMPTY"), Status.ERROR);
- }
- return new SimpleStatus("");
- }
-
- public Status validateSelection(IStructuredSelection objectSelection)
- {
- return new SimpleStatus("");
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
deleted file mode 100644
index 87b31d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionFragment.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionFragment extends SequenceFragment implements Condition
-{
- private TypeRuntimeServer typeRuntimeServer;
- private boolean hasObjectSelectionWidget;
-
- public ObjectSelectionFragment()
- {
- super();
- BooleanFragment boolFragment = new BooleanFragment(new SimpleFragment("ObjectSelectionWidget"), new SimpleFragment(""), this);
- add(boolFragment);
- add(new SimpleFragment(new ObjectSelectionOutputCommand(), ""));
- hasObjectSelectionWidget = false;
- }
-
- /**
- * This method is called retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionWidget.class );
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ObjectSelectionOutputCommand.class, "ObjectSelection", null);
- dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionWidget.class);
- dataRegistry.addMapping(ObjectSelectionFragment.class, "TypeRuntimeServer", ObjectSelectionOutputCommand.class);
-
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ObjectSelection", ObjectSelectionOutputCommand.class);
- dataRegistry.addMapping(ObjectSelectionWidget.class, "Project", ObjectSelectionOutputCommand.class);
- dataRegistry.addMapping(ObjectSelectionWidget.class, "ComponentName", ObjectSelectionOutputCommand.class);
- }
-
- public boolean evaluate()
- {
- return hasObjectSelectionWidget;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- return typeRuntimeServer;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- this.typeRuntimeServer = typeRuntimeServer;
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
-
- int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(wst);
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- //Must have WSDL object selection. No choice.
- hasObjectSelectionWidget=true;
- }
- else
- {
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
- if (wsimpl!=null)
- {
- String objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- hasObjectSelectionWidget = objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0;
- }
- }
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
deleted file mode 100644
index 7f5d872..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionOutputCommand.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionOutputCommand extends SimpleCommand
-{
- private String objectSelectionWidgetId_;
- private IStructuredSelection objectSelection_;
- private IObjectSelectionWidget objectSelectionWidget_;
- private IProject project_;
- private String componentName_;
- private WebServicesParser parser_;
-
- public Status execute(Environment env)
- {
- // Transformation
- if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
- {
- IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
- {
- String transformerId = elements[i].getAttribute("transformer");
- if (transformerId != null && transformerId.length() > 0)
- {
- try
- {
- Object transformer = elements[i].createExecutableExtension("transformer");
- if (transformer instanceof Transformer)
- {
- Object transformedSelection = ((Transformer)transformer).transform(objectSelection_);
- if (transformedSelection instanceof IStructuredSelection)
- objectSelection_ = (IStructuredSelection)transformedSelection;
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- }
-
- // Validation
- Status status = (objectSelectionWidget_ != null) ? objectSelectionWidget_.validateSelection(getObjectSelection()) : new SimpleStatus("");
- if (status.getSeverity() != Status.OK)
- {
- try
- {
- env.getStatusHandler().report(status);
- }
- catch (StatusException se)
- {
- }
- }
-
- return status;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
-
- int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(wst);
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
- //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
-
- if (wsimpl != null)
- {
- String objectSelectionWidgetId = null;
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
- }
- else
- {
- objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- }
-
- objectSelectionWidgetId_ = objectSelectionWidgetId;
-
- if (objectSelectionWidgetId_ != null && objectSelectionWidgetId_.length() > 0)
- {
- IConfigurationElement[] elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
- for (int i = 0; i < elements.length; i++)
- {
- if (objectSelectionWidgetId_.equals(elements[i].getAttribute("id")))
- {
- try
- {
- Object object = elements[i].createExecutableExtension("class");
- if (object instanceof IObjectSelectionWidget)
- {
- objectSelectionWidget_ = (IObjectSelectionWidget)object;
- return;
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- }
- }
- }
-
- /**
- * @return Returns the selection.
- */
- public IStructuredSelection getObjectSelection()
- {
- return objectSelection_;
- }
- /**
- * @param selection The selection to set.
- */
- public void setObjectSelection(IStructuredSelection objectSelection)
- {
- objectSelection_ = objectSelection;
-
- //Set the project if you can
- if (project_==null)
- {
- project_ = getProjectFromObjectSelection(objectSelection);
- }
-
- //Set the componentName if you can
- if (componentName_ == null)
- {
- componentName_ = getComponentNameFromObjectSelection(objectSelection);
- }
-
- // Check if this is a WSDL selection object. If it is we need
- // to unwrap it.
- if( objectSelection != null && !objectSelection.isEmpty() )
- {
- Object object = objectSelection.getFirstElement();
-
- if( object instanceof WSDLSelectionWrapper )
- {
- WSDLSelectionWrapper wsdlWrapper = (WSDLSelectionWrapper)object;
-
- objectSelection_ = wsdlWrapper.wsdlSelection;
- parser_ = wsdlWrapper.parser;
- }
- }
- }
-
- public IProject getProject()
- {
- return project_;
- }
-
- public void setProject(IProject project)
- {
- this.project_ = project;
- }
-
- public String getComponentName()
- {
- return componentName_;
- }
-
- public void setComponentName(String componentName)
- {
- this.componentName_ = componentName;
- }
-
- /**
- * @return Returns the parser_.
- */
- public WebServicesParser getWebServicesParser()
- {
- return parser_;
- }
-
- private IProject getProjectFromObjectSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- e.printStackTrace();
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromObjectSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
-
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- e.printStackTrace();
- return null;
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
deleted file mode 100644
index 8cdbd64..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionRegistry.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.Platform;
-
-public class ObjectSelectionRegistry
-{
- private static ObjectSelectionRegistry instance;
- private static IConfigurationElement[] elements;
-
- private ObjectSelectionRegistry()
- {
- elements = Platform.getExtensionRegistry().getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "objectSelectionWidget");
- }
-
- public static ObjectSelectionRegistry getInstance()
- {
- if (instance == null)
- instance = new ObjectSelectionRegistry();
- return instance;
- }
-
- public IConfigurationElement[] getConfigurationElements()
- {
- return elements;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
deleted file mode 100644
index 9695f9f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/ObjectSelectionWidget.java
+++ /dev/null
@@ -1,235 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class ObjectSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget
-{
- private IConfigurationElement[] elements;
- private Composite parent;
- private Listener statusListener;
- private Composite composite;
- private TypeRuntimeServer typeRuntimeServer;
- private IStructuredSelection initialSelection;
- private IProject project;
- private String componentName;
- private IObjectSelectionWidget child;
-
- public WidgetDataEvents addControls(Composite parentComposite, Listener statListener)
- {
- elements = ObjectSelectionRegistry.getInstance().getConfigurationElements();
- this.parent = parentComposite;
- this.statusListener = statListener;
- composite = null;
- return this;
- }
-
- /**
- * @param typeRuntimeServer The typeRuntimeServer to set.
- */
- public void setTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer)
- {
- this.typeRuntimeServer = typeRuntimeServer;
- if (composite != null)
- {
- composite.dispose();
- child = null;
- }
- if (typeRuntimeServer != null)
- {
- String wst = typeRuntimeServer.getTypeId();
- int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(wst);
- String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
-
- //IWebServiceType wst = WebServiceRuntimeExtensionUtils.getWebServiceTypeById(typeRuntimeServer.getTypeId());
- if (wsimpl != null)
- {
- String objectSelectionWidgetId = null;
- if (scenario == WebServiceScenario.TOPDOWN)
- {
- objectSelectionWidgetId = "org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget";
- }
- else
- {
- objectSelectionWidgetId = wsimpl.getObjectSelectionWidget();
- }
-
- if (objectSelectionWidgetId != null && objectSelectionWidgetId.length() > 0)
- {
- for (int i = 0; i < elements.length; i++)
- {
- if (objectSelectionWidgetId.equals(elements[i].getAttribute("id")))
- {
- try
- {
- Object object = elements[i].createExecutableExtension("class");
- if (object instanceof IObjectSelectionWidget)
- {
- Control shell = parent.getShell();
- int x = shell.getSize().x;
- composite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- GridData gd = new GridData(GridData.FILL_BOTH);
- composite.setLayout(gl);
- composite.setLayoutData(gd);
- child = (IObjectSelectionWidget)object;
- child.addControls(composite, statusListener);
- child.setInitialSelection(initialSelection);
- composite.setSize(x-20, composite.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
- parent.setSize(x-10, parent.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
- shell.setSize(x, shell.computeSize(SWT.DEFAULT, SWT.DEFAULT).y);
- shell.setRedraw(true);
- shell.redraw();
- shell.update();
- return;
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
- }
- }
- }
- }
-
- public Status getStatus()
- {
- return (child != null) ? child.getStatus() : new SimpleStatus("");
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- this.initialSelection = initialSelection;
- project = getProjectFromInitialSelection(initialSelection);
- componentName = getComponentNameFromInitialSelection(initialSelection);
- if (child != null)
- child.setInitialSelection(initialSelection);
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return (child != null) ? child.getObjectSelection() : null;
- }
-
- public Status validateSelection(IStructuredSelection objectSelection)
- {
- return (child != null) ? child.validateSelection(objectSelection) : new SimpleStatus("");
- }
-
- public IProject getProject()
- {
- if (child != null)
- {
- IProject p = child.getProject();
- if (p != null)
- return p;
- else
- return project;
- }
- else
- {
- return null;
- }
- }
-
- public String getComponentName()
- {
- if (child != null)
- {
- String cname = child.getComponentName();
- if (cname != null && cname.length()>0)
- return cname;
- else
- return componentName;
- }
- else
- {
- return null;
- }
-
- }
-
- private IProject getProjectFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp != null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
deleted file mode 100644
index 546120c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/Timer.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.util.Calendar;
-
-import org.eclipse.swt.widgets.Display;
-
-public class Timer extends Thread
-{
- private static Timer instance = null;
- private final long ONE_SECOND = 1000;
- private long refreshTime;
- private Display display;
- private Runnable runnable;
-
- private Timer(Display display, Runnable runnable)
- {
- this.display = display;
- this.runnable = runnable;
- }
-
- public synchronized static Timer newInstance(Display display, Runnable runnable)
- {
- if (instance == null)
- instance = new Timer(display, runnable);
- return instance;
- }
-
- public synchronized static boolean isRunning()
- {
- return instance != null;
- }
-
- public synchronized void startTimer()
- {
- refreshTime = getCurrentTime() + ONE_SECOND;
- if (!isAlive())
- this.start();
- }
-
- private long getCurrentTime()
- {
- return Calendar.getInstance().getTime().getTime();
- }
-
- public void run()
- {
- long currTime = getCurrentTime();
- while (currTime < refreshTime)
- {
- try
- {
- sleep(refreshTime - currTime);
- }
- catch (InterruptedException ie)
- {
- }
- currTime = getCurrentTime();
- }
- instance = null;
- display.syncExec(runnable);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
deleted file mode 100644
index 1d0e7fb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionTransformer.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.internal.wsclient.impl.ServiceRefImpl;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionTransformer implements Transformer
-{
- public Object transform(Object value)
- {
- if (value instanceof IStructuredSelection)
- {
- Object sel = ((IStructuredSelection)value).getFirstElement();
- if (sel instanceof IResource)
- {
- try
- {
- return new StructuredSelection(((IResource)sel).getLocation().toFile().toURL().toString());
- }
- catch (MalformedURLException murle)
- {
- }
- }
- else if (sel instanceof ServiceImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)sel));
- }
- else if (sel instanceof ServiceRefImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((ServiceRefImpl)sel));
- }
- else if (sel instanceof WSDLResourceImpl)
- {
- return new StructuredSelection(J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)sel));
- }
- }
- return value;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
deleted file mode 100644
index 67fd5ee..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWidget.java
+++ /dev/null
@@ -1,401 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import java.io.File;
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.jst.ws.internal.common.J2EEActionAdapterFactory;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WSDLParserFactory;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionConditionCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WSDLSelectionTreeWidget;
-import org.eclipse.jst.ws.internal.ui.common.DialogResourceBrowser;
-import org.eclipse.jst.ws.internal.ui.common.FileExtensionFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServiceEntity;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-public class WSDLSelectionWidget extends AbstractObjectSelectionWidget implements IObjectSelectionWidget, Runnable
-{
- private String pluginId_;
- private MessageUtils msgUtils_;
- private FileExtensionFilter wsFilter_;
- private WebServicesParser webServicesParser;
-
- private Composite parent_;
- private Listener statusListener_;
- private WSDLSelectionTreeWidget tree;
-
- /*CONTEXT_ID PCON0001 for the WSDL Selection Page*/
- private final String INFOPOP_PCON_PAGE = "PCON0001";
-
- /*CONTEXT_ID PCON0002 for the WSDL Document text field of the WSDL Selection Page*/
- private final String INFOPOP_PCON_TEXT_WSDL = "PCON0002";
- private Text webServiceURI;
-
- /*CONTEXT_ID PCON0003 for the WSDL Resource Browse button of the WSDL Selection Page*/
- private final String INFOPOP_PCON_BUTTON_BROWSE_WSDL = "PCON0003";
- private Button wsBrowseButton_;
-
- public WSDLSelectionWidget()
- {
- pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- wsFilter_ = new FileExtensionFilter(new String[] {"wsdl", "wsil", "html"});
- webServicesParser = WSDLParserFactory.getWSDLParser();
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- UIUtils uiUtils = new UIUtils( msgUtils_, pluginId_ );
- parent_ = parent;
- statusListener_ = statusListener;
-
- parent.setToolTipText( msgUtils_.getMessage( "TOOLTIP_PCON_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PCON_PAGE );
-
- Composite wsdlGroup = uiUtils.createComposite( parent, 2, 5, 0 );
-
- Label wsLabel = new Label( wsdlGroup, SWT.WRAP);
- wsLabel.setText( msgUtils_.getMessage("LABEL_WS_SELECTION"));
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL);
- gd.horizontalSpan = 2;
- wsLabel.setLayoutData(gd);
- wsLabel.setToolTipText( msgUtils_.getMessage("TOOLTIP_PCON_TEXT_WS") );
-
- webServiceURI = uiUtils.createText( wsdlGroup, null, "TOOLTIP_PCON_TEXT_WS", INFOPOP_PCON_TEXT_WSDL, SWT.SINGLE | SWT.BORDER );
- webServiceURI.addModifyListener(
- new ModifyListener()
- {
- public void modifyText(ModifyEvent event)
- {
- handleWebServiceURIModifyEvent();
- }
- });
- webServiceURI.addListener( SWT.Modify, statusListener );
-
- wsBrowseButton_ = uiUtils.createPushButton( wsdlGroup, "BUTTON_BROWSE", "TOOLTIP_PCON_BUTTON_BROWSE_WS", INFOPOP_PCON_BUTTON_BROWSE_WSDL );
- wsBrowseButton_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetDefaultSelected(SelectionEvent event)
- {
- handleWSDLButton();
- }
-
- public void widgetSelected(SelectionEvent event)
- {
- handleWSDLButton();
- }
- });
-
- tree = new WSDLSelectionTreeWidget();
- tree.addControls(parent, statusListener);
- tree.setWebServicesParser(webServicesParser);
- return this;
- }
-
- private void handleWebServiceURIModifyEvent()
- {
- if (webServiceURI.getText().indexOf(':') > 0)
- Timer.newInstance(Display.getCurrent(), this).startTimer();
- else
- handleWebServiceURI();
- statusListener_.handleEvent(null);
- }
-
- private void handleWebServiceURI()
- {
- String wsURI = webServiceURI.getText();
- if (wsURI.indexOf(':') < 0)
- {
- IFile file = uri2IFile(wsURI);
- if (file != null)
- wsURI = iFile2URI(file);
- }
- if (wsURI != null && wsURI.indexOf(':') >= 0 && webServicesParser.getWebServiceEntityByURI(wsURI) == null)
- {
- WSDLSelectionConditionCommand cmd = new WSDLSelectionConditionCommand();
- cmd.setWebServicesParser(webServicesParser);
- cmd.setWebServiceURI(wsURI);
- cmd.execute(null);
- }
- WebServiceEntity entity = webServicesParser.getWebServiceEntityByURI(wsURI);
- if (entity != null && entity.getType() == WebServiceEntity.TYPE_WSDL)
- tree.setEnabled(false);
- else
- tree.setEnabled(true);
- tree.setWebServiceURI(wsURI);
- tree.refreshTreeViewer();
- }
-
- public void run()
- {
- handleWebServiceURI();
- statusListener_.handleEvent(null);
- }
-
- private void handleWSDLButton()
- {
- DialogResourceBrowser dialog = new DialogResourceBrowser( parent_.getShell(), null, wsFilter_);
- dialog.open();
- IResource res = dialog.getFirstSelection();
- if( res != null ) webServiceURI.setText( res.getFullPath().toString() );
- statusListener_.handleEvent(null);
- }
-
- public Status getStatus()
- {
- // Timer validation
- /*
- * Commenting out because we don't want to block fast typers from hitting Next/Finish
- if (Timer.isRunning())
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_LOADING_WEB_SERVICE_URI"), Status.ERROR);
- */
-
- // Validate the String representation of the Web service URI
- // For example, is it pointing to an existing resource in the workspace?
- String wsPath = webServiceURI.getText();
- if( wsPath == null || wsPath.length() <= 0 )
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI"), Status.ERROR);
- else if( wsPath.indexOf(':') < 0 )
- {
- IResource res = ResourceUtils.findResource(wsPath);
- if( res == null )
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_NO_SUCH_FILE", new Object[] {wsPath}), Status.ERROR);
- else if( res.getType() != IResource.FILE )
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_INVALID_WEB_SERVICE_URI"), Status.ERROR);
- }
-
- // Validate the content of the Web service URI
- // For example, is selection a WSDL URI?
- if (!Timer.isRunning() && tree.isEnabled())
- {
- Status status = tree.getStatus();
- if (status != null)
- {
- int severity = status.getSeverity();
- if (severity == Status.ERROR || severity == Status.WARNING)
- return status;
- }
- }
- else
- {
- if( wsPath.indexOf(':') < 0 )
- {
- String wsdlURI = iFile2URI((IFile)ResourceUtils.findResource(wsPath));
- if (webServicesParser.getWSDLDefinition(wsdlURI) == null)
- return new SimpleStatus("", msgUtils_.getMessage("PAGE_MSG_SELECTION_MUST_BE_WSDL"), Status.ERROR);
- }
- }
-
- // OK status
- return new SimpleStatus( "" );
- }
-
- private IFile uri2IFile(String uri)
- {
- IResource res = ResourcesPlugin.getWorkspace().getRoot().findMember(uri);
- if (res instanceof IFile)
- return (IFile)res;
- else
- return null;
- }
-
- private String iFile2URI(IFile file)
- {
- File f = file.getLocation().toFile();
- try
- {
- return f.toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- return f.toString();
- }
-
- public void setInitialSelection(IStructuredSelection initialSelection)
- {
- if (initialSelection != null && !initialSelection.isEmpty())
- {
- Object object = initialSelection.getFirstElement();
- String wsdlURI = toWsdlURI(object);
- if (wsdlURI != null)
- {
- webServiceURI.setText(wsdlURI);
- handleWebServiceURI();
- }
- }
- }
-
- private String toWsdlURI(Object object)
- {
- if (object instanceof ServiceImpl)
- return J2EEActionAdapterFactory.getWSDLURI((ServiceImpl)object);
- else if (object instanceof WSDLResourceImpl)
- return J2EEActionAdapterFactory.getWSDLURI((WSDLResourceImpl)object);
- else if (object instanceof ServiceRef)
- return J2EEActionAdapterFactory.getWSDLURI((ServiceRef)object);
- else if (object instanceof IFile)
- return ((IFile)object).getFullPath().toString();
- else if (object instanceof String)
- return (String)object;
- else
- return null;
- }
-
- private String toAbsoluteWsdlURI(Object object)
- {
- if (object instanceof IFile)
- {
- try
- {
- return ((IFile)object).getLocation().toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- return toWsdlURI(object);
- }
-
- public IStructuredSelection getObjectSelection()
- {
- return new StructuredSelection(
- new WSDLSelectionWrapper( webServicesParser,
- new StructuredSelection(tree.getWsdlURI()) ) );
- }
-
- public WebServicesParser getWebServicesParser()
- {
- return webServicesParser;
- }
-
- public Status validateSelection(IStructuredSelection objectSelection)
- {
- return new SimpleStatus("");
- }
-
- public IProject getProject()
- {
- String wsdlURI = tree.getWsdlURI();
- if (wsdlURI != null)
- {
- IProject p = getProjectFromURI(wsdlURI);
- if (p!=null && p.exists())
- return p;
-
- String wsRelPath = webServiceURI.getText();
- IResource wsRes = ResourceUtils.findResource(wsRelPath);
- if (wsRes!=null && wsRes instanceof IFile)
- {
- IProject p2 = ((IFile)wsRes).getProject();
- return p2;
- }
-
- }
- return null;
- }
-
- public String getComponentName()
- {
- String wsdlURI = tree.getWsdlURI();
- if (wsdlURI != null)
- {
- String cname = getComponentNameFromURI(wsdlURI);
- if (cname!=null && cname.length()>0)
- return cname;
-
- String wsRelPath = webServiceURI.getText();
- IResource wsRes = ResourceUtils.findResource(wsRelPath);
- if (wsRes!=null && wsRes instanceof IFile)
- {
- IVirtualComponent comp = ResourceUtils.getComponentOf(wsRes);
- if (comp!=null)
- {
- return comp.getName();
- }
- }
-
- }
- return null;
- }
-
- private IProject getProjectFromURI(String uri)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String wkspcRootLoc = root.getLocation().toString();
- int idx = uri.indexOf(wkspcRootLoc);
- if (idx != -1)
- {
- String relPath = uri.substring(wkspcRootLoc.length()+idx);
- IResource res = root.findMember(new Path(relPath));
- if (res instanceof IFile)
- {
- IProject p = ((IFile)res).getProject();
- return p;
- }
- }
- return null;
- }
-
- private String getComponentNameFromURI(String uri)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- String wkspcRootLoc = root.getLocation().toString();
- int idx = uri.indexOf(wkspcRootLoc);
- if (idx != -1)
- {
- String relPath = uri.substring(wkspcRootLoc.length()+idx);
- IResource res = root.findMember(new Path(relPath));
- if (res instanceof IFile)
- {
- IVirtualComponent comp = ResourceUtils.getComponentOf(res);
- if (comp!=null)
- {
- return comp.getName();
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
deleted file mode 100644
index b0a6005..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/object/WSDLSelectionWrapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.object;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- * This class is a very simple wrapper that binds a WSDL parser with
- * a wsdlSelection object.
- */
-public class WSDLSelectionWrapper
-{
- public WebServicesParser parser;
- public IStructuredSelection wsdlSelection;
-
- public WSDLSelectionWrapper( WebServicesParser parser,
- IStructuredSelection selection )
- {
- this.parser = parser;
- this.wsdlSelection = selection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
deleted file mode 100644
index 0e4ad0a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.ClientProjectTypeRegistry;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-
-
-public class ClientRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- /* CONTEXT_ID PWRS0003 for the Wizard Scenario Client configuration of the Runtime Selection Page */
- private String INFOPOP_PWRS_GROUP_CLIENT = pluginId_ + ".PWRS0003";
-
- private String clientScenarioId;
- private Group clientGroup_;
- private RuntimeServerSelectionWidget runtimeWidget_;
- private SelectionListChoices runtime2ClientTypes_;
- private Combo clientType_;
- private SelectionAdapter clientTypeSelListener;
- private ProjectSelectionWidget projectWidget_;
- private boolean isVisible_;
-
- // rsk revisit - Putting this in temporarily. The RuntimeSelectionDialog needs the server
- // information even when it is launched for the client half of the configuration.
- private String serviceScenarioId;
- //
-
-
- public WidgetDataEvents addControls( Composite parent, final Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- clientGroup_ = uiUtils.createGroup( parent, "LABEL_CLIENT_SELECTION_VIEW_TITLE",
- null, INFOPOP_PWRS_GROUP_CLIENT, 2, 5, 5 );
-
- runtimeWidget_ = new RuntimeServerSelectionWidget( true );
- runtimeWidget_.addControls( clientGroup_, statusListener );
- runtimeWidget_.addModifyListener( new ModifyListener()
- {
- public void modifyText(ModifyEvent e)
- {
- handleRuntime2ClientTypesEvent();
- handleUpdateProjectWidget();
- }
- });
-
- clientType_ = uiUtils.createCombo( clientGroup_, "LABEL_CLIENT_TYPE",
- "TOOLTIP_PWCR_COMBO_CLIENT_TYPE",
- INFOPOP_PWRS_GROUP_CLIENT,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- clientTypeSelListener = new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSetProjects( clientType_.getSelectionIndex() );
- statusListener.handleEvent(null);
- }
- };
-
- clientType_.addSelectionListener(clientTypeSelListener);
-
- projectWidget_ = new ProjectSelectionWidget(true);
- projectWidget_.addControls( clientGroup_, statusListener );
-
- //projectWidget_.addModifyListener(new ModifyListener(){
- // public void modifyText(ModifyEvent e){
- // getProjectSelections();
- // }
- // });
-
- return this;
- }
-
- // This method is called by the creator of this widget to control
- // whether it is visible or not.
- public void setVisible( boolean value )
- {
- clientGroup_.setVisible( value );
- isVisible_ = value;
- }
-
- public boolean isVisible(){
- return this.isVisible_;
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- runtimeWidget_.setTypeRuntimeServer( ids );
- projectWidget_.setTypeRuntimeServer(ids);
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return runtimeWidget_.getTypeRuntimeServer();
- }
-
- public String getJ2EEVersion()
- {
- return runtimeWidget_.getJ2EEVersion();
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- runtimeWidget_.setJ2EEVersion(j2eeVersion);
- projectWidget_.setJ2EEVersion(j2eeVersion);
- }
-
- public boolean getClientNeedEAR()
- {
- return projectWidget_.getNeedEAR();
- }
-
- public void setClientNeedEAR(boolean b)
- {
- projectWidget_.setNeedEAR(b);
- }
-
- public String getClientComponentName()
- {
- return projectWidget_.getComponentName();
- }
-
- public void setClientComponentName( String name )
- {
- projectWidget_.setComponentName( name );
- }
-
- public String getClientEarComponentName()
- {
- return projectWidget_.getEarComponentName();
- }
-
- public void setClientEarComponentName( String name )
- {
- projectWidget_.setEarComponentName( name );
- }
-
- public String getClientComponentType()
- {
- SelectionList projTypeList = runtime2ClientTypes_.getChoice().getList();
- projTypeList.setIndex( clientType_.getSelectionIndex() );
- return projTypeList.getSelection();
- }
-
- public void setClientComponentType( String type )
- {
- projectWidget_.setComponentType( type );
- }
-
- public String getClientProjectName()
- {
- return projectWidget_.getProjectName();
- }
-
- public String getClientEarProjectName()
- {
- return projectWidget_.getEarProjectName();
- }
-
- /**
- * @param runtime2ClientTypes The runtime2ClientTypes to set.
- */
- public void setRuntime2ClientTypes(SelectionListChoices runtime2ClientTypes)
- {
- runtime2ClientTypes_ = runtime2ClientTypes;
- handleRuntime2ClientTypesEvent();
- }
-
- public SelectionListChoices getRuntime2ClientTypes()
- {
- ClientProjectTypeRegistry registry = ClientProjectTypeRegistry.getInstance();
-
- String runtime = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
- String clientProject = projectWidget_.getProjectChoices().getList().getSelection();
- String earProject = projectWidget_.getProjectChoices().getChoice().getList().getSelection();
-
- SelectionList runtimeList = runtime2ClientTypes_.getList();
- runtimeList.setSelectionValue( runtime );
-
- SelectionList projTypeList = runtime2ClientTypes_.getChoice().getList();
- projTypeList.setIndex( clientType_.getSelectionIndex() );
-
- SelectionListChoices clientProjChoice = runtime2ClientTypes_.getChoice().getChoice();
- SelectionList clientProjList = clientProjChoice.getList();
- clientProjList.setSelectionValue( clientProject );
-
- SelectionList earProjList = clientProjChoice.getChoice().getList();
- earProjList.setSelectionValue( earProject );
-
- return runtime2ClientTypes_;
- }
-
- private void handleRuntime2ClientTypesEvent()
- {
- if (runtime2ClientTypes_ != null)
- {
- //If the runtimeId from runtimeWidget_ is already selected in
- //in runtime2ClientTypes_, do nothing.
- String currentRuntimeId = runtime2ClientTypes_.getList().getSelection();
- String newRuntimeId = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
- if (currentRuntimeId != newRuntimeId)
- {
- SelectionList runtimes = runtime2ClientTypes_.getList();
- runtimes.setSelectionValue( runtimeWidget_.getTypeRuntimeServer().getRuntimeId() );
- }
-
- String[] clientTypeIds = runtime2ClientTypes_.getChoice().getList().getList();
- int selectedClientTypeIdx = runtime2ClientTypes_.getChoice().getList().getIndex();
-
- clientType_.removeSelectionListener(clientTypeSelListener);
- clientType_.setItems( getClientTypeLabels( clientTypeIds ));
- clientType_.select(selectedClientTypeIdx);
- clientType_.addSelectionListener(clientTypeSelListener);
- handleSetProjects(selectedClientTypeIdx);
-
- }
- }
-
-
- private void handleUpdateProjectWidget()
- {
- projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
- projectWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
- }
-
-
- private void handleSetProjects( int clientTypeIndex )
- {
- SelectionListChoices clientType2Projects = runtime2ClientTypes_.getChoice();
- clientType2Projects.getList().setIndex( clientTypeIndex );
-
- // Make sure that the project name and EAR name are kept the same
- // even if the client type is changed. Note: the project and EAR lists
- // will be updated according to what is set by the client type.
- SelectionListChoices currentProjects = projectWidget_.getProjectChoices();
-
- if( currentProjects != null )
- {
- String projectName = currentProjects.getList().getSelection();
- String earName = currentProjects.getChoice().getList().getSelection();
-
- // Set the project to it's original state.
- clientType2Projects.getChoice().getList().setSelectionValue( projectName );
-
- // Set the EAR name to it's original state.
- clientType2Projects.getChoice().getChoice().getList().setSelectionValue( earName );
- }
-
- //projectWidget_.setProjectTypeId(clientType2Projects.getList().getSelection());
- projectWidget_.setComponentType(clientType2Projects.getList().getSelection());
- projectWidget_.setProjectChoices( clientType2Projects.getChoice() );
- }
-
- private String[] getClientTypeLabels( String[] types )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- //ClientProjectTypeRegistry registry = ClientProjectTypeRegistry.getInstance();
- String[] clientTypeLabels = new String[types.length];
-
- for( int index = 0; index < types.length; index++ )
- {
- //clientTypeLabels[index] = registry.getElementById(types[index]).getAttribute("label");
- String type = types[index];
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_WEB");
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_EJB");
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_APP_CLIENT");
- }
- else if (type.equals(IModuleConstants.JST_UTILITY_MODULE))
- {
- clientTypeLabels[index] = msgUtils.getMessage("LABEL_CLIENT_COMP_TYPE_CONTAINERLESS");
- }
- else
- {
- clientTypeLabels[index] = type;
- }
- }
-
- return clientTypeLabels;
- }
-
- public ProjectSelectionWidget getProjectSelectionWidget() {
- return this.projectWidget_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus()
- {
- Status finalStatus = new SimpleStatus( "" );
- Status projectStatus = projectWidget_.getStatus();
- Status runtimeStatus = runtimeWidget_.getStatus();
-
- if( runtimeStatus.getSeverity() == Status.ERROR )
- {
- finalStatus = runtimeStatus;
- }
- else if( projectStatus.getSeverity() == Status.ERROR )
- {
- finalStatus = projectStatus;
- }
- else
- {
- SelectionListChoices clientProjects = getProjectSelectionWidget().getProjectChoices();
- ValidationUtils valUtils = new ValidationUtils();
- if (clientProjects != null)
- {
- String clientEARName = clientProjects.getChoice().getList().getSelection();
- String clientProjName = clientProjects.getList().getSelection();
-
- String clientCompName = projectWidget_.getComponentName();
- String clientEARCompName = projectWidget_.getEarComponentName();
-
- //Validate that the selected client project is of the type indicated by client project type.
- Status clientProjectTypeStatus = valUtils.validateProjectType(clientProjName, runtime2ClientTypes_);
- if (clientProjectTypeStatus.getSeverity() == Status.ERROR)
- {
- finalStatus = clientProjectTypeStatus;
- }
-
- //Validate client side server targets and J2EE levels
- String clientServerFactoryId = getClientTypeRuntimeServer().getServerId();
- String clientJ2EElevel = getJ2EEVersion();
- Status clientProjectStatus = valUtils.validateProjectTargetAndJ2EE(clientProjName, clientCompName, clientEARName, clientEARCompName, clientServerFactoryId,
- clientJ2EElevel);
- if (clientProjectStatus.getSeverity() == Status.ERROR)
- {
- finalStatus = clientProjectStatus;
- }
- }
- }
- return finalStatus;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index fbaf1af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,1181 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ClientServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class ClientRuntimeSelectionWidgetDefaultingCommand extends SimpleCommand
-{
- protected MessageUtils msgUtils_;
- // clientRuntimeJ2EEType contains the default client runtime and J2EE level based on the initial selection.
- // If the initialSeleciton does not result in a valid client runtime and J2EE level, clientRuntimeJ2EEType
- // should remain null for the life of this instance.
- private WSRuntimeJ2EEType clientRuntimeJ2EEType_;
-
- private TypeRuntimeServer clientIds_;
- private SelectionListChoices runtimeClientTypes_;
- private String clientComponentName_;
- private String clientEarComponentName_;
-
- private Environment environment_;
- private IContext context_;
- private ISelection selection_;
- private IWebServiceClient webServiceClient_;
- private ResourceContext resourceContext_;
- private boolean test_;
-
- //A note on initialSelections ...
- //The difference between clientInitialProject/Component_ and initialInitialSelection is that
- //clientInitialProject/Component_ comes from the ObjectSelectionOutputCommand while initialInitialSelection
- //is the actual thing that was selected before the wizard was launched. In the runtime/j2ee/project
- //defaulting algorithm, clientInitialSelection will be given first priority. If, however, it is
- //deemed that clientInitialProject is not a valid initial selection, initialInitialSelection
- //will be given second priority. Things that could make an initialSelection invalid include
- //1. The containing project contains the Web service for which we are trying to create a client
- //2. The containing project has a J2EE level, server target, and project type combination which
- // is not supported by any of the registered Web service runtimes.
- private IStructuredSelection clientInitialSelection_;
- private IProject clientInitialProject_;
- private String clientInitialComponentName_;
- private IStructuredSelection initialInitialSelection_;
- private IProject initialInitialProject_;
- private String initialInitialComponentName_;
-
- private String clientJ2EEVersion_;
- protected boolean clientNeedEAR_ = true;
-
- private String wsdlURI_;
- private WebServicesParser parser_;
-
-
- public ClientRuntimeSelectionWidgetDefaultingCommand()
- {
- super();
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientIds_ = ids;
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientIds_;
- }
-
- public SelectionListChoices getRuntime2ClientTypes()
- {
- return runtimeClientTypes_;
- }
-
- public String getClientProjectName()
- {
- return getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- }
-
- public String getClientEarProjectName()
- {
- return getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().getSelection();
- }
-
- public String getClientComponentName()
- {
- return clientComponentName_;
- }
-
- public String getClientEarComponentName()
- {
- return clientEarComponentName_;
- }
-
- protected void setClientEARComponentName(String name)
- {
- clientEarComponentName_ = name;
- }
-
- public String getClientComponentType()
- {
- return getRuntime2ClientTypes().getChoice().getList().getSelection();
- }
-
- public String getClientJ2EEVersion()
- {
- return clientJ2EEVersion_;
- }
-
- public IWebServiceClient getWebService()
- {
- return webServiceClient_;
- }
-
- public Environment getEnvironment()
- {
- return environment_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#execute(org.eclipse.wst.command.internal.provisional.env.core.common.Environment)
- */
- public Status execute(Environment environment)
- {
- try
- {
-
- String[] runtimeIds = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId());
- SelectionList list = new SelectionList(runtimeIds, 0);
- Vector choices = new Vector();
- for (int i = 0; i < runtimeIds.length; i++) {
- choices.add(getClientTypesChoice(runtimeIds[i]));
- }
- runtimeClientTypes_ = new SelectionListChoices(list, choices);
- setClientDefaultRuntimeFromPreference();
- setClientDefaultJ2EEVersionFromPreference();
- setClientComponentType();
- clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(clientInitialProject_, clientInitialComponentName_);
- if (clientRuntimeJ2EEType_ != null)
- {
- clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
- setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
- setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
-
- }
- //setClientRuntimeId((WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId()))[0]);
- //setClientComponentType();
- //clientJ2EEVersion_ = (WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels())[0];
-
-
- //If clientInitialProject is the service project, check the initialInitialProject
- //to see if it is valid.
- ///*
- ValidationUtils vu = new ValidationUtils();
- if (vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
- {
- clientRuntimeJ2EEType_ = getClientRuntimeAndJ2EEFromProject(initialInitialProject_, initialInitialComponentName_);
- if (clientRuntimeJ2EEType_ != null)
- {
- clientJ2EEVersion_ = clientRuntimeJ2EEType_.getJ2eeVersionId();
- setClientRuntimeId(clientRuntimeJ2EEType_.getWsrId());
- setClientProjectType(clientRuntimeJ2EEType_.getClientProjectTypeId());
- //Since the original clientIntialProject was invalid but initialInitialProject is valid,
- //reset clientInitalProject_ to be initialInitialProject for the benefit of
- //downstream project defaulting.
- clientInitialProject_ = initialInitialProject_;
- clientInitialComponentName_ = initialInitialComponentName_;
- }
- }
- //*/
-
- setClientDefaultProject();
- setClientDefaultEAR();
- setClientDefaultServer();
- updateClientEARs();
-
- //Calculate default IWebServiceClient
- setDefaultsForExtension(environment);
- return new SimpleStatus("");
- } catch (Exception e)
- {
- //Catch all Exceptions in order to give some feedback to the user
- Status errorStatus = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}),Status.ERROR, e);
- environment.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- }
-
-
- /**
- *
- * @param runtimeId
- * @return
- */
- private SelectionListChoices getClientTypesChoice(String runtimeId)
- {
- String[] clientComponentTypes;
- clientComponentTypes = WebServiceRuntimeExtensionUtils.getClientProjectTypes(clientIds_.getTypeId(), runtimeId);
- SelectionList list = new SelectionList(clientComponentTypes, 0);
- Vector choices = new Vector();
- for (int i = 0; i < clientComponentTypes.length; i++) {
- choices.add(getProjectChoice(clientComponentTypes[i]));
- }
- return new SelectionListChoices(list, choices);
- }
-
- /**
- *
- * @param clientType
- * @return
- *
- */
- private SelectionListChoices getProjectChoice(String clientType)
- {
- //IProject[] projects = ClientProjectTypeRegistry.getInstance().getProjects(clientType);
- //String[] projectNames = new String[projects.length];
- //for (int i = 0; i < projectNames.length; i++)
- // projectNames[i] = projects[i].getName();
- String[] projectNames = J2EEUtils.getProjectsContainingComponentOfType(clientType);
- SelectionList list = new SelectionList(projectNames, 0);
- Vector choices = new Vector();
- for (int i = 0; i < projectNames.length; i++)
- {
- IProject project = ProjectUtilities.getProject(projectNames[i]);
- choices.add(getProjectEARChoice(project));
- }
- return new SelectionListChoices(list, choices, getEARProjects());
- }
-
-/**
- *
- * @param project
- * @return
- */
- protected SelectionListChoices getProjectEARChoice(IProject project)
- {
- String[] flexProjects = getAllFlexibleProjects();
- SelectionList list = new SelectionList(flexProjects, 0);
- return new SelectionListChoices(list, null);
- }
-
- protected SelectionList getEARProjects()
- {
- /*
- IProject[] earProjects = J2EEUtils.getEARProjects();
- String[] earProjectNames = new String[earProjects.length];
- for (int i=0; i<earProjects.length; i++)
- {
- earProjectNames[i] = earProjects[i].getName();
- }
- */
- String[] flexProjects = getAllFlexibleProjects();
- return new SelectionList(flexProjects, 0);
- }
-
- // rskreg
- /*
- private String[] gatherAttributeValues(IConfigurationElement[] elements, String key)
- {
- Vector v = new Vector();
- for (int i = 0; i < elements.length; i++)
- {
- String value = elements[i].getAttribute(key);
- if (value != null && value.length() > 0)
- {
- if (!v.contains(value))
- v.add(value);
- }
- }
- return (String [])v.toArray(new String[0]);
- }
- */
- // rskreg
-
-
- private void setClientDefaultRuntimeFromPreference()
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pRuntimeId = context.getRuntimeId();
-
- //set the client runtime to be the preferred runtime if the client type allows.
- setClientRuntimeId(pRuntimeId);
- }
-
-
- private void setClientRuntimeId(String id)
- {
- String[] clientRuntimeIds = getRuntime2ClientTypes().getList().getList();
- for (int i=0; i<clientRuntimeIds.length;i++)
- {
- if(clientRuntimeIds[i].equals(id))
- {
- getClientTypeRuntimeServer().setRuntimeId(id);
- getRuntime2ClientTypes().getList().setIndex(i);
- break;
- }
- }
- }
-
- private void setClientProjectType(String id)
- {
- String[] clientProjectTypeIds = getRuntime2ClientTypes().getChoice().getList().getList();
- for (int i=0; i<clientProjectTypeIds.length;i++)
- {
- if(clientProjectTypeIds[i].equals(id))
- {
- getRuntime2ClientTypes().getChoice().getList().setIndex(i);
- break;
- }
- }
- }
-
-
- protected void setClientDefaultJ2EEVersionFromPreference()
- {
- if (clientIds_ != null)
- {
- String runtimeId = clientIds_.getRuntimeId();
- if (runtimeId != null)
- {
- //IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
- if (wsrt != null)
- {
- String[] versions = wsrt.getJ2eeLevels();
- if (versions != null && versions.length > 0)
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pJ2EE = context.getJ2EEVersion();
- if (pJ2EE!=null && pJ2EE.length()>0)
- {
- for (int i=0;i<versions.length;i++)
- {
- if (versions[i].equals(pJ2EE))
- {
- clientJ2EEVersion_ = versions[i];
- return;
- }
- }
- }
- clientJ2EEVersion_ = versions[0];
- return;
- }
- }
- }
- }
- }
-
-
- private WSRuntimeJ2EEType getClientRuntimeAndJ2EEFromProject(IProject project, String componentName)
- {
- WSRuntimeJ2EEType cRJ2EE = null;
- //If there is a valid initial selection, use it to determine
- //reasonable J2EE version and Web service runtime values
-
- if (project != null && project.exists())
- {
- boolean isValidComponentType = J2EEUtils.isWebComponent(project, componentName) ||
- J2EEUtils.isEJBComponent(project, componentName) ||
- J2EEUtils.isAppClientComponent(project, componentName) ||
- J2EEUtils.isJavaComponent(project, componentName);
- if (isValidComponentType)
- {
- //WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
-
- //Get the J2EE level
- String versionString = null;
- if (!J2EEUtils.isJavaComponent(project, componentName))
- {
- int versionId = J2EEUtils.getJ2EEVersion(project, componentName);
- versionString = String.valueOf(versionId);
- }
-
- //Get the runtime target of the project
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-
- //Get the client project type
- //String clientProjectTypeId = getClientProjectTypeFromRuntimeId(project, clientIds_.getRuntimeId());
- String clientComponentTypeId = J2EEUtils.getComponentTypeId(project, componentName);
-
- //If the preferred runtime supports this J2EE level and server target, keep it
- if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId())) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget != null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId()))) &&
- (WebServiceRuntimeExtensionUtils.doesRuntimeSupportComponentType(clientIds_.getTypeId(), clientIds_.getRuntimeId(), clientComponentTypeId))
- )
- {
- //Set the J2EE level and web service runtime to match the project
- cRJ2EE = new WSRuntimeJ2EEType();
- cRJ2EE.setJ2eeVersionId(versionString);
- cRJ2EE.setWsrId(clientIds_.getRuntimeId());
- cRJ2EE.setClientProjectTypeId(clientComponentTypeId);
- return cRJ2EE;
- } else
- {
- //Look for a runtime that matches
- String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByClientType(clientIds_.getTypeId());
- for (int i = 0; i < validRuntimes.length; i++)
- {
- //String thisClientProjectTypeId = getClientProjectTypeFromRuntimeId(project, validRuntimes[i]);
- if ((versionString == null || WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i])) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget != null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))) &&
- (WebServiceRuntimeExtensionUtils.doesRuntimeSupportComponentType(clientIds_.getTypeId(), validRuntimes[i], clientComponentTypeId))
- )
- {
- cRJ2EE = new WSRuntimeJ2EEType();
- cRJ2EE.setJ2eeVersionId(versionString);
- cRJ2EE.setWsrId(validRuntimes[i]);
- cRJ2EE.setClientProjectTypeId(clientComponentTypeId);
- return cRJ2EE;
- }
- }
- }
- }
- }
- return cRJ2EE;
- }
-
-
- private void setClientComponentType()
- {
- getRuntime2ClientTypes().getChoice().getList().setIndex(0);
- }
-
- /*
- private void setClientDefaultProjectNew()
- {
- if (clientInitialProject_ != null)
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
- String moduleName = null;
- if (clientInitialComponentName_!=null && clientInitialComponentName_.length()>0)
- {
- moduleName = clientInitialComponentName_;
- }
- else
- {
- moduleName = J2EEUtils.getFirstWebModuleName(clientInitialProject_);
- }
- clientComponentName_ = moduleName;
- String version = String.valueOf(J2EEUtils.getJ2EEVersion(clientInitialProject_, moduleName));
- String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels();
- for (int i=0; i< validVersions.length; i++)
- {
- if (validVersions[i].equals(version))
- {
- clientJ2EEVersion_ = validVersions[i];
- }
- }
- }
- else
- {
- //Pick the first one
- IProject[] projects = WebServiceRuntimeExtensionUtils.getAllProjects();
- if (projects.length>0)
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projects[0].getName());
- String moduleName = J2EEUtils.getFirstWebModuleName(projects[0]);
- clientComponentName_ = moduleName;
- String version = String.valueOf(J2EEUtils.getJ2EEVersion(projects[0], moduleName));
- String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getJ2eeLevels();
- for (int i=0; i< validVersions.length; i++)
- {
- if (validVersions[i].equals(version))
- {
- clientJ2EEVersion_ = validVersions[i];
- }
- }
-
- }
- else
- {
- //there are no projects in the workspace. Pass the default names for new projects.
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- clientComponentName_ = ResourceUtils.getDefaultWebComponentName();
- }
- }
- }
- */
-
- private void setClientDefaultProject()
- {
- //Handle the case where no valid initial selection exists
- if (clientInitialProject_ == null || (clientInitialProject_!=null && clientRuntimeJ2EEType_==null))
- {
- //Select the first existing project that is valid.
- setClientProjectToFirstValid();
- return;
- }
-
- ValidationUtils vu = new ValidationUtils();
- if (!vu.isProjectServiceProject(clientInitialProject_, wsdlURI_, parser_))
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientInitialProject_.getName());
- clientComponentName_ = clientInitialComponentName_;
- }
- else
- {
- setClientProjectToFirstValid();
- }
-
- }
-
-
- private void setClientProjectToFirstValid()
- {
- //WebServiceClientTypeRegistry wsctReg = WebServiceClientTypeRegistry.getInstance();
- ValidationUtils vu = new ValidationUtils();
- String[] projectNames = getRuntime2ClientTypes().getChoice().getChoice().getList().getList();
-
- for (int i=0;i<projectNames.length; i++)
- {
- IProject project = ProjectUtilities.getProject(projectNames[i]);
- IVirtualComponent[] vcs = J2EEUtils.getComponentsByType(project, getClientComponentType());
- if (project.isOpen() && vcs!=null && vcs.length>0)
- {
-
- //Get the runtime target of the project
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-
- for (int j=0; j < vcs.length; j++)
- {
- //Get the J2EE level
- int versionId = J2EEUtils.getJ2EEVersion(vcs[j]);
- String versionString = String.valueOf(versionId);
-
-
-
- if (clientJ2EEVersion_ != null && clientJ2EEVersion_.length()>0 && clientJ2EEVersion_.equals(versionString))
- {
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, clientIds_.getRuntimeId()) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget!=null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, clientIds_.getRuntimeId())))
- )
- {
- if (!vu.isProjectServiceProject(project, wsdlURI_, parser_))
- {
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(projectNames[i]);
- clientComponentName_ = vcs[j].getName();
- return;
- }
- }
- }
- }
- }
- }
-
- //No valid project was found. Enter a new project name.
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- clientComponentName_ = ResourceUtils.getDefaultWebProjectName();
- }
-
-
- protected IResource getResourceFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- return resource;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
-
- private void setClientDefaultEAR()
- {
- //Client-side
- String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
- //IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject);
- String[] clientEARInfo = getDefaultEARFromClientProject(initialClientProject, clientComponentName_);
-
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(clientEARInfo[0]);
- clientEarComponentName_ = clientEARInfo[1];
- }
-
- /*
- private void setClientDefaultEARNew()
- {
- String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
- IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialClientProject, clientComponentName_);
- if (earComps.length>0)
- {
- //Pick the first one
- IVirtualComponent earComp = earComps[0];
- String earProjectName = earComp.getProject().getName();
- String earComponentName = earComp.getName();
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
- clientEarComponentName_ = earComponentName;
- }
- else
- {
- //Component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
- IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
- if (allEarComps.length>0)
- {
- for (int i=0; i<allEarComps.length; i++)
- {
- if (clientJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
- {
- String earProjectName = allEarComps[i].getProject().getName();
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
- clientEarComponentName_ = allEarComps[i].getName();
-
- }
-
- }
- }
- else
- {
- //there are no Ears.
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultClientEARProjectName());
- clientEarComponentName_ = ResourceUtils.getDefaultClientEARComponentName();
- }
-
-
- }
- }
- */
- /**
- *
- * @param project
- * @return
- *
- *
- */
-
- protected String[] getDefaultEARFromClientProject(IProject project, String componentName)
- {
- String[] projectAndComp = new String[2];
- IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(project, componentName);
- if (earComps.length>0)
- {
- //Pick the first one
- IVirtualComponent earComp = earComps[0];
- projectAndComp[0] = earComp.getProject().getName();
- projectAndComp[1]= earComp.getName();
- return projectAndComp;
- //getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
- //clientEarComponentName_ = earComponentName;
- }
-
- //Either project does not exist or component is not associated with any EARs, so pick the first EAR you see with the correct J2EE version.
- IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
- if (allEarComps.length>0)
- {
- for (int i=0; i<allEarComps.length; i++)
- {
- if (clientJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
- {
- String earProjectName = allEarComps[i].getProject().getName();
- projectAndComp[0] = earProjectName;
- projectAndComp[1] = allEarComps[i].getName();
- return projectAndComp;
- //getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(earProjectName);
- //clientEarComponentName_ = allEarComps[i].getName();
-
- }
-
- }
- projectAndComp[0] = ResourceUtils.getDefaultClientEARProjectName();
- projectAndComp[1] = ResourceUtils.getDefaultClientEARComponentName();
- return projectAndComp;
-
- }
- else
- {
- //there are no Ears.
- projectAndComp[0] = ResourceUtils.getDefaultClientEARProjectName();
- projectAndComp[1] = ResourceUtils.getDefaultClientEARComponentName();
- return projectAndComp;
- //getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultClientEARProjectName());
- //clientEarComponentName_ = ResourceUtils.getDefaultClientEARComponentName();
- }
- }
-
- private void setClientDefaultServerNew()
- {
- String initialClientProjectName = runtimeClientTypes_.getChoice().getChoice().getList().getSelection();
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(initialClientProjectName);
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- {
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
- //Pick a compatible existing server if one exists.
- IServer[] servers = ServerSelectionUtils.getCompatibleExistingServers(runtimeTarget);
- if (servers!=null && servers.length>0)
- {
- for (int i=0; i<servers.length; i++)
- {
- String thisFactoryId = servers[0].getServerType().getId();
- //if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(clientIds_.getRuntimeId(), thisFactoryId))
- //{
- //Pick this server and return.
- clientIds_.setServerId(thisFactoryId);
- clientIds_.setServerInstanceId(servers[0].getId());
- return;
- //}
- }
- }
-
- //No compatible existing server, set the factory id to something the runtime supports
- String[] factoryIds = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getServerFactoryIds();
- if (factoryIds!=null && factoryIds.length>0)
- {
- for (int i=0; i<factoryIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(factoryIds[i]);
- if (serverType != null)
- {
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- if (serverRuntimeTypeId.equals(runtimeTargetId))
- {
- //Found a match
- clientIds_.setServerId(factoryIds[i]);
- return;
- }
- }
- }
- }
- else
- {
- //Runtime does not specify any server factory ids
- IServerType[] serverTypes = ServerCore.getServerTypes();
- clientIds_.setServerId(serverTypes[0].getId());
- }
-
- }
- else
- {
- // The project has no server target so pick a server factory id that is supported by the runtime
- String[] fids = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()).getServerFactoryIds();
- if (fids!=null && fids.length>0)
- {
- clientIds_.setServerId(fids[0]);
- }
- else
- {
- //Runtime does not specify any server factory ids
- IServerType[] serverTypes = ServerCore.getServerTypes();
- clientIds_.setServerId(serverTypes[0].getId());
- }
-
- }
- }
-
- private void setClientDefaultServer()
- {
- //Calculate reasonable default server based on initial project selection.
- String initialClientProjectName = runtimeClientTypes_.getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
- if (initialClientProject.exists())
- {
- String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialClientProject, clientComponentName_, clientIds_.getRuntimeId(), true);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- clientIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- clientIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
- else //the project does not exist.
- {
- //Does the EAR exist?
- String initialClientEARProjectName = runtimeClientTypes_.getChoice().getChoice().getChoice().getList().getSelection();
- IProject initialClientEARProject = ProjectUtilities.getProject(initialClientEARProjectName);
- if (initialClientEARProject.exists())
- {
- String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialClientEARProject, clientEarComponentName_, clientIds_.getRuntimeId(), false);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- clientIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- clientIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
- else
- {
- String[] serverInfo = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(clientIds_.getRuntimeId(), clientJ2EEVersion_);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- clientIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- clientIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
-
- }
- }
-
-
- protected void updateClientProject(String projectName, String componentName, String serviceTypeId)
- {
- boolean isEJB = false;
- String implId = WebServiceRuntimeExtensionUtils.getImplIdFromTypeId(serviceTypeId);
- isEJB = (implId.equals("org.eclipse.jst.ws.wsImpl.ejb"));
- String[] updatedNames = ResourceUtils.getClientProjectComponentName(projectName, componentName, isEJB);
- getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(updatedNames[0]);
- clientComponentName_ = updatedNames[1];
-
- }
-
- protected void updateClientEARs()
- {
- //Set EAR selection to null if the project/server defaults imply an EAR should not be created
- String clientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject clientProject = ProjectUtilities.getProject(clientProjectName);
- if (clientProject != null && clientProject.exists())
- {
- //Get the runtime target on the serviceProject
- IRuntime clientTarget = ClientServerSelectionUtils.getRuntimeTarget(clientProjectName);
- String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(clientProject, clientComponentName_));
- if (clientTarget != null)
- {
- if (!ServerUtils.isTargetValidForEAR(clientTarget.getRuntimeType().getId(),j2eeVersion))
- {
- //Default the EAR selection to be empty
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
- clientEarComponentName_="";
- clientNeedEAR_ = false;
- }
- }
-
- }
- else
- {
- //Use the server type
- String clientServerTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(clientIds_.getServerId());
- if (clientServerTargetId!=null && clientServerTargetId.length()>0)
- {
- if (!ServerUtils.isTargetValidForEAR(clientServerTargetId,clientJ2EEVersion_))
- {
- //Default the EAR selection to be empty
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setIndex(-1);
- clientEarComponentName_="";
- clientNeedEAR_ = false;
- }
- }
- }
- }
-
- private void setDefaultsForExtension(Environment env)
- {
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntime(clientIds_.getRuntimeId());
- if (wsrt != null)
- {
- WebServiceClientInfo wsInfo = new WebServiceClientInfo();
-
- wsInfo.setJ2eeLevel(clientJ2EEVersion_);
- wsInfo.setServerFactoryId(clientIds_.getServerId());
- wsInfo.setServerInstanceId(clientIds_.getServerInstanceId());
- wsInfo.setState(WebServiceState.UNKNOWN_LITERAL);
- wsInfo.setWebServiceRuntimeId(clientIds_.getRuntimeId());
- wsInfo.setWsdlURL(wsdlURI_);
-
- environment_ = env;
- webServiceClient_ = wsrt.getWebServiceClient(wsInfo);
- WebServiceScenario scenario = WebServiceScenario.CLIENT_LITERAL;
- if (resourceContext_ != null)
- {
- context_ = new SimpleContext(true, true, true, true, true, true, test_, false, scenario, resourceContext_.isOverwriteFilesEnabled(), resourceContext_
- .isCreateFoldersEnabled(), resourceContext_.isCheckoutFilesEnabled());
- }
- }
-
- }
-
- public void setClientInitialSelection(IStructuredSelection selection)
- {
- clientInitialSelection_ = selection;
- if (clientInitialProject_ == null)
- {
- clientInitialProject_ = getProjectFromInitialSelection(selection);
- clientInitialComponentName_ = getComponentNameFromInitialSelection(selection);
- }
- }
-
- public void setClientInitialProject(IProject clientInitialProject)
- {
- clientInitialProject_ = clientInitialProject;
- }
-
- public void setClientInitialComponentName(String name)
- {
- clientInitialComponentName_ = name;
- }
-
- /**
- * @param initialInitialSelection_ The initialInitialSelection_ to set.
- */
- public void setInitialInitialSelection(IStructuredSelection initialInitialSelection)
- {
- initialInitialSelection_ = initialInitialSelection;
- initialInitialProject_ = getProjectFromInitialSelection(initialInitialSelection);
- initialInitialComponentName_ = getComponentNameFromInitialSelection(initialInitialSelection);
- }
-
- public boolean getClientNeedEAR()
- {
- return clientNeedEAR_;
- }
-
- /**
- * @param parser_ The parser_ to set.
- */
- public void setWebServicesParser(WebServicesParser parser) {
- parser_ = parser;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- wsdlURI_ = wsdlURI;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- private IProject getProjectFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
- IProject p = ResourceUtils.getProjectOf(resource.getFullPath());
- return p;
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- private String getComponentNameFromInitialSelection(IStructuredSelection selection)
- {
- if (selection != null && selection.size() == 1)
- {
- Object obj = selection.getFirstElement();
- if (obj != null)
- {
- try
- {
- IResource resource = ResourceUtils.getResourceFromSelection(obj);
- if (resource==null)
- return null;
-
- IVirtualComponent comp = ResourceUtils.getComponentOf(resource);
- if (comp!=null)
- {
- return comp.getName();
- }
- } catch(CoreException e)
- {
- return null;
- }
- }
- }
- return null;
- }
-
- /*
- private String getClientProjectTypeFromRuntimeId(IProject p, String runtimeId)
- {
- //Navigate the runtimeClientTypes to see if we can navigate from the provided
- //runtime to the provided project's name.
- String pName = p.getName();
- String[] runtimeIds = getRuntime2ClientTypes().getList().getList();
- int numberOfRuntimes = runtimeIds.length;
- //Get the index of the runtimeId we are interested in
- for (int i=0; i<numberOfRuntimes; i++)
- {
- if (runtimeIds[i].equals(runtimeId))
- {
- //Get the list of client project types for this runtimeId
- SelectionListChoices clientProjectTypesToProjects= getRuntime2ClientTypes().getChoice(i);
- String[] clientProjectTypes = clientProjectTypesToProjects.getList().getList();
- for (int j=0; j<clientProjectTypes.length; j++)
- {
- //Get the list of projects for this clientProjectType. If pName
- //is in this list, we know the runtimeId supports this project
- //and we know the client project type.
- String[] clientProjects = clientProjectTypesToProjects.getChoice(j).getList().getList();
- for (int k=0; k<clientProjects.length; k++)
- {
- if (clientProjects[k].equals(pName))
- {
- //Found the project!!
- return clientProjectTypes[j];
- }
- }
- }
-
- }
- }
-
- //We didn't find the project under any of this runtimes client project types.
- //This means that this runtime does not support that client type. Return null
- return null;
- }
- */
-
- protected String[] getAllFlexibleProjects()
- {
- Vector v = new Vector();
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- for (int i = 0; i < projects.length; i++)
- {
- if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
- {
- v.add(projects[i].getName());
- }
- }
-
- return (String[])v.toArray(new String[0]);
-
- }
-
- /**
- * This inner class is being used to pass around Web service runtime
- * and J2EE level information.
- *
- */
- protected class WSRuntimeJ2EEType
- {
- private String wsrId_;
- private String j2eeVersionId_;
- private String clientProjectTypeId; //only used for client-side defaulting
-
- public WSRuntimeJ2EEType()
- {
- //making this ctor public so that subclasses can instantiate.
- }
- /**
- * @return Returns the j2eeVersionId_.
- */
- public String getJ2eeVersionId()
- {
- return j2eeVersionId_;
- }
- /**
- * @param versionId_ The j2eeVersionId_ to set.
- */
- public void setJ2eeVersionId(String versionId_)
- {
- j2eeVersionId_ = versionId_;
- }
- /**
- * @return Returns the wsrId_.
- */
- public String getWsrId()
- {
- return wsrId_;
- }
- /**
- * @param wsrId_ The wsrId_ to set.
- */
- public void setWsrId(String wsrId_)
- {
- this.wsrId_ = wsrId_;
- }
-
- /**
- * @return Returns the clientProjectTypeId.
- */
- public String getClientProjectTypeId()
- {
- return clientProjectTypeId;
- }
- /**
- * @param clientProjectTypeId The clientProjectTypeId to set.
- */
- public void setClientProjectTypeId(String clientProjectTypeId)
- {
- this.clientProjectTypeId = clientProjectTypeId;
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
deleted file mode 100644
index 5f23c64..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java
+++ /dev/null
@@ -1,659 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.internal.FlexibleJavaProjectPreferenceUtil;
-import org.eclipse.wst.server.core.IRuntime;
-
-public class ProjectSelectionWidget extends SimpleWidgetDataContributor {
-
- private final String EAR_PERMITTED_PROJECT_TYPE = "EAR_PERMITTED_PROJECT_TYPE";
- //private final String JAVA_PROJECT_TYPE_ID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- private SelectionListChoices projects_;
-
- private boolean needEAR_;
-
- private TypeRuntimeServer trsIds_;
-
- private String j2eeVersion_;
-
- private String projectTypeId_ = EAR_PERMITTED_PROJECT_TYPE;
-
- private Listener statusListener_;
-
- private Text messageText_;
-
- private boolean isClient_ = false;
-
- private MessageUtils msgUtils;
-
- private byte CREATE_PROJECT = (byte) 1;
-
- private byte CREATE_EAR = (byte) 2;
-
- private byte ADD_EAR_ASSOCIATION = (byte) 4;
-
- private Combo moduleProject_;
- private Combo earProject_;
- private String componentType_;
-
- private ModifyListener moduleProjectListener_;
- private ModifyListener moduleListener_;
- private ModifyListener earProjectListener_;
- private ModifyListener earModuleListener_;
-
- private String initialModuleName_;
-
- /*
- * CONTEXT_ID PWRS0006 for the service-side Web project combo box of the
- * runtime selection Page
- */
- private String INFOPOP_PWRS_COMBO_PROJECT = pluginId_ + ".PWRS0006";
-
- private Combo module_;
-
- /* CONTEXT_ID PWRS0012 for the EAR combo box of the runtime selection Page */
- private String INFOPOP_PWRS_COMBO_EAR = pluginId_ + ".PWRS0012";
-
- private Combo earModule_;
-
- /*
- * Default Constructor
- */
- public ProjectSelectionWidget() {
- }
-
- /*
- * ProjectSelectionWidget @param isClient
- */
- public ProjectSelectionWidget(boolean isClient) {
- this.isClient_ = isClient;
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener) {
- msgUtils = new MessageUtils(pluginId_ + ".plugin", this);
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_);
- boolean displayModules = FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp();
-
- statusListener_ = statusListener;
-
- if (isClient_)
- {
- moduleProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_PROJECT", "LABEL_CLIENT_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- module_ = createCombo(parent, "LABEL_CLIENT_MODULE", "LABEL_CLIENT_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER, displayModules );
- earProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_PROJECT", "LABEL_CLIENT_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- earModule_ = createCombo(parent, "LABEL_CLIENT_EAR_MODULE", "LABEL_CLIENT_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER, displayModules );
- }
- else
- {
- moduleProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_PROJECT", "LABEL_SERVICE_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- module_ = createCombo(parent, "LABEL_SERVICE_MODULE", "LABEL_SERVICE_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER, displayModules );
- earProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_PROJECT", "LABEL_SERVICE_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER );
- earModule_ = createCombo(parent, "LABEL_SERVICE_EAR_MODULE", "LABEL_SERVICE_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER, displayModules );
- }
-
- //module_.addModifyListener(projectListener_);
-
- //earModule_.addModifyListener(earListener_);
- //earModule_.addListener(SWT.Modify, statusListener);
-
- moduleProjectListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleModuleProjectChanged(null);
- statusListener_.handleEvent( null );
- }
- };
-
- moduleListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleModuleChanged();
- statusListener_.handleEvent( null );
- }
- };
-
- earProjectListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- handleEarProjectChanged();
- statusListener_.handleEvent( null );
- }
- };
-
- earModuleListener_ = new ModifyListener()
- {
- public void modifyText(ModifyEvent evt)
- {
- statusListener_.handleEvent( null );
- }
- };
-
- // message area
- messageText_ = uiUtils.createText(parent, "LABEL_NO_LABEL", "LABEL_NO_LABEL", null, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY);
-
- return this;
- }
-
- private void listenersOn()
- {
- module_.addModifyListener( moduleListener_ );
- moduleProject_.addModifyListener( moduleProjectListener_ );
- earProject_.addModifyListener( earProjectListener_ );
- earModule_.addModifyListener( earModuleListener_ );
- }
-
- private void listenersOff()
- {
- module_.removeModifyListener( moduleListener_ );
- moduleProject_.removeModifyListener( moduleProjectListener_ );
- earProject_.removeModifyListener( earProjectListener_ );
- earModule_.removeModifyListener( earModuleListener_ );
- }
-
- private void handleModuleProjectChanged(String moduleName)
- {
- String projectName = moduleProject_.getText();
- IProject project = null;
-
- if( projectName.equals( "" ) )
- {
- module_.setItems( new String[0] );
-
- return;
- }
-
- project = ProjectUtilities.getProject( projectName );
-
-
- IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, componentType_ );
- String[] modules = new String[components.length];
-
- for( int index = 0; index < components.length; index++ )
- {
- modules[index] = components[index].getName();
- }
-
- module_.setItems( modules );
-
- if( modules.length > 0 )
- {
- if (moduleName != null)
- {
- module_.setText(moduleName);
- }
- else
- {
- module_.setText( modules[0] );
- }
-
- }
- else
- {
- module_.setText( projectName );
- }
-
- }
-
- private void handleModuleChanged()
- {
- IVirtualComponent component = getEarModuleForModule();
-
- if( component != null )
- {
- String earProject = component.getProject().getName();
- String componentName = component.getName();
-
- // This will cause the module list to be update via a listener.
- earProject_.setText( earProject );
- earModule_.setText( componentName );
- }
- else
- {
- earProject_.setText( "" );
- earModule_.setText( "" );
- }
-
- updateEAREnabledState();
- }
-
- private void handleEarProjectChanged()
- {
-
- String projectName = earProject_.getText();
-
- if( projectName != null && !projectName.equals( "" ))
- {
- IProject project = ProjectUtilities.getProject( projectName );
-
- IVirtualComponent[] components = J2EEUtils.getComponentsByType( project, J2EEUtils.EAR );
- String[] earModules = new String[components.length];
-
- for( int index = 0; index < components.length; index++ )
- {
- earModules[index] = components[index].getName();
- }
-
- earModule_.setItems( earModules );
-
- if( earModules.length > 0 )
- {
- earModule_.setText( earModules[0] );
- }
- else
- {
- earModule_.setText( projectName );
- }
- }
- else
- {
- earModule_.setItems( new String[0] );
- }
- }
-
- private IVirtualComponent getEarModuleForModule()
- {
- String projectName = moduleProject_.getText();
-
- if( projectName.equals( "" ) )
- {
- return null;
- }
-
- IProject project = ProjectUtilities.getProject( projectName );
- String compName = module_.getText();
-
- IVirtualComponent[] components = J2EEUtils.getReferencingEARComponents( project, compName );
-
- return components.length == 0 ? null : components[0];
- }
-
- public void setProjectChoices(SelectionListChoices projects)
- {
- listenersOff();
-
- projects_ = projects;
-
- String selectedModuleProject = projects.getList().getSelection();
- String selectedEarModuleProject = projects.getChoice().getList().getSelection();
- String[] projectNames = getProjects();
-
- moduleProject_.setItems( projectNames );
- moduleProject_.setText( selectedModuleProject );
- earProject_.setItems( projectNames );
- earProject_.setText( selectedEarModuleProject );
-
- handleModuleProjectChanged(initialModuleName_);
- handleModuleChanged();
- updateEAREnabledState();
- listenersOn();
- }
-
- public SelectionListChoices getProjectChoices()
- {
- return projects_;
- }
-
- public String getComponentName()
- {
- if( FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
- {
- return module_.getText();
- }
- else
- {
- return moduleProject_.getText();
- }
- }
-
- public void setComponentName( String name )
- {
- listenersOff();
- module_.setText( name );
- initialModuleName_ = name;
- listenersOn();
- }
-
- public String getEarComponentName()
- {
- if( FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
- {
- return earModule_.getText();
- }
- else
- {
- return earProject_.getText();
- }
- }
-
- public void setEarComponentName( String name )
- {
- listenersOff();
- earModule_.setText( name );
- listenersOn();
- }
-
- public void setComponentType( String type )
- {
- componentType_ = type;
- }
-
- public boolean getNeedEAR()
- {
- return needEAR_;
- }
-
- public String getProjectName()
- {
- return moduleProject_.getText();
- }
-
- public String getEarProjectName()
- {
- return earProject_.getText();
- }
-
- public void setNeedEAR(boolean b)
- {
- needEAR_ = b;
- }
-
- public void setTypeRuntimeServer(TypeRuntimeServer trs)
- {
- trsIds_ = trs;
- listenersOff();
- updateEAREnabledState();
- listenersOn();
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- listenersOff();
- updateEAREnabledState();
- listenersOn();
- }
-
- public void setProjectTypeId(String id)
- {
- projectTypeId_ = id;
- }
-
- private String[] getProjects()
- {
- IProject[] projects = J2EEUtils.getAllFlexibleProjects();
- String[] projectNames = new String[projects.length];
-
- for( int index = 0; index < projects.length; index++ )
- {
- projectNames[index] = projects[index].getName();
- }
-
- return projectNames;
- }
-
- private void updateEAREnabledState()
- {
- if (projects_ != null)
- {
- if(!projectNeedsEAR(moduleProject_.getText()))
- {
- earModule_.setEnabled(false);
- earProject_.setEnabled(false);
- earModule_.setText("");
- earProject_.setText("");
- needEAR_ = false;
- }
- else
- {
- needEAR_ = true;
- earModule_.setEnabled(true);
- earProject_.setEnabled(true);
- }
- }
- }
-
- private boolean projectNeedsEAR(String projectName)
- {
- if (projectTypeId_.equals(IModuleConstants.JST_UTILITY_MODULE))
- return false;
-
- if (projectName == null || projectName.length()==0)
- return true;
-
- //IProject project = (IProject)((new StringToIProjectTransformer()).transform(projectName));
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectName);
- if (project != null && project.exists())
- {
- //Get the runtime target on the project
- IRuntime target = ServerSelectionUtils.getRuntimeTarget(projectName);
- String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(project));
- if (target != null)
- {
- if (!ServerUtils.isTargetValidForEAR(target.getRuntimeType().getId(),j2eeVersion))
- {
- return false;
- }
-
- }
- }
- else
- {
- //Use the server type
- if (trsIds_ != null)
- {
- String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(trsIds_.getServerId());
- if (targetId!=null && targetId.length()>0)
- {
- if (!ServerUtils.isTargetValidForEAR(targetId,j2eeVersion_))
- {
- return false;
- }
- }
- }
- }
-
- return true;
- }
-
- private Status handleSetMessageText() {
- Status status = new SimpleStatus("");
- try {
- byte result = (byte) 0;
- if (module_.getText().length() != 0 && earModule_.getText().length() != 0) {
- String projectText = moduleProject_.getText();
- String earText = earProject_.getText();
- IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText);
- IProject ear = ResourceUtils.getWorkspaceRoot().getProject(earText);
- if (project != null) {
- if (!project.exists()) {
- result = (byte) (result | CREATE_PROJECT);
- }
- if (!ear.exists()) {
- result = (byte) (result | CREATE_EAR);
- }
- if (project.exists() && ear.exists()) {
- if (!J2EEUtils.isEARAssociated(project, ear)) result = (byte) (result | ADD_EAR_ASSOCIATION);
- }
- }
- }
- if (isClient_) {
- messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_CLIENT_SUB")));
- }
- else {
- messageText_.setText(getValidationMessage(result, msgUtils.getMessage("MSG_SERVICE_SUB")));
- }
- }
- catch (Exception e) {
- return new SimpleStatus("", msgUtils.getMessage("PAGE_MSG_VALIDATION_INTERNAL_ERROR"), Status.ERROR);
- }
- return status;
- }
-
- private String getValidationMessage(byte result, String serviceOrClient) {
- String msg = null;
- switch (result) {
- case 0:
- return "";
- case 1:
- case 5:
- msg = "MSG_PROJECT_WILL_BE_CREATED";
- break;
- case 2:
- case 6:
- msg = "MSG_EAR_WILL_BE_CREATED";
- break;
- case 3:
- case 7:
- msg = "MSG_PROJECT_AND_EAR_CREATED";
- break;
- case 4:
- msg = "MSG_EAR_WILL_BE_ASSOCIATED";
- break;
- }
- return msg != null ? msgUtils.getMessage(msg, new Object[] { serviceOrClient}) : "";
- }
-
- public Status getStatus() {
- Status finalStatus = new SimpleStatus("");
- handleSetMessageText();
- String projectText = moduleProject_.getText();
- String earText = earProject_.getText();
- String moduleText = msgUtils.getMessage( "MSG_MODULE" );
-
- if (projectText==null || projectText.length()==0)
- {
- if (isClient_)
- return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_PROJECT_EMPTY", new String[]{""} ),Status.ERROR);
- else
- return new SimpleStatus("",msgUtils.getMessage("MSG_SERVICE_PROJECT_EMPTY", new String[]{""} ),Status.ERROR);
- }
-
- if (needEAR_ && (earText==null || earText.length()==0))
- {
- if (isClient_)
- return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{""} ),Status.ERROR);
- else
- return new SimpleStatus("",msgUtils.getMessage("MSG_SERVICE_EAR_EMPTY", new String[]{""} ),Status.ERROR);
- }
-
- // Check for empty module names
- if( FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() )
- {
- if( module_ == null || module_.getText().length() == 0 )
- {
- if( isClient_ )
- {
- return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_PROJECT_EMPTY", new String[]{moduleText} ),Status.ERROR);
- }
- else
- {
- return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{moduleText} ),Status.ERROR);
- }
- }
-
- if( needEAR_ && ( earModule_ == null || earModule_.getText().length() == 0 ) )
- {
- if( isClient_ )
- {
- return new SimpleStatus("",msgUtils.getMessage("MSG_CLIENT_EAR_EMPTY", new String[]{moduleText} ),Status.ERROR);
- }
- else
- {
- return new SimpleStatus("",msgUtils.getMessage("MSG_SERVICE_EAR_EMPTY", new String[]{moduleText} ),Status.ERROR);
- }
- }
- }
-
- return finalStatus;
- }
-
- private Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style, boolean displayControl )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( !displayControl )
- {
- Composite dummy1 = new ZeroComposite( parent );
- Composite dummy2 = new ZeroComposite( parent );
-
- dummy1.setVisible( false );
- dummy2.setVisible( false );
-
- parent = dummy2;
- }
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( msgUtils.getMessage( labelName ) );
- label.setToolTipText( msgUtils.getMessage( tooltip ) );
- label.setVisible( displayControl );
- }
-
- Combo combo = new Combo( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- combo.setLayoutData( griddata );
- combo.setToolTipText( msgUtils.getMessage(tooltip));
- combo.setVisible( displayControl );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, pluginId_ + "." + infopop );
-
- return combo;
- }
-
- private class ZeroComposite extends Composite
- {
- public ZeroComposite( Composite parent )
- {
- super( parent, SWT.NONE );
- }
-
- public Point computeSize(int wHint, int hHint, boolean changed)
- {
- return new Point( 0, 0);
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
deleted file mode 100644
index da499cd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/RuntimeServerSelectionWidget.java
+++ /dev/null
@@ -1,256 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime;
-
-import org.eclipse.jface.window.Window;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.RuntimeServerSelectionDialog;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-public class RuntimeServerSelectionWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private Text runtime_;
- private Text server_;
- private Text j2eeVersionText;
- private Composite parent_;
- private boolean isClientContext_;
- private TypeRuntimeServer ids_;
- private String j2eeVersion_;
- private MessageUtils msgUtils_;
- private Listener statusListener_;
-
- /* CONTEXT_ID PWRS0004 for the service-side runtime selection of the runtime selection Page */
- private String INFOPOP_PWRS_GROUP_SERVICE_RUNTIME = pluginId_ + ".PWRS0004";
-
- /* CONTEXT_ID PWRS0005 for the service-sdie server selection of the runtime selection Page */
- private String INFOPOP_PWRS_GROUP_SERVICE_SERVER = pluginId_ + ".PWRS0005";
-
- /* CONTEXT_ID PWRS0009 for the J2EE version selection of the runtime selection Page */
- private String INFOPOP_PWRS_J2EE_VERSION = pluginId_ + ".PWRS0009";
-
- public RuntimeServerSelectionWidget( boolean isClientScenario )
- {
- isClientContext_ = isClientScenario;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#addControls(org.eclipse.swt.widgets.Composite, org.eclipse.swt.widgets.Listener)
- */
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils_, pluginId_ );
-
- parent_ = parent;
- statusListener_ = statusListener;
-
- // Runtime label and text
- runtime_ = uiUtils.createText( parent, "LABEL_RUNTIMES_LIST",
- "TOOLTIP_PWRS_TEXT_RUNTIME",
- INFOPOP_PWRS_GROUP_SERVICE_RUNTIME, SWT.READ_ONLY );
-
- // Server label and text
- server_ = uiUtils.createText( parent, "LABEL_SERVERS_LIST",
- "TOOLTIP_PWRS_TEXT_SERVER",
- INFOPOP_PWRS_GROUP_SERVICE_SERVER, SWT.READ_ONLY );
-
- j2eeVersionText = uiUtils.createText(parent, "LABEL_J2EE_VERSION", "TOOLTIP_PWRS_J2EE_VERSION", INFOPOP_PWRS_J2EE_VERSION, SWT.READ_ONLY);
-
- Button editButton = new Button( parent, SWT.NONE );
- editButton.setText( msgUtils_.getMessage("LABEL_EDIT_BUTTON"));
- editButton.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleEditButton();
- }
- } );
-
- // Dummy label that goes on the right side of the edit button.
- new Label( parent, SWT.NONE );
-
- return this;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer()
- {
- return ids_;
- }
-
- public void setTypeRuntimeServer( TypeRuntimeServer ids )
- {
- ids_ = ids;
- setLabels();
- }
-
- public String getJ2EEVersion()
- {
- return j2eeVersion_;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- this.j2eeVersion_ = j2eeVersion;
- j2eeVersionText.setText((j2eeVersion_ != null) ? J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion_) : msgUtils_.getMessage("LABEL_NA"));
- //setLabels();
- }
-
- private void setLabels()
- {
- // rskreg
- //WebServiceClientTypeRegistry registry = WebServiceClientTypeRegistry.getInstance();
- //String runtimeLabel = registry.getRuntimeLabelById( ids_.getRuntimeId() );
- String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById( ids_.getRuntimeId() );
- String serverLabel = null;
-
- if( ids_.getServerInstanceId() == null )
- {
- // Get the label for the general server type.
- //WebServiceServer server = registry.getWebServiceServerByFactoryId( ids_.getServerId() );
- //serverLabel = server == null ? "" : server.getLabel();
- serverLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(ids_.getServerId());
- }
- else
- {
- // Get the label for the server instance.
- //serverLabel = registry.getServerInstanceLabelFromInstanceId( ids_.getServerInstanceId() );
- serverLabel = WebServiceRuntimeExtensionUtils.getServerInstanceLabelFromInstanceId(ids_.getServerInstanceId());
- }
- // rskreg
- runtimeLabel = runtimeLabel == null ? "" : runtimeLabel;
-
- runtime_.setText( runtimeLabel );
- server_.setText( serverLabel );
- j2eeVersionText.setText((j2eeVersion_ != null) ? J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion_) : msgUtils_.getMessage("LABEL_NA"));
- }
-
- public void handleEditButton()
- {
- byte mode = isClientContext_ ? (byte)1 : (byte)0;
-
- RuntimeServerSelectionDialog dialog
- = dialog = new RuntimeServerSelectionDialog( parent_.getShell(), mode, ids_, j2eeVersion_ );
- dialog.create();
- dialog.handleServerViewSelectionEvent();
- int result = dialog.open();
-
- if (result == Window.OK)
- {
- ids_ = dialog.getTypeRuntimeServer();
- j2eeVersion_ = dialog.getJ2EEVersion();
- setLabels();
- statusListener_.handleEvent(null);
- }
- }
-
- public void addModifyListener(ModifyListener listener)
- {
- if (runtime_ != null)
- runtime_.addModifyListener(listener);
- }
-
- public void removeModifyListener(ModifyListener listener)
- {
- if (runtime_ != null)
- runtime_.removeModifyListener(listener);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus()
- {
- Status status = new SimpleStatus( "" );
- String scenario = isClientContext_ ? msgUtils_.getMessage( "MSG_CLIENT_SUB" )
- : msgUtils_.getMessage( "MSG_SERVICE_SUB" );
-
- // Kludge!!! We shouldn't have to check for blank labels. The defaulting commands should be setting the
- // ids to null if there isn't a valid one. This code should be removed in C4.
-
- // rskreg
- //WebServiceClientTypeRegistry wsctRegistry = WebServiceClientTypeRegistry.getInstance();
- //String runtimeLabel = wsctRegistry.getRuntimeLabelById( ids_.getRuntimeId() );
- String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById( ids_.getRuntimeId() );
- //WebServiceServer server = wsctRegistry.getWebServiceServerByFactoryId( ids_.getServerId() );
- //String serverLabel = server == null ? "" : server.getLabel();
- String serverLabel = WebServiceRuntimeExtensionUtils.getServerLabelById(ids_.getServerId());
- // rskreg
-
- if( ids_.getRuntimeId() == null || runtimeLabel == null || runtimeLabel.equals("" ))
- {
- status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_NO_RUNTIME", new String[]{ scenario } ), Status.ERROR );
- }
- else if( ids_.getServerId() == null || serverLabel.equals( "" ))
- {
- status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_NO_SERVER", new String[]{ scenario } ), Status.ERROR );
- }
-
- //--------- check if WSCT exists for these selections
- if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && isClientContext_)
- {
- // rskreg
- if (!WebServiceRuntimeExtensionUtils.webServiceClientRuntimeTypeExists( ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId()))
- {
- status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );
- }
- /*
- WebServiceServer wss = wsctRegistry.getWebServiceServerByFactoryId(ids_.getServerId());
- if (wss != null)
- {
- String serverTypeId = wss.getId();
- String runtimeId = ids_.getTypeId();
- if (!wsctRegistry.webServiceClientRuntimeTypeExists( serverTypeId, ids_.getRuntimeId(), runtimeId)) {
- status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );
- }
- }
- else
- status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );
- */
- // rskreg
- }
-
- //--------- check if WSSRT exists for these selections
- if (!(ids_.getServerId() == null) && !(ids_.getRuntimeId() == null) && !isClientContext_)
- {
- // rskreg
- //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- //String serverTypeId = wsctRegistry.getWebServiceServerByFactoryId(ids_.getServerId()).getId();
- //if (!wssrtRegistry.isServerRuntimeTypeSupported(serverTypeId, ids_.getRuntimeId(), ids_.getTypeId())) {
- if (!WebServiceRuntimeExtensionUtils.isServerRuntimeTypeSupported(ids_.getServerId(), ids_.getRuntimeId(), ids_.getTypeId())) {
- status = new SimpleStatus( "", msgUtils_.getMessage( "MSG_INVALID_SRT_SELECTIONS", new String[]{ scenario } ), Status.ERROR );
- }
- // rskreg
- }
-
-
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/AddModuleDependenciesCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/AddModuleDependenciesCommand.java
deleted file mode 100644
index 2dbae57..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/AddModuleDependenciesCommand.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.io.IOException;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.IApplicationClientNatureConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.earcreation.AddUtilityJARMapCommand;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EENature;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class AddModuleDependenciesCommand extends SimpleCommand
-{
- private String sampleProject;
- private String sampleEAR;
- private String sampleP;
- private String sampleC;
- private String clientC;
- private String clientP;
- private String clientProject;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String clientJ2EEVersion;
-
- public AddModuleDependenciesCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.AddModuleDependenciesTask", "org.eclipse.jst.ws.internal.consumption.command.common.AddModuleDependenciesTask");
- }
-
- /**
- * Execute WebServerDefaultingTask Set the default server name and id given a
- * deployable.
- */
- public Status execute(Environment env)
- {
- try
- {
-
- if(sampleProject != null){
- int index = sampleProject.indexOf("/");
- sampleP = sampleProject.substring(0,index);
- sampleC = sampleProject.substring(index + 1);
- }
- IProject sampleIProject = (IProject)ProjectUtilities.getProject(sampleP);
-
- if (sampleIProject == null)
- {
- CreateSampleProjectCommand createSample = new CreateSampleProjectCommand();
- createSample.setSampleProject(sampleProject);
- createSample.setSampleProjectEAR(sampleEAR);
- if (sampleEAR!=null && sampleEAR.length()>0)
- createSample.setNeedEAR(true);
- createSample.setExistingServer(sampleExistingServer);
- createSample.setServerFactoryId(sampleServerTypeID);
- createSample.setJ2eeVersion(clientJ2EEVersion);
- Status status = createSample.execute(env);
- }
- IResource res = ResourceUtils.findResource(sampleEAR);
- IProject sampleIEAR = null;
- if (res instanceof IProject)
- sampleIEAR = (IProject)res;
- if (sampleIProject == null)
- return new SimpleStatus("", "", Status.ERROR);
-
- if(clientProject != null){
- int index = clientProject.indexOf("/");
- clientP = clientProject.substring(0,index);
- clientC = clientProject.substring(index + 1);
- }
- IProject clientIProject = ProjectUtilities.getProject(clientP);
-
-
- if (clientIProject != null && !J2EEUtils.isWebComponent(clientIProject, clientC))
- {
- String uri = clientIProject.getName() + ".jar";
- if (ResourceUtils.isTrueJavaProject(clientIProject))
- addJavaProjectAsUtilityJar(clientIProject, sampleIEAR, uri);
- addJAROrModuleDependency(sampleIProject, sampleC, uri);
- addBuildPath(sampleIProject, clientIProject);
- }
- }
- catch (IOException ioe)
- {
- }
- catch (CoreException ce)
- {
- }
- return new SimpleStatus("");
- }
-
- private void addJavaProjectAsUtilityJar(IProject javaProject, IProject earProject, String uri)
- {
- AddUtilityJARMapCommand cmd = new AddUtilityJARMapCommand(earProject, uri, javaProject);
- cmd.execute();
- }
-
- private void addJAROrModuleDependency(IProject project, String compName, String uri) throws IOException, CoreException
- {
- J2EENature nature = null;
- if (J2EEUtils.isWebComponent(project, compName))
- nature = getWebNature(project);
- else if (J2EEUtils.isAppClientComponent(project, compName))
- nature = getAppClientNature(project);
- else if (J2EEUtils.isEJBComponent(project, compName))
- nature = getEJBNature(project);
- if (nature != null)
- {
- ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
- manifest.mergeClassPath(new String[]{uri});
- J2EEProjectUtilities.writeManifest(project, manifest);
- }
- }
-
- private void addBuildPath(IProject referencingProject, IProject referencedProject) throws JavaModelException
- {
- IJavaProject javaProject = JavaCore.create(referencingProject);
- if (javaProject != null)
- {
- IClasspathEntry[] oldCp = javaProject.getRawClasspath();
- IClasspathEntry[] newCp = new IClasspathEntry[oldCp.length];
- for (int i = 0; i < oldCp.length; i++)
- newCp[i] = oldCp[i];
- newCp[newCp.length - 1] = JavaCore.newProjectEntry(referencedProject.getFullPath());
- javaProject.setRawClasspath(newCp, new NullProgressMonitor());
- }
- }
-
- private J2EENature getWebNature(IProject project)
- {
- try
- {
- return (J2EENature)project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
- }
- catch (CoreException ce)
- {
- }
- return null;
- }
-
- private J2EENature getAppClientNature(IProject project)
- {
- for (int i = 0; i < IApplicationClientNatureConstants.APPCLIENT_NATURE_IDS.length; i++)
- {
- try
- {
- return (J2EENature)project.getNature(IApplicationClientNatureConstants.APPCLIENT_NATURE_IDS[i]);
- }
- catch (CoreException ce)
- {
- }
- }
- return null;
- }
-
- private J2EENature getEJBNature(IProject project)
- {
- try
- {
- // ksc return
- // (J2EENature)project.getNature(IEJBNatureConstants.EJB_20_NATURE_ID);
- return (J2EENature)project.getNature(IEJBNatureConstants.NATURE_ID);
- }
- catch (CoreException ce)
- {
- }
- try
- {
- return (J2EENature)project.getNature(IEJBNatureConstants.NATURE_ID);
- }
- catch (CoreException ce)
- {
- }
- return null;
- }
-
- private IProject getEARProject(IProject sampleProject)
- {
- EARNatureRuntime[] natures = J2EEUtils.getEARProjects(sampleProject);
- if (natures != null && natures.length > 0)
- return natures[0].getProject();
- else
- return null;
- }
-
- /**
- * @param proxyProject
- * The proxyProject to set.
- */
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public String getSampleProject()
- {
- return sampleProject;
- }
-
- public void setSampleProjectEAR(String sampleEAR)
- {
- this.sampleEAR = sampleEAR;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setSampleServerTypeID(String sampleServerTypeID)
- {
- this.sampleServerTypeID = sampleServerTypeID;
- }
-
- public void setSampleExistingServer(IServer sampleExistingServer)
- {
- this.sampleExistingServer = sampleExistingServer;
- }
-
- public void setClientJ2EEVersion(String clientJ2EEVersion)
- {
- this.clientJ2EEVersion = clientJ2EEVersion;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
deleted file mode 100644
index 056b782..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestDelegateCommand.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the
-* JBWizard Plugin
-*
-*
-*/
-public class ClientTestDelegateCommand extends SimpleCommand
-{
- private String LABEL = "JSPGenerationTask";
- private String DESCRIPTION = "Run the JSP Generation";
-
- private ScenarioContext scenarioContext;
- private WebServiceTestRegistry testRegistry;
- private SelectionList testFacilities;
- private String folder;
- private String jspFolder;
- private BooleanSelection[] methods;
- private boolean runClientTest=true;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String proxyBean;
- private String sampleProject;
- private String sampleP;
- private String sampleC;
- private String clientProject;
- private String clientP;
- private String clientC;
- private String clientServer;
- private TypeRuntimeServer clientIds;
- private TypeRuntimeServer serverIds;
- private String serviceProject;
- private String serviceP;
- private String serviceC;
- private String wsdlServiceURL;
- private boolean generateProxy;
- private boolean isTestWidget = false;
- private String setEndpointMethod;
- private List endpoints;
-
- public ClientTestDelegateCommand ()
- {
- setDescription(DESCRIPTION);
- setName(LABEL);
- scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- testRegistry = WebServiceTestRegistry.getInstance();
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
- String clientTestID = testFacilities.getSelection();
-
- //Get the webservice extension
-
- WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(clientTestID);
- IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
- TestInfo testInfo = getTestInfo();
-
- status = commandFactoryExecution(iwst.generate(testInfo),env);
- if(status.getSeverity() == Status.ERROR){
- return status;
- }
- status = commandFactoryExecution(iwst.launch(testInfo),env);
- if(status.getSeverity() == Status.ERROR){
- return status;
- }
-
- return status;
- }
-
- private Status commandFactoryExecution(ICommandFactory commandFactory,Environment env)
- {
- Status status = new SimpleStatus( "" );
-
- while(commandFactory.hasNext()){
- status = commandFactory.getNextCommand().execute(env);
- if(status.getSeverity() == Status.ERROR){
- StatusHandler sHandler = env.getStatusHandler();
- sHandler.reportError(status);
- return status;
- }
- }
- return status;
- }
-
-
- //Helper method which sets up the TestInfo data structure
- private TestInfo getTestInfo()
- {
- IServer serviceExistingServer = null;
- String serviceServerTypeID = null;
-
- //service server info
- if(serverIds != null){
- if (serverIds.getServerInstanceId() != null)
- serviceExistingServer = ServerCore.findServer(serverIds.getServerInstanceId());
- }
- if (serviceExistingServer != null)
- serviceServerTypeID = serviceExistingServer.getServerType().getId();
-
-
- if(clientProject != null){
- int index = clientProject.indexOf("/");
- if (index!=-1){
- clientP = clientProject.substring(0,index);
- clientC = clientProject.substring(index + 1);
- }
- }
-
-
- if(sampleProject != null){
- int index = sampleProject.indexOf("/");
- if (index!=-1){
- sampleP = sampleProject.substring(0,index);
- sampleC = sampleProject.substring(index + 1);
- }
- }
-
-
-
- TestInfo testInfo = new TestInfo();
- testInfo.setClientExistingServer(sampleExistingServer);
- testInfo.setClientServerTypeID(sampleServerTypeID);
- testInfo.setJspFolder(jspFolder);
- testInfo.setEndpoint(endpoints);
- testInfo.setGenerationProject(sampleP);
- testInfo.setGenerationModule(sampleC);
- testInfo.setProxyBean(proxyBean);
- testInfo.setSetEndpointMethod(setEndpointMethod);
- testInfo.setClientProject(clientP);
- testInfo.setMethods(methods);
-
- //if this is a client scenario the service stuff is empty
- if(serviceServerTypeID == null){
- serviceServerTypeID = sampleServerTypeID;
- serviceExistingServer = sampleExistingServer;
- }
-
-
- testInfo.setServiceServerTypeID(serviceServerTypeID);
- testInfo.setServiceExistingServer(serviceExistingServer);
- //wsdl stuff
- testInfo.setServiceProject(getWSDLProject());
- testInfo.setWsdlServiceURL(wsdlServiceURL);
- return testInfo;
- }
-
-
-
- //The test facilities retrieved from the extension
- //plus the default
- public void setTestFacility(SelectionList selection)
- {
- testFacilities = selection;
- }
-
- public void setFolder(String folder)
- {
- this.folder = folder;
- }
-
- public void setJspFolder(String jspFolder)
- {
- this.jspFolder = jspFolder;
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setRunClientTest(boolean runClientTest)
- {
- this.runClientTest = runClientTest;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setScenarioContext(ScenarioContext scenarioContext)
- {
- this.scenarioContext = scenarioContext;
- }
-
- public void setClientTestRegistry(WebServiceTestRegistry testRegistry)
- {
- this.testRegistry = testRegistry;
- }
-
- public void setSampleServerTypeID(String sampleServerTypeID)
- {
- this.sampleServerTypeID = sampleServerTypeID;
- }
-
- public void setSampleExistingServer(IServer sampleExistingServer)
- {
- this.sampleExistingServer = sampleExistingServer;
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer ids)
- {
- clientIds = ids;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer ids)
- {
- serverIds = ids;
- }
-
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID;
- }
-
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer;
- }
-
- public void setClientServer(String clientServer)
- {
- this.clientServer = clientServer;
- }
-
- public void setServerProject(String serviceProject)
- {
- this.serviceProject = serviceProject;
- }
-
- public String getWSDLProject()
- {
- if(serviceProject != null){
- int index = serviceProject.indexOf("/");
- if (index!=-1) {
- serviceP = serviceProject.substring(0,index);
- serviceC = serviceProject.substring(index + 1);
- return serviceP;
- }
- }
-
- return clientP;
- }
-
- public void setWsdlURI(String wsdlServiceURL)
- {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public boolean getIsTestWidget()
- {
- return isTestWidget;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
- /**
- * @param endpoint The endpoint to set.
- */
- public void setEndpoint(String endpoint)
- {
- if (endpoint != null && endpoint.length() > 0)
- {
- Vector v = new Vector();
- v.add(endpoint);
- setEndpoints(v);
- }
- }
-
- public void setEndpoints(List endpoints)
- {
- this.endpoints = endpoints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
deleted file mode 100644
index 1c13e3b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestFragment.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-public class ClientTestFragment extends BooleanFragment
-{
- private boolean testService;
- private boolean genProxy;
- private boolean launchedTest = false;
-
- public ClientTestFragment( String id )
- {
- SequenceFragment clientTestRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return testService && genProxy;
- }
- };
- setCondition( condition );
-
- clientTestRoot.add( new SimpleFragment( new WebServiceClientTestArrivalCommand(), "" ) );
- clientTestRoot.add( new SimpleFragment( id ) );
- setTrueFragment( clientTestRoot );
-
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- this.genProxy = genProxy;
- }
-
- public void setTestService( Boolean testService )
- {
- this.testService = testService.booleanValue();
- }
-
- public boolean getLaunchedTest()
- {
- return launchedTest;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
deleted file mode 100644
index f306372..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/ClientTestWidget.java
+++ /dev/null
@@ -1,417 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.common.FolderResourceFilter;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.jst.ws.internal.ui.dialog.DialogUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-
-
-public class ClientTestWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
-
- /*CONTEXT_ID PWSM0001 for the Sample Page*/
- private String INFOPOP_PWSM_PAGE = "PWSM0001";
- //
- private Button testCheckbox_;
- /*CONTEXT_ID PWSM0002 for the Test check box of the Sample Page*/
- private String INFOPOP_PWSM_CHECKBOX_TEST = "PWSM0002";
-
- private Combo testTypeCombo_;
- /*CONTEXT_ID PWSM0003 for the Test Type Combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBOBOX_TEST = "PWSM0003";
-
- private Text jspFolderText_;
- /*CONTEXT_ID PWSM0008 for the JSP Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_JSP_FOLDER = "PWSM0008";
-
- private Button sampleFolderBrowseButton_;
- /*CONTEXT_ID PWSM0009 for the JSP Folder Browse button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE = "PWSM0009";
-
- private Combo projectCombo_;
- /*CONTEXT_ID PWSM0010 for the Project combo box of the Sample Page*/
- private String INFOPOP_PWSM_COMBO_PROJECT = "PWSM0010";
-
- private Tree methodsTree_;
- /*CONTEXT_ID PWSM0005 for the Methods tree of the Sample Page*/
- private String INFOPOP_PWSM_TREE_METHODS = "PWSM0005";
-
- private Button selectAllMethodsButton_;
- /*CONTEXT_ID PWSM0006 for the Select All button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_SELECT_ALL = "PWSM0006";
-
- private Button deselectAllMethodsButton_;
- /*CONTEXT_ID PWSM0007 for the Deselect All button of the Sample Page*/
- private String INFOPOP_PWSM_BUTTON_DESELECT_ALL = "PWSM0007";
-
- private Text sampleFolderText_;
- /*CONTEXT_ID PWSM0014 for the Folder field of the Sample Page*/
- private String INFOPOP_PWSM_TEXT_SAMPLE_FOLDER = "PWSM0014";
- //
- private Button runTestCheckbox_;
- /*CONTEXT_ID PWSM0015 for the run test check box of the Sample Page*/
- private String INFOPOP_PWSM_CHECKBOX_LAUNCH = "PWSM0015";
- //
- private Combo earCombo_;
- /*CONTEXT_ID PWSM0016 for the EAR combo box of the Sample Page*/
- private String INFOPOP_PWSM_EAR_COMBO = "PWSM0016";
-
- private Label projectExistsLabel_;
- private Label earExistsLabel_;
- private Composite comboGroup_;
- private SelectionList testFacilities_;
- private FolderResourceFilter folderFilter_ = new FolderResourceFilter();
- private IStructuredSelection initialSelection_;
- private String launchedServiceTestName;
- private boolean isTestWidget = false;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- isTestWidget = true;
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, pluginId_ );
-
- parent.setToolTipText( msgUtils.getMessage( "TOOLTIP_PWSM_PAGE" ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId_ + "." + INFOPOP_PWSM_PAGE );
-
- testCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_TEST",
- "TOOLTIP_PWSM_CHECKBOX_TEST",
- INFOPOP_PWSM_CHECKBOX_TEST );
- testCheckbox_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleTestButton();
- }
- });
-
- comboGroup_ = uiUtils.createComposite( parent, 3, 5, 0 );
-
- testTypeCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_TEST_TYPES",
- "TOOLTIP_PWSM_COMBOBOX_TEST",
- INFOPOP_PWSM_COMBOBOX_TEST,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- Label dummyLabel = new Label( comboGroup_, SWT.NONE );
-
- projectCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_JSP_PROJECT_NAME",
- "TOOLTIP_PWSM_COMBO_PROJECT",
- INFOPOP_PWSM_COMBO_PROJECT,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- projectCombo_.setEnabled( false );
- projectExistsLabel_ = new Label( comboGroup_, SWT.NONE );
-
-
- earCombo_ = uiUtils.createCombo( comboGroup_, "LABEL_EAR_PROJECTS",
- "TOOLTIP_PWSM_EAR_PROJECT",
- INFOPOP_PWSM_EAR_COMBO,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- earCombo_.setEnabled( false );
- earExistsLabel_ = new Label( comboGroup_, SWT.NONE );
-
-
-
- sampleFolderText_ = uiUtils.createText( comboGroup_, "LABEL_FOLDER_NAME",
- "TOOLTIP_PWSM_TEXT_SAMPLE_FOLDER",
- INFOPOP_PWSM_TEXT_SAMPLE_FOLDER,
- SWT.SINGLE | SWT.BORDER );
-
- sampleFolderText_.addModifyListener( new ModifyListener()
- {
- public void modifyText( ModifyEvent evt )
- {
- handleFolderText();
- }
- });
-
-
- sampleFolderBrowseButton_ = uiUtils.createPushButton( comboGroup_, "BUTTON_BROWSE",
- "TOOLTIP_PWSM_BUTTON_JSP_FOLDER_BROWSE",
- INFOPOP_PWSM_BUTTON_JSP_FOLDER_BROWSE );
- sampleFolderBrowseButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSampleBrowse();
- }
- });
-
- jspFolderText_ = uiUtils.createText( comboGroup_, "LABEL_JSP_FOLDER_NAME",
- "TOOLTIP_PWSM_TEXT_JSP_FOLDER",
- INFOPOP_PWSM_TEXT_JSP_FOLDER,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- jspFolderText_.setEnabled( false );
-
- Group methodsGroup = uiUtils.createGroup( parent, "LABEL_METHODS",
- "TOOLTIP_PWSM_TREE_METHODS", null );
-
- methodsGroup.setLayoutData( uiUtils.createFillAll() );
-
- GridLayout layout = new GridLayout();
- layout.marginHeight = 0;
- layout.marginWidth = 0;
- methodsGroup.setLayout( layout );
-
- // TODO No infopop for this tree.
- methodsTree_ = uiUtils.createTree( methodsGroup, "TOOLTIP_PWSM_TREE_METHODS",
- null,
- SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL | SWT.CHECK );
-
- Composite selectButtons = uiUtils.createComposite( methodsGroup, 2 );
-
- selectAllMethodsButton_
- = uiUtils.createPushButton( selectButtons, "BUTTON_SELECT_ALL",
- "TOOLTIP_PWSM_BUTTON_SELECT_ALL",
- INFOPOP_PWSM_BUTTON_SELECT_ALL );
- selectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( true );
- }
- });
-
- deselectAllMethodsButton_
- = uiUtils.createPushButton( selectButtons, "BUTTON_DESELECT_ALL",
- "TOOLTIP_PWSM_BUTTON_DESELECT_ALL",
- INFOPOP_PWSM_BUTTON_DESELECT_ALL );
- deselectAllMethodsButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleSelectAll( false );
- }
- });
-
- runTestCheckbox_ = uiUtils.createCheckbox( parent, "BUTTON_RUN_TEST",
- "TOOLTIP_PWSM_CHECKBOX_LAUNCH",
- INFOPOP_PWSM_CHECKBOX_LAUNCH );
-
- return this;
- }
-
- private void handleFolderText()
- {
- String folder = sampleFolderText_.getText();
- String jspFolder = jspFolderText_.getText();
- int index = jspFolder.lastIndexOf(Path.SEPARATOR);
- if(index == -1) return;
- jspFolder = jspFolder.substring(0,index + 1);
- jspFolder = jspFolder + folder;
- jspFolderText_.setText(jspFolder);
- }
-
- private void handleSampleBrowse()
- {
- IPath selectedPath = null;
- IResource initialResource = null;
- IPath projectPath = new Path( projectCombo_.getText() ).makeAbsolute();
- IResource project = ResourceUtils.findResource( projectPath );
-// IContainer webModuleContainer = ResourceUtils.getWebModuleServerRoot( (IProject)project);
- IContainer webModuleContainer = J2EEUtils.getFirstWebContentContainer((IProject)project);
- try
- {
- initialResource = ResourceUtils.getResourceFromSelection( initialSelection_ );
- }
- catch( CoreException exc )
- {
- }
-
- if( initialResource == null )initialResource = project;
-
- IResource resource = DialogUtils.browseResources( comboGroup_.getShell(),
- project,
- initialResource,
- folderFilter_ );
-
- if( resource != null )
- {
- selectedPath = resource.getFullPath();
-
- int webModuleSegments = selectedPath.matchingFirstSegments(webModuleContainer.getFullPath());
-
- if ( webModuleSegments < 2 )
- {
- sampleFolderText_.setText("");
- handleFolderText();
- }
- else
- {
- sampleFolderText_.setText(selectedPath.removeFirstSegments(webModuleSegments).toString());
- handleFolderText();
- }
- }
- }
-
- private void handleTestButton()
- {
- boolean enabled = testCheckbox_.getSelection();
-
- testTypeCombo_.setEnabled( enabled );
- sampleFolderText_.setEnabled( enabled );
- methodsTree_.setEnabled( enabled );
- runTestCheckbox_.setEnabled( enabled );
- selectAllMethodsButton_.setEnabled( enabled );
- deselectAllMethodsButton_.setEnabled( enabled );
- sampleFolderBrowseButton_.setEnabled( enabled );
- }
-
- private void handleSelectAll( boolean value )
- {
- TreeItem[] items = methodsTree_.getItems();
-
- for( int i = 0; i < items.length; i++ )
- {
- items[i].setChecked(value);
- }
- }
-
- // Here are the getters and setters for this widget.
- public void setTestService( Boolean testService )
- {
- testCheckbox_.setSelection( testService.booleanValue() );
- handleTestButton();
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testCheckbox_.getSelection() );
- }
-
- public void setTestFacility( SelectionList testFacilities )
- {
- testFacilities_ = testFacilities;
- testTypeCombo_.setItems( testFacilities.getList() );
- testTypeCombo_.select( testFacilities.getIndex() );
- }
-
- public SelectionList getTestFacility()
- {
- testFacilities_.setIndex( testTypeCombo_.getSelectionIndex() );
- return testFacilities_;
- }
-
- public String getTestID()
- {
- return testTypeCombo_.getText();
- }
-
- public void setSampleProject(String clientProject)
- {
- projectCombo_.setItems( new String[]{ clientProject } );
- projectCombo_.select(0);
- }
-
- public void setSampleProjectEAR(String clientProjectEAR)
- {
- earCombo_.setItems( new String[]{ clientProjectEAR } );
- earCombo_.select(0);
- }
-
- public String getFolder()
- {
- return sampleFolderText_.getText();
- }
-
- public void setFolder( String folder )
- {
- sampleFolderText_.setText( folder );
- }
-
- public boolean getIsTestWidget()
- {
- return isTestWidget;
- }
-
- public void setJspFolder( String folder )
- {
- jspFolderText_.setText( folder );
- }
-
- public void setLaunchedServiceTestName (String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- public boolean getRunClientTest()
- {
- return runTestCheckbox_.getSelection();
- }
-
- public void setRunClientTest( boolean value )
- {
- runTestCheckbox_.setSelection( value );
- }
-
- public BooleanSelection[] getMethods()
- {
- TreeItem[] items = methodsTree_.getItems();
- BooleanSelection[] methods = new BooleanSelection[items.length];
-
- for( int index = 0; index < items.length; index++ )
- {
- methods[index] = new BooleanSelection( items[index].getText(), items[index].getChecked() );
- }
-
- return methods;
- }
-
- public void setMethods( BooleanSelection[] methods )
- {
- methodsTree_.removeAll();
-
- for( int index = 0; index < methods.length; index++ )
- {
- if(methods[index] == null)continue;
- TreeItem item = new TreeItem( methodsTree_, SWT.NULL );
- item.setText( methods[index].getValue() );
- item.setChecked( methods[index].isSelected() );
- }
- }
-
- public void setInitialSelection( IStructuredSelection selection )
- {
- initialSelection_ = selection;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
deleted file mode 100644
index 8bedf58..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CopyWebServiceUtilsJarCommand.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-
-
-public class CopyWebServiceUtilsJarCommand extends SimpleCommand {
-
- private static java.lang.String DESCRIPTION = "Copy WebserviceUtils.jar";
- private static java.lang.String LABEL = "CopyWebServiceUtilsJarCommand";
- private String sampleProject;
- private String sampleC;
- private MessageUtils msgUtils;
-
-/**
- * Default CTOR;
- */
-
-
-public CopyWebServiceUtilsJarCommand()
-{
- super(LABEL,DESCRIPTION);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
-}
-
-/**
- * Execute the command
- */
-public Status execute(Environment env)
-{
- try
- {
- env.getProgressMonitor().report( msgUtils.getMessage( "PROGRESS_INFO_COPY_WEBSERVICE_UTILS" ) );
- IProject sampleIProject = ProjectUtilities.getProject(sampleProject);
- IPath webModulePath = J2EEUtils.getWebContentPath(sampleIProject, sampleC);
- if (webModulePath == null)
- return new SimpleStatus(WebServiceConsumptionUIPlugin.ID,msgUtils.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
-
- Status status = copyIFile("webserviceutils.jar",webModulePath,"WEB-INF/lib/webserviceutils.jar", WebServiceConsumptionPlugin.getInstance(),env);
- if(status.getSeverity() == Status.ERROR){
- StatusHandler sHandler = env.getStatusHandler();
- Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"), Status.ERROR);
- sHandler.reportError(errorStatus);
- return status;
- }
-
-
- }
- catch (Exception e) {
- StatusHandler sHandler = env.getStatusHandler();
- Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"), Status.ERROR);
- sHandler.reportError(errorStatus);
- return new SimpleStatus(WebServiceConsumptionUIPlugin.ID,msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"),Status.ERROR,e);
- }
- return new SimpleStatus("");
-}
-
-/**
- *
- */
-private Status copyIFile(String source, IPath targetPath, String targetFile,Environment env)
-{
- return copyIFile(source, targetPath, targetFile, WebServicePlugin.getInstance(),env);
-}
-
-/**
- *
- */
-private Status copyIFile(String source, IPath targetPath, String targetFile, Plugin plugin,Environment env)
-{
-
- if (plugin != null)
- {
- IPath target = targetPath.append(new Path(targetFile));
-
- env.getProgressMonitor().report( msgUtils.getMessage( "PROGRESS_INFO_COPYING_FILE" ) );
- try
- {
- ResourceContext context = new TransientResourceContext();
- context.setOverwriteFilesEnabled(true);
- context.setCreateFoldersEnabled(true);
- context.setCheckoutFilesEnabled(true);
- IResource resource = FileResourceUtils.findResource(target);
- if(resource != null) return new SimpleStatus("");
- IFile file = FileResourceUtils.createFile(context,
- target,
- plugin.openStream(new Path(source)),
- env.getProgressMonitor(),
- env.getStatusHandler());
- }
- catch (Exception e) {
- return new SimpleStatus(WebServiceConsumptionUIPlugin.ID,msgUtils.getMessage("MSG_ERROR_FILECOPY_WEBSERVICE_UTILS"),Status.ERROR,e);
- }
- }
- return new SimpleStatus("");
-}
-
-public void setSampleProject(String sampleProject)
-{
- this.sampleProject = sampleProject;
-}
-
-public void setSampleComponent(String sampleComponent){
- this.sampleC = sampleComponent;
-}
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
deleted file mode 100644
index 8732489..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/CreateSampleProjectCommand.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateWebProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class CreateSampleProjectCommand extends SimpleCommand
-{
- private String sampleProject;
- private String sampleProjectEar;
- private IServer existingServer;
- private String serverFactoryId;
- private boolean needEAR;
- private String j2eeVersion;
-
-
- public CreateSampleProjectCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.ui.wizard.client.common.CreateSampleProjectCommand","org.eclipse.jst.ws.internal.consumption.ui.wizard.client.common.CreateSampleProjectCommand");
- }
-
- public Status execute(Environment env)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- if (!root.getProject(sampleProject).exists() || !root.getProject(sampleProjectEar).exists())
- {
- CreateWebProjectCommand c = new CreateWebProjectCommand();
- c.setProjectName(sampleProject);
- c.setEarProjectName(sampleProjectEar);
- c.setExistingServer(existingServer);
- c.setServerFactoryId(serverFactoryId);
- c.setNeedEAR(needEAR);
- c.setJ2EEVersion(j2eeVersion);
- return c.execute(env);
- }
- return new SimpleStatus("");
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setSampleProjectEAR(String sampleProjectEar)
- {
- this.sampleProjectEar = sampleProjectEar;
- }
-
- public void setExistingServer(IServer existingServer) {
-
- this.existingServer = existingServer;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- /**
- * @param needEAR The needEAR to set.
- */
- public void setNeedEAR(boolean needEAR)
- {
- this.needEAR = needEAR;
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- public void setJ2eeVersion(String version)
- {
- j2eeVersion = version;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
deleted file mode 100644
index 855c35f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishDefaultCommand.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-
-/*
-* The JSPGeneration task runs the jsp generation engine found in the
-* JBWizard Plugin
-*
-*
-*/
-public class FinishDefaultCommand extends SimpleCommand
-{
- private String LABEL = "JSPGenerationTask";
- private String DESCRIPTION = "Run the JSP Generation";
-
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private String existingServerId_;
- private String sampleServerInstanceId;
-
-
- public FinishDefaultCommand ()
- {
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
- if(sampleServerInstanceId != null){
- sampleExistingServer = ServerCore.findServer(sampleServerInstanceId);
- if (sampleExistingServer != null)
- sampleServerTypeID = sampleExistingServer.getServerType().getId();
-
- }
- return status;
-
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.sampleServerInstanceId = serverInstanceId;
- }
-
- public String getSampleServerTypeID()
- {
- return sampleServerTypeID;
-
- }
-
- public IServer getSampleExistingServer()
- {
- return sampleExistingServer;
- }
-
- public void setExistingServerId(String existingServerId)
- {
- existingServerId_ = existingServerId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
deleted file mode 100644
index 377527c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishJavaTestFragment.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishJavaTestFragment extends BooleanFragment
-{
- private boolean generateProxy;
-
- public FinishJavaTestFragment()
- {
- SequenceFragment javaTestRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return generateProxy;
- }
- };
- setCondition(condition);
- javaTestRoot.add(new SimpleFragment(new TestClientDepartureInitCommand(), ""));
- javaTestRoot.add(new SimpleFragment(new AddModuleDependenciesCommand(), ""));
- javaTestRoot.add(new SimpleFragment(new BuildProjectCommand(), ""));
- setTrueFragment(javaTestRoot);
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public void setIsJSPGen(boolean jspGen)
- {
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
deleted file mode 100644
index 5000b77..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/FinishTestFragment.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class FinishTestFragment extends BooleanFragment{
-
- private boolean isTestWidget;
- private boolean launchedTest;
- private boolean generateProxy;
- private String launchedServiceTestName;
- private boolean testService;
- private String testID;
- public FinishTestFragment()
- {
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- if(!testService) return false;
- if(launchedServiceTestName == null) return true;
- if(launchedServiceTestName != null)
- if((!launchedServiceTestName.equals("") && (!isPreferedAWSDLTest() || (isTestWidget && isClientTestJava())) && generateProxy) || launchedServiceTestName.equals("")) return true;
-
- return false;
- }
- };
-
- setTrueFragment(new WebServiceTestClientDepartureFragment());
- setCondition(condition);
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
- public boolean isPreferedAWSDLTest()
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[0]);
- if(wscte.testWSDL())
- return true;
- return false;
- }
-
- public boolean isClientTestJava()
- {
- if(testID == null) return false;
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testID);
- if(!wscte.testWSDL())
- return true;
- return false;
- }
-
-
- public void setTestService(boolean testService)
- {
- this.testService = testService;
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public void setTestID(String testID)
- {
- this.testID = testID;
- }
-
- public void setIsTestWidget(boolean isTestWidget)
- {
- this.isTestWidget = isTestWidget;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
deleted file mode 100644
index 1df7d18..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestClientDepartureInitCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class TestClientDepartureInitCommand extends SimpleCommand
-{
-
- private boolean forceBuild;
-
- public TestClientDepartureInitCommand()
- {
- forceBuild = true;
- }
-
- public boolean getForceBuild()
- {
- return forceBuild;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
deleted file mode 100644
index 6db63c8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestDefaultingFragment.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TestDefaultingFragment extends SimpleCommand
-{
-
- private WebServiceTestRegistry testRegistry;
- private SelectionList testFacilities;
- private String launchedServiceTestName;
- private ScenarioContext scenarioContext;
-
-
- public Status execute(Environment env)
- {
- SimpleStatus status = new SimpleStatus("");
-
- scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- // test facilities
- selectTestFacility();
- return status;
- }
-
- // The test facilities retrieved from the extension
- // plus the default
- public SelectionList getTestFacility()
- {
- return testFacilities;
- }
-
-
-
- // ***********************
- // This method uses the preference to
- // select the correct test facility
- //
- //***********************
- private void selectTestFacility()
- {
- //if we find something we launched earlier
- //put it on the bottom
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
- String[] newTestTypes = new String[testTypes.length];
- boolean launched = false;
- int j = 0;
- for(int i = 0;i<testTypes.length;i++){
- if(testTypes[i].equals(launchedServiceTestName))
- launched = true;
- else{
- newTestTypes[j] = testTypes[i];
- j++;
- }
- }
-
- if(launched)
- newTestTypes[testTypes.length - 1] = launchedServiceTestName;
-
- testFacilities = new SelectionList(newTestTypes,0);
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
deleted file mode 100644
index b894a7c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/TestWebServiceClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.ws.internal.provisional.wsrt.AbstractWebServiceClient;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceClientInfo;
-
-public class TestWebServiceClient extends AbstractWebServiceClient {
-
- public TestWebServiceClient(WebServiceClientInfo clientInfo){
- super(clientInfo);
- }
-
- public ICommandFactory assemble(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear){
- return null;
- }
-
- public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear){
- return null;
- }
-
-
- public ICommandFactory develop(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear){
- return null;
- }
-
- public ICommandFactory install(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear){
- return null;
- }
-
-
- public ICommandFactory run(Environment env, IContext ctx, ISelection sel,
- String project, String module, String earProject, String ear){
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
deleted file mode 100644
index 07f4368..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLFinishFragment.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLFinishFragment extends BooleanFragment{
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
deleted file mode 100644
index 9b9cd7a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WSDLTestLaunchCommand.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 4, 2004
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.Command;
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-/**
- * @author gilberta
- *
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class WSDLTestLaunchCommand extends SimpleCommand
-{
- private String testID;
- private String launchedServiceTestName;
- private TypeRuntimeServer serviceids;
- private String serverProject;
- private String serverModule;
- private String wsdlURI;
- private MessageUtils msgUtils;
- private boolean externalBrowser;
- private List endpoints;
- private IServer serviceExistingServer = null;
- private String serviceServerTypeID = null;
- private String serviceServerInstanceId = null;
-
- public WSDLTestLaunchCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
-
- WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
- WebServiceTestExtension wscte = (WebServiceTestExtension)testRegistry.getWebServiceExtensionsByName(testID);
- IWebServiceTester iwst = (IWebServiceTester)wscte.getWebServiceExecutableExtension();
- TestInfo testInfo = getTestInfo();
-
-
- status = commandFactoryExecution(iwst.launch(testInfo),env);
-
- //Dont need to shut everything down because the wsdl test doesnt work
- if(status.getSeverity() != Status.OK){
- StatusHandler sHandler = env.getStatusHandler();
- Status infoStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST"), Status.INFO);
- sHandler.reportInfo(infoStatus);
- return infoStatus;
- }
- return status;
-
- }
-
- private Status commandFactoryExecution(ICommandFactory commandFactory,Environment env)
- {
- Status status = new SimpleStatus( "" );
- while(commandFactory.hasNext()){
- Command command = commandFactory.getNextCommand();
- if (command != null)
- status = command.execute(env);
- if(status.getSeverity() == Status.ERROR){
- StatusHandler sHandler = env.getStatusHandler();
- sHandler.reportError(status);
- return status;
- }
- }
- return status;
- }
-
-
- private TestInfo getTestInfo()
- {
- // get the server stuff
- if (serviceids.getServerInstanceId() != null)
- serviceExistingServer = ServerCore.findServer(serviceids.getServerInstanceId());
- else if (serviceServerInstanceId!=null)
- serviceExistingServer = ServerCore.findServer(serviceServerInstanceId);
-
- if (serviceExistingServer != null)
- serviceServerTypeID = serviceExistingServer.getServerType().getId();
- else
- serviceServerTypeID = serviceids.getServerId();
- // server will be created in ServerDeployableConfigurationCommand
-
- TestInfo testInfo = new TestInfo();
- if (serviceExistingServer!=null)
- testInfo.setServiceExistingServer(serviceExistingServer);
- testInfo.setServiceServerTypeID(serviceServerTypeID);
- testInfo.setServiceProject(serverProject);
- testInfo.setWsdlServiceURL(wsdlURI);
- testInfo.setEndpoint(endpoints);
- return testInfo;
-
- }
-
-
- public void setTestID(String testID)
- {
- this.testID = testID;
- }
-
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = serverProject;
- }
-
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
- {
- this.serviceids = serviceids;
- }
-
- public void setExternalBrowser(boolean externalBrowser)
- {
- this.externalBrowser = externalBrowser;
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-
-public String getServerModule() {
- return serverModule;
-}
-
-public void setServerModule(String serverModule) {
- this.serverModule = serverModule;
-}
-
-public void setServiceServerInstanceId(String ssInstanceId){
- this.serviceServerInstanceId = ssInstanceId;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
deleted file mode 100644
index cbaf9d6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceClientTestArrivalCommand.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import java.util.List;
-import java.util.ListIterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.server.core.IServer;
-
-
-/**
-* This task sets up all the defaults for the webservice test
-* client page
-*
-*/
-public class WebServiceClientTestArrivalCommand extends SimpleCommand
-{
- public static final String DEFAULT_WEB_MODULE_ROOT = "WebContent";
- public static final String DEFAULT_SAMPLE_WEB_PROJECT_EXT = "Sample";
- public static final String DEFAULT_SAMPLE_EAR_PROJECT_EXT = "EAR";
-
- private String LABEL = "WebServiceClientTestArrivalTask";
- private String DESCRIPTION = "default actions";
- private MessageUtils msgUtils;
- public static String SAMPLE_DIR = "sample";
- public String SET_ENDPOINT = "setEndPoint(java.net.URL)";
- public String GET_ENDPOINT = "getEndPoint()";
-
- private String PROXY = "Proxy";
-
- private ScenarioContext scenarioContext;
-
-
- private String clientProject;
- private String clientP;
- private String clientComponent;
- private IProject clientIProject;
- private String clientProjectEAR;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
- private WebServiceTestRegistry testRegistry;
- private SelectionList testFacilities;
- private String folder;
- private String jspFolder;
- private BooleanSelection[] methods;
- private String proxyBean;
- private SelectionListChoices runtime2ClientTypes;
- private String sampleProject;
- private String sampleP;
- private String sampleC;
- private String sampleEAR;
- private TypeRuntimeServer clientIds;
- private String j2eeVersion;
-
- private String launchedServiceTestName;
- private boolean runClientTest=true;
-
- /**
- * Constructs a new WebServiceClientTestArrivalTask object with the given label and description.
- */
- public WebServiceClientTestArrivalCommand ()
- {
- setDescription(DESCRIPTION);
- setName(LABEL);
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
-
- scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- testRegistry = WebServiceTestRegistry.getInstance();
- }
-
- public Status execute(Environment env)
- {
-
- Status status = new SimpleStatus( "" );
-
- sampleProjectAndEarSetup();
-
- //Get the sample Folder ready
- StringBuffer sb = new StringBuffer();
- IProject project = ProjectUtilities.getProject(sampleP);
- IPath path = J2EEUtils.getWebContentPath(project,sampleC);
-
-
- sb.append("/").append(path.toString()).append("/");
- folder = SAMPLE_DIR + getBean();
-
- sb.append(folder);
- jspFolder = sb.toString();
-
- //get the method names ready
- //find the full path of the file in the project
- /*
- * Getting the method names using javamof introspection
- */
- if(proxyBean == null){
- StatusHandler sHandler = env.getStatusHandler();
- Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED"), Status.ERROR);
- sHandler.reportError(errorStatus);
- return errorStatus;
-
- }
-
-
- JavaMofReflectionCommand javamofcommand = new JavaMofReflectionCommand();
- javamofcommand.setProxyBean(proxyBean);
- javamofcommand.setClientProject(clientP);
-
-
-
- try{
- Status mofStatus = javamofcommand.execute(env);
- if(mofStatus.getSeverity() == Status.ERROR)
- return mofStatus;
- }catch(Exception exc){
- StatusHandler sHandler = env.getStatusHandler();
- Status errorStatus = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_JTS_PROXY_NOT_COMPILED"), Status.ERROR);
- sHandler.reportError(errorStatus);
- return errorStatus;
- }
- JavaHelpers javaHelpers = javamofcommand.getJavaClass();
- if (javaHelpers == null) return status;
-
- JavaClass javaClass = null;
- if(javaHelpers instanceof JavaClass)
- javaClass = (JavaClass)javaHelpers;
- else return status;
- List methodList = javaClass.getPublicMethods();
- BooleanSelection[] tempMethods = new BooleanSelection[methodList.size()];
- ListIterator listIterator = methodList.listIterator();
-
- int j = 0;
- while (listIterator.hasNext())
- {
- Method method = (Method)listIterator.next();
- if(method.isConstructor()) continue;
- String signature = method.getMethodElementSignature();
-
- tempMethods[j] = new BooleanSelection( method.getMethodElementSignature(), true);
- j++;
- }
- methods = tempMethods;
- return status;
- }
-
-
- public static String WEBID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
- public static String EJBID = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
- public static String APPCLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
-
-
- private void sampleProjectAndEarSetup()
- {
- if(clientProject == null) return;
- else{
- int index = clientProject.indexOf("/");
- clientP = clientProject.substring(0,index);
- clientComponent = clientProject.substring(index + 1);
- }
-
- clientIProject = (IProject)ProjectUtilities.getProject(clientP);
- //move to the web level
- SelectionListChoices slc = runtime2ClientTypes.getChoice();
- String projectType = slc.getList().getSelection();
- if(projectType.equals(IModuleConstants.JST_WEB_MODULE)){
- sampleProject = clientProject;
- sampleP = clientP;
- sampleC = clientComponent;
- }
- else{
- sampleProject = clientProject + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
- sampleP = clientP;
- sampleC = clientComponent + DEFAULT_SAMPLE_WEB_PROJECT_EXT;
- }
- sampleEAR = slc.getChoice().getChoice().getList().getSelection();
- if (sampleEAR == null || sampleEAR.length()==0)
- {
- //Create a default name if an EAR is needed.
- //Use the server type
- String targetId = ServerUtils.getRuntimeTargetIdFromFactoryId(clientIds.getServerId());
- if (targetId!=null && targetId.length()>0)
- {
- if (ServerUtils.isTargetValidForEAR(targetId,j2eeVersion))
- {
- sampleEAR = (new StringBuffer(sampleProject)).append(DEFAULT_SAMPLE_EAR_PROJECT_EXT).toString();
- }
- }
- }
- }
-
- //getters and setters
-
- private String getBean()
- {
- int index = proxyBean.lastIndexOf(".");
- String end = "";
- if(index != -1){
- end = proxyBean.substring(index + 1);
- }
- String bean = end.substring(0,end.length());
-
- return bean;
- }
-
-
- public boolean getRunClientTest()
- {
- return runClientTest;
- }
-
- public String getFolder()
- {
- return folder;
- }
-
- public String getJspFolder()
- {
- return jspFolder;
- }
-
- public BooleanSelection[] getMethods()
- {
- return methods;
- }
-
- public String getSampleProjectEAR()
- {
- return sampleEAR;
- }
-
- public String getSampleProject()
- {
- return sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public String getProxyBean()
- {
- return proxyBean;
- }
-
- public void setClientProjectEAR(String clientProjectEAR)
- {
- this.clientProjectEAR = clientProjectEAR;
- }
-
- public void setRuntime2ClientTypes( SelectionListChoices selectionList )
- {
- runtime2ClientTypes = selectionList;
- }
-
- public void setLaunchedServiceTestName(String launchedServiceTestName)
- {
- this.launchedServiceTestName = launchedServiceTestName;
- }
- /**
- * @param clientIds The clientIds to set.
- */
- public void setClientIds(TypeRuntimeServer clientIds)
- {
- this.clientIds = clientIds;
- }
-
- /**
- * @param version The j2eeVersion to set.
- */
- public void setJ2eeVersion(String version)
- {
- j2eeVersion = version;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
deleted file mode 100644
index a980af0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/WebServiceTestClientDepartureFragment.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.BuildProjectCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestClientDepartureFragment extends SequenceFragment
-{
- public WebServiceTestClientDepartureFragment()
- {
- add(new SimpleFragment(new FinishDefaultCommand(),""));
- add(new FinishJavaTestFragment());
- add(new SimpleFragment(new ClientTestDelegateCommand(),""));
- }
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataRegistry.addMapping(TestClientDepartureInitCommand.class, "ForceBuild",BuildProjectCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleServerTypeID",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(FinishDefaultCommand.class, "SampleExistingServer",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(AddModuleDependenciesCommand.class, "sampleProject",BuildProjectCommand.class);
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
deleted file mode 100644
index fcd2a22..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/ExplorerServiceTestCommand.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.ext.test.WSDLTestFinishCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-
-public class ExplorerServiceTestCommand extends SimpleCommand implements WSDLTestFinishCommand
-{
-
- private String LABEL = "ExplorerServiceTestCommand";
- private String DESCRIPTION = "Launch the Explorer";
- private boolean externalBrowser = true;
- private String wsdlServiceURL;
- private String serviceServerTypeID;
- private IServer serviceExistingServer;
- private String serviceProject;
- private List endpoints;
-
- /**
- * Constructs a new WebServiceExplorerLaunch object with the given label and description.
- */
- public ExplorerServiceTestCommand ()
- {
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
-
- StartProjectCommand spc = new StartProjectCommand( true );
- spc.setServiceServerTypeID(serviceServerTypeID);
- spc.setServiceExistingServer(serviceExistingServer);
- IProject project = (IProject) ResourceUtils.findResource(serviceProject);
- spc.setServiceProject(project);
- spc.setIsWebProjectStartupRequested(true);
-
- status = spc.execute(env);
- if (status.getSeverity() == Status.ERROR)
- return status;
-
- WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
- launchCommand.setForceLaunchOutsideIDE(externalBrowser);
- Vector launchOptionVector = new Vector();
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,wsdlServiceURL));
- if (endpoints != null)
- for (Iterator it = endpoints.iterator(); it.hasNext();)
- launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
- launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
- status = launchCommand.execute(env);
- return status;
- }
-
- public void setExternalBrowser(boolean externalBrowser)
- {
- this.externalBrowser = externalBrowser;
- }
-
- public void setWsdlServiceURL(String wsdlServiceURL)
- {
- this.wsdlServiceURL = wsdlServiceURL;
- }
-
- public void setServerTypeID(String serviceServerTypeID)
- {
- this.serviceServerTypeID = serviceServerTypeID;
- }
-
- public void setExistingServer(IServer serviceExistingServer)
- {
- this.serviceExistingServer = serviceExistingServer;
- }
-
- public void setServiceProject(String serviceProject)
- {
- this.serviceProject = serviceProject;
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
deleted file mode 100644
index be7603a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEGenerateCommand.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.explorer.LaunchOption;
-import org.eclipse.wst.ws.internal.explorer.LaunchOptions;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-import org.eclipse.wst.ws.internal.explorer.plugin.ExplorerPlugin;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class WSEGenerateCommand extends SimpleCommand {
-
- private TestInfo testInfo;
- private Model proxyModel;
-
- public WSEGenerateCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
-
- StartProjectCommand spc = new StartProjectCommand( true );
- spc.setServiceServerTypeID(testInfo.getServiceServerTypeID());
- spc.setServiceExistingServer(testInfo.getServiceExistingServer());
- IProject project = (IProject) ProjectUtilities.getProject(testInfo.getServiceProject());
- spc.setServiceProject(project);
- spc.setIsWebProjectStartupRequested(true);
-
- status = spc.execute(env);
- if (status.getSeverity() == Status.ERROR)
- return status;
-
- WSExplorerLauncherCommand launchCommand = new WSExplorerLauncherCommand();
- launchCommand.setForceLaunchOutsideIDE(false);
- Vector launchOptionVector = new Vector();
- String stateLocation = ExplorerPlugin.getInstance().getPluginStateLocation();
- String defaultFavoritesLocation = ExplorerPlugin.getInstance().getDefaultFavoritesLocation();
- launchOptionVector.add(new LaunchOption(LaunchOptions.STATE_LOCATION,stateLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.DEFAULT_FAVORITES_LOCATION,defaultFavoritesLocation));
- launchOptionVector.add(new LaunchOption(LaunchOptions.WSDL_URL,testInfo.getWsdlServiceURL()));
- if (testInfo.getEndpoint() != null)
- for (Iterator it = testInfo.getEndpoint().iterator(); it.hasNext();)
- launchOptionVector.add(new LaunchOption(LaunchOptions.WEB_SERVICE_ENDPOINT, it.next().toString()));
- launchCommand.setLaunchOptions((LaunchOption[])launchOptionVector.toArray(new LaunchOption[0]));
- status = launchCommand.execute(env);
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
deleted file mode 100644
index 6ab3b93..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WSEWebServiceTester.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class WSEWebServiceTester implements IWebServiceTester {
-
- public ICommandFactory generate(TestInfo testInfo){
- Vector commands = new Vector();
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory launch(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new WSEGenerateCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
deleted file mode 100644
index 22b35f6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/explorer/WebServiceExplorerExecutable.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.explorer;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.jst.ws.internal.ext.WebServiceFinishCommand;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceExplorerExecutable implements WebServiceExecutable
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public WebServiceFinishCommand getFinishCommand()
- {
- return new ExplorerServiceTestCommand();
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
deleted file mode 100644
index 1ce5e1c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCGenerateCommand.java
+++ /dev/null
@@ -1,126 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class GSTCGenerateCommand extends SimpleCommand {
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private TestInfo testInfo;
- private Model proxyModel;
-
- public GSTCGenerateCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
- CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();
- copy.setSampleProject(testInfo.getGenerationProject());
- copy.setSampleComponent(testInfo.getGenerationModule());
- status = copy.execute(env);
- if (status.getSeverity() == Status.ERROR) return status;
- status = createModel(env);
- if (status.getSeverity() == Status.ERROR) return status;
- status = generatePages(env);
- if (status.getSeverity() == Status.ERROR) return status;
- return status;
- }
-
- //create the model from the resource
- private Status createModel(Environment env) {
- JavaToModelCommand jtmc = new JavaToModelCommand();
- jtmc.setMethods(testInfo.getMethods());
- jtmc.setClientProject(testInfo.getClientProject());
- jtmc.setProxyBean(testInfo.getProxyBean());
- Status status = jtmc.execute(env);
- if (status.getSeverity() == Status.ERROR) return status;
- proxyModel = jtmc.getDataModel();
- return status;
- }
-
- /**
- * Generate the four jsps that make up this
- * sample app.
- */
- private Status generatePages(Environment env)
- {
- Status status = new SimpleStatus( "" );
- IPath fDestinationFolderPath = new Path(testInfo.getJspFolder());
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
- IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
- IFile fileTest = fWorkspace.getFile(pathTest);
- GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
- //gpcTest.setStatusMonitor(getStatusMonitor());
- status = gpcTest.execute(env);
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //input codegen
- IPath pathInput = fDestinationFolderPath.append(INPUT);
- IFile fileInput = fWorkspace.getFile(pathInput);
- InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
- GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- inputGenerator,fileInput);
- //gpcInput.setStatusMonitor(getStatusMonitor());
- status = gpcInput.execute(env);
- if (status.getSeverity() == Status.ERROR )
- return status;
-
- //method codegen
- IPath pathMethod = fDestinationFolderPath.append(METHOD);
- IFile fileMethod = fWorkspace.getFile(pathMethod);
- MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
- methodGenerator.setClientFolderPath(testInfo.getJspFolder());
- GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- methodGenerator,fileMethod);
- //gpcMethod.setStatusMonitor(getStatusMonitor());
- status = gpcMethod.execute(env);
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //result codegen
- IPath pathResult = fDestinationFolderPath.append(RESULT);
- IFile fileResult = fWorkspace.getFile(pathResult);
- ResultFileGenerator rfg = new ResultFileGenerator();
- rfg.setClientFolderPath(testInfo.getJspFolder());
- rfg.setSetEndpointMethod(testInfo.getSetEndpointMethod());
- GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- rfg,fileResult);
- status = gpcResult.execute(env);
-
- return status;
- }
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
deleted file mode 100644
index 9bf612f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCLaunchCommand.java
+++ /dev/null
@@ -1,133 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class GSTCLaunchCommand extends SimpleCommand {
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private TestInfo testInfo;
- private MessageUtils msgUtils;
-
- public GSTCLaunchCommand(TestInfo testInfo){
- this.testInfo = testInfo;
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- }
-
- public Status execute(Environment env){
- Status status = new SimpleStatus( "" );
- return status = launchSample(env);
- }
-
- private Status launchSample (Environment env) {
- Status status = new SimpleStatus( "" );
- IPath fDestinationFolderPath = new Path(testInfo.getJspFolder());
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- PublishProjectCommand ppc = new PublishProjectCommand();
- ppc.setServerTypeID(testInfo.getClientServerTypeID());
- ppc.setExistingServer(testInfo.getClientExistingServer());
- ppc.setProject(testInfo.getGenerationProject());
- status = ppc.execute(env);
-
- StartProjectCommand spc = new StartProjectCommand(false );
- spc.setServiceServerTypeID(testInfo.getClientServerTypeID());
- spc.setSampleExistingServer(testInfo.getClientExistingServer());
- IProject project = (IProject) ResourceUtils.findResource(testInfo.getGenerationProject());
- spc.setSampleProject(project);
- spc.setIsWebProjectStartupRequested(true);
-
- status = spc.execute(env);
- if (status.getSeverity() == Status.ERROR) return status;
-
- IProject sampleProject = ProjectUtilities.getProject(testInfo.getGenerationProject());
- IPath newPath = new Path(ServerUtils.getWebComponentURL(sampleProject,testInfo.getGenerationModule(),testInfo.getClientServerTypeID(),testInfo.getClientExistingServer()));
- int count = J2EEUtils.getWebContentPath(sampleProject,testInfo.getGenerationModule()).segmentCount();
-
- newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(count).makeAbsolute());
- StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
- if (testInfo.getEndpoint() != null && !testInfo.getEndpoint().isEmpty())
- {
- urlString.append("?endpoint=");
- urlString.append(testInfo.getEndpoint().get(0).toString());
- }
-
- try{
- URL url;
- url = new URL(urlString.toString());
-
- for( int retries = 0; retries < 10; retries++ )
- {
- try
- {
- // Test the URLs
- (new URL(newPath.append(RESULT).toString())).openStream();
- (new URL(newPath.append(METHOD).toString())).openStream();
- (new URL(newPath.append(INPUT).toString())).openStream();
- (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
- // Looks good, exit loop
- break;
- }
- catch( IOException ioe )
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {}
- }
- }
-
- IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR, null, null, null);
- browser.openURL(url);
- return status;
- }catch(PartInitException exc){
- //TODO: change error message
- env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.WARNING );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.ERROR );
- }
- return status;
- }catch(MalformedURLException exc){
- env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.WARNING );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.ERROR );
- }
- return status;
- }
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
deleted file mode 100644
index 344ecc6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/GSTCWebServiceTester.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceTester;
-import org.eclipse.wst.ws.internal.provisional.wsrt.TestInfo;
-
-public class GSTCWebServiceTester implements IWebServiceTester {
-
- public ICommandFactory generate(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new GSTCGenerateCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
- public ICommandFactory launch(TestInfo testInfo){
- Vector commands = new Vector();
- commands.add(new GSTCLaunchCommand(testInfo));
- return new SimpleCommandFactory(commands);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
deleted file mode 100644
index c5f1151..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WSSampleFinishCommand.java
+++ /dev/null
@@ -1,323 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.PublishProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.StartProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.MethodFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.ResultFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.TestClientFileGenerator;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.GeneratePageCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.command.JavaToModelCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.CopyWebServiceUtilsJarCommand;
-import org.eclipse.jst.ws.internal.ext.test.JavaProxyTestCommand;
-import org.eclipse.ui.PartInitException;
-import org.eclipse.ui.browser.IWebBrowser;
-import org.eclipse.ui.browser.IWorkbenchBrowserSupport;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class WSSampleFinishCommand extends SimpleCommand implements JavaProxyTestCommand
-{
-
- public static String INPUT = "Input.jsp";
- public static String TEST_CLIENT = "TestClient.jsp";
- public static String RESULT = "Result.jsp";
- public static String METHOD = "Method.jsp";
-
- private static String LABEL = "JavaBeanToSampleActiveTask";
- private static String DESCRIPTION = "default actions";
- private MessageUtils msgUtils;
-
- private Model proxyModel;
- private String sampleServerTypeID;
- private IServer sampleExistingServer;
-
-
- private String clientProject;
- private String qname;
- private String jspFolder;
- private boolean runClientTest;
- private String sampleProject;
- private BooleanSelection[] methods;
- private String proxyBean;
- private String setEndpointMethod;
- private List endpoints;
-
- /**
- * Constructs a new JavaBeanToSampleActiveTask object with the given label and description.
- */
- public WSSampleFinishCommand ()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
- //setters and getters to be removed
- CopyWebServiceUtilsJarCommand copy = new CopyWebServiceUtilsJarCommand();
- copy.setSampleProject(sampleProject);
- status = copy.execute(env);
- if (status.getSeverity() == Status.ERROR) return status;
- status = createModel(env);
- if (status.getSeverity() == Status.ERROR) return status;
- status = generatePages(env);
- if (status.getSeverity() == Status.ERROR) return status;
- //if (!isSuccessful()) return;
- status = launchSample(env);
- return status;
- }
-
-
- /**
- * Generate the four jsps that make up this
- * sample app.
- */
- protected Status generatePages(Environment env)
- {
- Status status = new SimpleStatus( "" );
- IPath fDestinationFolderPath = new Path(jspFolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
- IWorkspaceRoot fWorkspace = ResourcesPlugin.getWorkspace().getRoot();
-
- IPath pathTest = fDestinationFolderPath.append(TEST_CLIENT);
- IFile fileTest = fWorkspace.getFile(pathTest);
- GeneratePageCommand gpcTest = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- new TestClientFileGenerator(INPUT,METHOD,RESULT),fileTest);
- //gpcTest.setStatusMonitor(getStatusMonitor());
- status = gpcTest.execute(env);
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //input codegen
- IPath pathInput = fDestinationFolderPath.append(INPUT);
- IFile fileInput = fWorkspace.getFile(pathInput);
- InputFileGenerator inputGenerator = new InputFileGenerator(RESULT);
- GeneratePageCommand gpcInput = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- inputGenerator,fileInput);
- //gpcInput.setStatusMonitor(getStatusMonitor());
- status = gpcInput.execute(env);
- if (status.getSeverity() == Status.ERROR )
- return status;
-
- //method codegen
- IPath pathMethod = fDestinationFolderPath.append(METHOD);
- IFile fileMethod = fWorkspace.getFile(pathMethod);
- MethodFileGenerator methodGenerator = new MethodFileGenerator(INPUT);
- methodGenerator.setClientFolderPath(jspFolder);
- GeneratePageCommand gpcMethod = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- methodGenerator,fileMethod);
- //gpcMethod.setStatusMonitor(getStatusMonitor());
- status = gpcMethod.execute(env);
- if (status.getSeverity() == Status.ERROR )
- return status;
-
-
- //result codegen
- IPath pathResult = fDestinationFolderPath.append(RESULT);
- IFile fileResult = fWorkspace.getFile(pathResult);
- ResultFileGenerator rfg = new ResultFileGenerator();
- rfg.setClientFolderPath(jspFolder);
- rfg.setSetEndpointMethod(setEndpointMethod);
- GeneratePageCommand gpcResult = new GeneratePageCommand(EnvironmentUtils.getResourceContext(env), proxyModel,
- rfg,fileResult);
- //gpcResult.setStatusMonitor(getStatusMonitor());
- status = gpcResult.execute(env);
-
- return status;
- }
-
-
- protected Status launchSample (Environment env) {
-
- Status status = new SimpleStatus( "" );
- if (!runClientTest) return status;
-
-
- IPath fDestinationFolderPath = new Path(jspFolder);
- fDestinationFolderPath = fDestinationFolderPath.makeAbsolute();
-
- PublishProjectCommand ppc = new PublishProjectCommand();
- ppc.setServerTypeID(sampleServerTypeID);
- ppc.setExistingServer(sampleExistingServer);
- ppc.setProject(sampleProject);
- status = ppc.execute(env);
-
- StartProjectCommand spc = new StartProjectCommand(false );
- spc.setServiceServerTypeID(sampleServerTypeID);
- spc.setSampleExistingServer(sampleExistingServer);
- IProject project = (IProject) ResourceUtils.findResource(sampleProject);
- spc.setSampleProject(project);
- spc.setIsWebProjectStartupRequested(true);
-
- status = spc.execute(env);
- if (status.getSeverity() == Status.ERROR) return status;
-
- IPath newPath = new Path(ResourceUtils.getWebProjectURL(ResourceUtils.getProjectOf(fDestinationFolderPath),sampleServerTypeID,sampleExistingServer));
- newPath = newPath.append(fDestinationFolderPath.removeFirstSegments(2).makeAbsolute());
- StringBuffer urlString = new StringBuffer(newPath.append(TEST_CLIENT).toString());
- if (endpoints != null && !endpoints.isEmpty())
- {
- urlString.append("?endpoint=");
- urlString.append(endpoints.get(0).toString());
- }
-
- try{
- URL url;
- url = new URL(urlString.toString());
-
- for( int retries = 0; retries < 10; retries++ )
- {
- try
- {
- // Test the URLs
- (new URL(newPath.append(RESULT).toString())).openStream();
- (new URL(newPath.append(METHOD).toString())).openStream();
- (new URL(newPath.append(INPUT).toString())).openStream();
- (new URL(newPath.append(TEST_CLIENT).toString())).openStream();
- // Looks good, exit loop
- break;
- }
- catch( IOException ioe )
- {
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException ie) {}
- }
- }
-
- IWorkbenchBrowserSupport browserSupport = WebServiceConsumptionUIPlugin.getInstance().getWorkbench().getBrowserSupport();
- IWebBrowser browser = browserSupport.createBrowser(IWorkbenchBrowserSupport.LOCATION_BAR | IWorkbenchBrowserSupport.NAVIGATION_BAR, null, null, null);
- browser.openURL(url);
- return status;
- }catch(PartInitException exc){
- //TODO: change error message
- env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.WARNING );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.ERROR );
- }
- return status;
- }catch(MalformedURLException exc){
- env.getLog().log(Log.WARNING, 5048, this, "launchSample", exc);
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.WARNING );
- try {
- env.getStatusHandler().report(status);
- } catch (StatusException e) {
- status = new SimpleStatus( "launchSample", msgUtils.getMessage("MSG_ERROR_MALFORMED_URL"), Status.ERROR );
- }
- return status;
- }
- }
-
-
-
- protected Status createModel(Environment env) {
-
- //create the model from the resource
- JavaToModelCommand jtmc = new JavaToModelCommand();
- jtmc.setMethods(methods);
- jtmc.setClientProject(clientProject);
- jtmc.setProxyBean(proxyBean);
- //jtmc.setStatusMonitor(getStatusMonitor());
- Status status = jtmc.execute(env);
- if (status.getSeverity() == Status.ERROR) return status;
-
- proxyModel = jtmc.getDataModel();
- return status;
- }
-
- public void setServerTypeID(String sampleServerTypeID)
- {
- this.sampleServerTypeID = sampleServerTypeID;
- }
-
- public void setExistingServer(IServer sampleExistingServer)
- {
- this.sampleExistingServer = sampleExistingServer;
- }
-
- public void setJspFolder(String jspFolder)
- {
- this.jspFolder = jspFolder;
- }
-
- public void setRunClientTest(boolean runClientTest)
- {
- this.runClientTest = runClientTest;
- }
-
- public void setSampleProject(String sampleProject)
- {
- this.sampleProject = sampleProject;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
-
- public void setEndpoint(List endpoints)
- {
- this.endpoints = endpoints;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
deleted file mode 100644
index bec3401..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/test/wssample/WebServiceWSSampleExecutable.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.widgets.test.wssample;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceExecutable;
-import org.eclipse.jst.ws.internal.ext.WebServiceFinishCommand;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public class WebServiceWSSampleExecutable implements WebServiceExecutable
-{
-
-
- public WebServiceFinishCommand getFinishCommand()
- {
- return new WSSampleFinishCommand();
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/ClientProjectTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/ClientProjectTypeRegistry.java
deleted file mode 100644
index daf6c46..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/ClientProjectTypeRegistry.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class ClientProjectTypeRegistry
-{
- private static ClientProjectTypeRegistry instance_;
- private IConfigurationElement[] configElements_;
-
- private ClientProjectTypeRegistry()
- {
- init();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton ClientProjectTypeRegistry object.
- */
- public static ClientProjectTypeRegistry getInstance()
- {
- if (instance_ == null)
- instance_ = new ClientProjectTypeRegistry();
- return instance_;
- }
-
- public void init()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- configElements_ = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
- }
-
- public IConfigurationElement getDefaultElement()
- {
- return getElementById("org.eclipse.jst.ws.consumption.ui.clientProjectType.Web");
- }
-
- public IConfigurationElement getElementById(String id)
- {
- return getElementByAttribute("id", id);
- }
-
- public IConfigurationElement getElementByLabel(String label)
- {
- return getElementByAttribute("label", label);
- }
-
- public IConfigurationElement getElementByProject(IProject project)
- {
- for (int i = 0; i < configElements_.length; i++)
- if (include(project, configElements_[i].getAttribute("include")) && exclude(project, configElements_[i].getAttribute("exclude")))
- return configElements_[i];
- return null;
- }
-
- private IConfigurationElement getElementByAttribute(String name, String value)
- {
- for (int i = 0; i < configElements_.length; i++)
- if (configElements_[i].getAttribute(name).equals(value))
- return configElements_[i];
- return null;
- }
-
- public IProject[] getProjects(String id)
- {
- Vector v = new Vector();
- IConfigurationElement element = getElementById(id);
- if (element != null)
- {
- IProject[] workspaceProjs = ResourceUtils.getWorkspaceRoot().getProjects();
- IVirtualComponent[] comps = J2EEUtils.getAllComponents();
- for (int i = 0; i < comps.length; i++) {
- // TODO: Needs to be refactored to work with project/module topology described in XP
- //if (include(workspaceProjs[i], element.getAttribute("include")) && exclude(workspaceProjs[i], element.getAttribute("exclude")))
- // Note: Adding a project if the project contains a web or ejb module.
- if (J2EEUtils.isWebComponent(comps[i].getProject(), comps[i].getName())
- || J2EEUtils.isEJBComponent(comps[i].getProject(), comps[i].getName())) {
- v.add(comps[i].getProject());
- }
- }
- }
- IProject[] projects = new IProject[v.size()];
- v.copyInto(projects);
- return projects;
- }
-
- private boolean include(IProject project, String include)
- {
- StringTokenizer st = new StringTokenizer(include);
- while(st.hasMoreTokens())
- {
- try
- {
- if (project.hasNature(st.nextToken()))
- return true;
- }
- catch (CoreException ce)
- {
- }
- }
- return false;
- }
-
- private boolean exclude(IProject project, String exclude)
- {
- StringTokenizer st = new StringTokenizer(exclude);
- while(st.hasMoreTokens())
- {
- try
- {
- if (project.hasNature(st.nextToken()))
- return false;
- }
- catch (CoreException ce)
- {
- }
- }
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceRuntime.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceRuntime.java
deleted file mode 100644
index 23c7d93..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceRuntime.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact.
-*/
-public interface IWebServiceRuntime
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Returns the id of this Web Service runtime.
- * @return id of this Web Service runtime.
- */
- public String getId ();
-
- /**
- * Returns a locale specific description of this Web Service runtime.
- * @return A locale specific description of this Web Service runtime.
- */
- public String getDescription ();
-
- /**
- * Returns a short, locale specific Label of this Web Service runtime.
- * @return A short, locale specific Label of this Web Service runtime.
- */
- public String getLabel ();
-
- /**
- * Returns a String, J2EE version
- * @return
- */
- public String[] getJ2EEVersions();
-
- /**
- * Returns the configuration element associated with
- * this runtime.
- *
- * @return org.eclipse.core.runtime.IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement();
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceServer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceServer.java
deleted file mode 100644
index 580d960..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceServer.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public interface IWebServiceServer
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Returns the id of this Web Service type.
- * @return id of this Web Service type.
- */
- public String getId ();
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getFactoryId ();
-
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getLabel ();
-
- /**
- * Returns true if set true in plugin.xml
- * @return boolean
- */
- public boolean getIsDefault();
-
- /**
- * Returns runtime target Id
- * @return String
- */
- public String getRuntimeTypeId();
-
- /**
- * Returns the configuration element associated with
- * this runtime.
- *
- * @return org.eclipse.core.runtime.IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceType.java
deleted file mode 100644
index b149698..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/IWebServiceType.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public interface IWebServiceType
-{
- /**
- * Returns the id of this Web Service type.
- * @return id of this Web Service type.
- */
- public String getId ();
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getLabel ();
-
- /**
- * Returns a locale specific description of this Web Service type's extension metadata.
- * @return A locale specific description of this Web Service type's extension metadata.
- */
- public String[] getExtensionMetadata ();
-
- /**
- * Returns a locale specific description of this Web Service type's resource metadata.
- * @return A locale specific description of this Web Service type's resource metadata.
- */
- public String[] getResourceTypeMetadata ();
-
- /**
- * Returns true if the plugin.xml contains an attribute of "canFinish" with a value of true. Otherwise,
- * false is returned. Note: if the "canFinish" attribute is not specified true is returned by default.
- * @return Returns whether or not the user can finish on the pages before the web service type pages.
- */
- public boolean getCanFinish();
-
- /**
- * Returns the configuration element associated with
- * this runtime.
- *
- * @return org.eclipse.core.runtime.IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement();
-
- public String getObjectSelectionWidget();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index e19b750..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType;
-
-
-public class PrivateUDDIRegistryTypeRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static PrivateUDDIRegistryTypeRegistry instance_;
-
- private PrivateUDDIRegistryTypeRegistry() {
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PrivateUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PrivateUDDIRegistryTypeRegistry();
- }
-
- return instance_;
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "privateUDDIRegistryType");
-
- try {
- Object configElement = ((config.length > 0) ? config[0].createExecutableExtension("class") : null);
- if(configElement != null && configElement instanceof PrivateUDDIRegistryType)
- return (PrivateUDDIRegistryType)configElement;
- else
- return null;
- }
- catch (CoreException e) {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 4d28732..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/PublicUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi.PublicUDDIRegistryType;
-
-
-public class PublicUDDIRegistryTypeRegistry
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- private static PublicUDDIRegistryTypeRegistry instance_;
- private Vector types_;
- private Vector configElements_;
-
- private PublicUDDIRegistryTypeRegistry() {
- types_ = new Vector();
- configElements_ = new Vector();
-
- init();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PublicUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PublicUDDIRegistryTypeRegistry();
- }
-
- return instance_;
- }
-
- public void init() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "publicUDDIRegistryType");
-
- for (int i = 0; i < config.length; i++) {
- try {
- Object configElement = config[i].createExecutableExtension("class");
-
- if( configElement instanceof PublicUDDIRegistryType) {
- types_.add(configElement);
- configElements_.add(config[i]);
- }
- }
- catch (CoreException e) {}
- }
- }
-
- public PublicUDDIRegistryType[] getAllPublicUDDIRegistryTypes() {
- PublicUDDIRegistryType[] types = new PublicUDDIRegistryType[types_.size()];
- for (int i = 0; i < types_.size(); i++) {
- types[i] = (PublicUDDIRegistryType)types_.elementAt(i);
- }
- return types;
- }
-
- public PublicUDDIRegistryType getPublicUDDIRegistryTypeByID(String id) {
- for (int i = 0; i < configElements_.size(); i++) {
- IConfigurationElement c = (IConfigurationElement)configElements_.elementAt(i);
- if (c.getAttribute("id").equals(id))
- return (PublicUDDIRegistryType)types_.elementAt(i);
- }
- return null;
- }
-
- public String getPublicUDDIRegistryTypeIDByName(String name) {
- for (int i = 0; i < types_.size(); i++) {
- PublicUDDIRegistryType type = (PublicUDDIRegistryType)types_.elementAt(i);
- if (type.getName().equals(name))
- return ((IConfigurationElement)configElements_.elementAt(i)).getAttribute("id");
- }
- return null;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
deleted file mode 100644
index 96f20a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/RuntimeServerSelectionDialog.java
+++ /dev/null
@@ -1,877 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.server.core.IModuleType;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-
-public class RuntimeServerSelectionDialog extends Dialog implements Listener {
-
- private Shell thisShell;
- private Group viewSelectionGroup_;
- private Text messageBanner_;
- private Composite primaryGroup_;
- private Group runtimesGroup_;
- private Group serversGroup_;
- private Tree runtimesList_;
- private Tree serverList_;
- private Button viewSelectionByRuntimeButton_;
- private Button viewSelectionByServerButton_;
- private Button viewSelectionByExploreButton_;
- private Combo j2eeVersionCombo;
- /*
- * CONTEXT_ID PWRS0001 for the selection of runtime, server and project combination
- */
- private String INFOPOP_PWRS_DIALOG = WebServiceConsumptionUIPlugin.ID + ".PWRS0001";
- /* CONTEXT_ID PWRS0002 for the runtime selection on in the dailog */
- private String INFOPOP_PWRS_LIST_RUNTIMES = WebServiceConsumptionUIPlugin.ID + ".PWRS0002";
- /* CONTEXT_ID PWRS0003 for the server selection in the dialog */
- private String INFOPOP_PWRS_LIST_SERVERS = WebServiceConsumptionUIPlugin.ID + ".PWRS0003";
- /*
- * CONTEXT_ID PWRS0004 for the EJB Project combo box of the runtime selection dialog
- */
- // private String INFOPOP_PWRS_EJB_PROJECT = WebServiceConsumptionUIPlugin.ID
- // + ".PWRS0004";
- /*
- * CONTEXT_ID PWRS0005 for the runtime view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_RUNTIME = WebServiceConsumptionUIPlugin.ID + ".PWRS0005";
- /*
- * CONTEXT_ID PWRS0006 for the server view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_SERVER = WebServiceConsumptionUIPlugin.ID + ".PWRS0006";
- /*
- * CONTEXT_ID PWRS0007 for the explore view radio button of the runtime selection dialog
- */
- private String INFOPOP_PWRS_RADIO_EXPLORE = WebServiceConsumptionUIPlugin.ID + ".PWRS0007";
- /*
- * CONTEXT_ID PWRS0008 for the Web Project combo box of the runtime selection dialog
- */
- // private String INFOPOP_PWRS_COMBO_PROJECT =
- // WebServiceConsumptionUIPlugin.ID + ".PWRS0008";
- /*
- * CONTEXT_ID PWRS0009 for the J2EE version combo box of the runtime selection dialog
- */
- private String INFOPOP_PWRS_J2EE_VERSION = WebServiceConsumptionUIPlugin.ID + ".PWRS0009";
-
- // rskreg
- //private WebServiceServerRuntimeTypeRegistry wssrtRegistry;
- //private WebServiceClientTypeRegistry wsctRegistry;
- // rskreg
- private Hashtable serverLabels_;
- private Hashtable existingServersTable_;
- private String defaultServer_;
- private String defaultRuntime_;
- private String typeId_;
- private String clientTypeId_;
- // rskreg
- //private IWebServiceRuntime selectedRuntime_;
- private WebServiceRuntimeInfo selectedRuntime_;
- // rskreg
- private IServer selectedServer_;
- private String selectedServerLabel_;
- private String selectedServerFactoryID_;
- private boolean isExistingServer_;
- private boolean validateOn_ = false;
- private byte selectionMode_;
- private final byte MODE_SERVICE = (byte) 0;
- private final byte MODE_CLIENT = (byte) 1;
- private final String SERVER_TYPES_ICON = "icons/servers/servers_obj.gif";
- private final String EXISTING_SERVERS_ICON = "icons/servers/existing_server_obj.gif";
- private String j2eeVersion;
- private String serverInstanceID_;
-
- public RuntimeServerSelectionDialog(Shell shell, byte mode, TypeRuntimeServer ids, String j2eeVersion) {
- super(shell);
- selectionMode_ = mode;
- typeId_ = ids.getTypeId();
- defaultRuntime_ = ids.getRuntimeId();
- defaultServer_ = ids.getServerId();
- serverInstanceID_ = ids.getServerInstanceId();
- setIsExistingServer(ids.getServerInstanceId() != null);
- serverLabels_ = new Hashtable();
- existingServersTable_ = new Hashtable();
- // rskreg
- //wsctRegistry = WebServiceClientTypeRegistry.getInstance();
- //wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- // rskreg
- this.j2eeVersion = j2eeVersion;
- }
-
- public TypeRuntimeServer getTypeRuntimeServer() {
- TypeRuntimeServer ids = new TypeRuntimeServer();
-
- ids.setTypeId(typeId_);
- if (selectedRuntime_ != null)
- ids.setRuntimeId(selectedRuntime_.getId());
-
- if( selectedServerFactoryID_ == null )
- {
- ids.setServerId( defaultServer_ );
- ids.setServerInstanceId( serverInstanceID_ );
- }
- else
- {
- ids.setServerId(selectedServerFactoryID_);
-
- if (isExistingServer_ && selectedServer_ != null)
- {
- ids.setServerInstanceId(selectedServer_.getId());
- }
- }
-
- return ids;
- }
-
- public String getJ2EEVersion() {
- return j2eeVersion;
- }
-
- private boolean getIsExistingServer() {
- return isExistingServer_;
- }
-
- private void setIsExistingServer(boolean isExisting) {
- isExistingServer_ = isExisting;
- }
-
- protected Control createContents(Composite parent) {
- Composite comp = (Composite) super.createContents(parent);
- parent.getShell().pack();
- return comp;
- }
-
- protected Control createDialogArea(Composite parent) {
- validateOn_ = false;
- thisShell = parent.getShell();
- if (thisShell == null) {
- thisShell = createShell();
- }
- Composite composite = (Composite) super.createDialogArea(parent);
- GridLayout gl;
- GridData gd;
- // Window title
- if (selectionMode_ == MODE_SERVICE)
- thisShell.setText(getMessage("%PAGE_TITLE_WS_RUNTIME_SELECTION"));
- else
- thisShell.setText(getMessage("%PAGE_TITLE_WS_CLIENT_RUNTIME_SELECTION"));
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- helpSystem.setHelp(thisShell, INFOPOP_PWRS_DIALOG);
- // Dialog description banner
- messageBanner_ = new Text(composite, SWT.READ_ONLY | SWT.WRAP);
- messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION") + "\n" + " "); // reserves a second line for message display
- messageBanner_.setToolTipText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
- gd = new GridData(GridData.FILL_HORIZONTAL);
- messageBanner_.setLayoutData(gd);
- // -----------------------------------------------------------------------//
- new Label(composite, SWT.HORIZONTAL);
- // -----------------------------------------------------------------------//
- // Selection
- thisShell.setToolTipText(getMessage("%TOOLTIP_PWRS_PAGE"));
- viewSelectionGroup_ = new Group(composite, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- viewSelectionGroup_.setLayout(gl);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- viewSelectionGroup_.setLayoutData(gd);
- if (selectionMode_ == MODE_SERVICE)
- viewSelectionGroup_.setText(getMessage("%LABEL_SELECTION_VIEW_TITLE"));
- else
- viewSelectionGroup_.setText(getMessage("%LABEL_CLIENT_SELECTION_VIEW_TITLE"));
- viewSelectionByServerButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
- viewSelectionByServerButton_.setText(getMessage("%LABEL_SELECTION_VIEW_SERVER"));
- viewSelectionByServerButton_.addListener(SWT.Selection, this);
- viewSelectionByServerButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_SERVER"));
- viewSelectionByServerButton_.setSelection(true);
- helpSystem.setHelp(viewSelectionByServerButton_, INFOPOP_PWRS_RADIO_SERVER);
- viewSelectionByRuntimeButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
- viewSelectionByRuntimeButton_.setText(getMessage("%LABEL_SELECTION_VIEW_RUNTIME"));
- viewSelectionByRuntimeButton_.addListener(SWT.Selection, this);
- viewSelectionByRuntimeButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_RUNTIME"));
- helpSystem.setHelp(viewSelectionByRuntimeButton_, INFOPOP_PWRS_RADIO_RUNTIME);
- viewSelectionByExploreButton_ = new Button(viewSelectionGroup_, SWT.RADIO);
- viewSelectionByExploreButton_.setText(getMessage("%LABEL_SELECTION_VIEW_EXPLORE"));
- viewSelectionByExploreButton_.addListener(SWT.Selection, this);
- viewSelectionByExploreButton_.setToolTipText(getMessage("%TOOLTIP_PWRS_RADIO_EXPLORE"));
- helpSystem.setHelp(viewSelectionByExploreButton_, INFOPOP_PWRS_RADIO_EXPLORE);
- primaryGroup_ = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- runtimesGroup_ = new Group(primaryGroup_, SWT.NONE);
- gl = new GridLayout();
- runtimesGroup_.setLayout(gl);
- gd = new GridData(GridData.FILL_BOTH);
- runtimesGroup_.setLayoutData(gd);
- runtimesGroup_.setText(getMessage("%LABEL_RUNTIMES_LIST"));
- runtimesList_ = new Tree(runtimesGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- gd = new GridData(GridData.FILL_BOTH);
- runtimesList_.setLayoutData(gd);
- runtimesList_.addListener(SWT.Selection, this);
- runtimesList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_RUNTIMES"));
- helpSystem.setHelp(runtimesList_, INFOPOP_PWRS_LIST_RUNTIMES);
- // Server labels control
- serversGroup_ = new Group(primaryGroup_, SWT.NONE);
- gl = new GridLayout();
- serversGroup_.setLayout(gl);
- gd = new GridData(GridData.FILL_BOTH);
- serversGroup_.setLayoutData(gd);
- serversGroup_.setText(getMessage("%LABEL_SERVERS_LIST"));
- serverList_ = new Tree(serversGroup_, SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- serverList_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL));
- serverList_.addListener(SWT.Selection, this);
- serverList_.setToolTipText(getMessage("%TOOLTIP_PWRS_LIST_SERVERS"));
- ServersList serverList = new ServersList();
- serverList.setServerTreeItems(serverList_);
- helpSystem.setHelp(serverList_, INFOPOP_PWRS_LIST_SERVERS);
- setRuntimesGroup();
- // J2EE version
- Composite j2eeVersionComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- gl.numColumns = 2;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- j2eeVersionComposite.setLayout(gl);
- j2eeVersionComposite.setLayoutData(gd);
- Label j2eeVersionLabel = new Label(j2eeVersionComposite, SWT.NONE);
- j2eeVersionLabel.setText(getMessage("%LABEL_J2EE_VERSION"));
- j2eeVersionCombo = new Combo(j2eeVersionComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- gd = new GridData(GridData.FILL_HORIZONTAL);
- j2eeVersionCombo.setLayout(gl);
- j2eeVersionCombo.setLayoutData(gd);
- j2eeVersionCombo.addListener(SWT.Selection, this);
- j2eeVersionCombo.setToolTipText(getMessage("%TOOLTIP_PWRS_J2EE_VERSION"));
- helpSystem.setHelp(j2eeVersionCombo, INFOPOP_PWRS_J2EE_VERSION);
- // -----------------------------------------------------------------------//
- new Label(composite, SWT.HORIZONTAL);
- validateOn_ = true;
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(parent);
- setJ2EEVersions();
- return composite;
- }
-
- private void setJ2EEVersions() {
- j2eeVersionCombo.setEnabled(true);
- j2eeVersionCombo.removeAll();
- String[] versions = null;
- // rskreg
- //if (selectedRuntime_ != null)
- //versions = selectedRuntime_.getJ2EEVersions();
- if (selectedRuntime_ != null)
- versions = selectedRuntime_.getJ2eeLevels();
- // rskreg
- if (versions != null) {
- //j2eeVersionCombo.setItems(versions);
- setJ2EEComboItems(versions);
- j2eeVersionCombo.select(0);
- if (j2eeVersion != null) {
- int i = j2eeVersionCombo.indexOf(J2EEUtils.getLabelFromJ2EEVersion(j2eeVersion));
- if (i > 0)
- j2eeVersionCombo.select(i);
- }
- }
- else
- j2eeVersionCombo.setEnabled(false);
- }
-
- private void setJ2EEComboItems(String[] versions)
- {
- String[] j2eeLabels = new String[versions.length];
- for (int i = 0; i < versions.length; i++)
- {
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- if (label != null && label.length() >0)
- j2eeLabels[i] = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- else
- j2eeLabels[i] = getMessage("%LABEL_NA");
- }
- j2eeVersionCombo.setItems(j2eeLabels);
- }
-
- private void setJ2EEVersionBasedOnServer()
- {
- //Get the list of J2EE versions
- String[] versions = null;
- if (selectedRuntime_ == null || selectedServerFactoryID_== null)
- return;
-
- // rskreg
- //versions = selectedRuntime_.getJ2EEVersions();
- versions = selectedRuntime_.getJ2eeLevels();
- // rskreg
- if (versions==null)
- return;
-
- //Pick the first version that the selected server supports
- for (int i=0; i<versions.length; i++)
- {
- if (isServerValid(selectedServerFactoryID_, versions[i]))
- {
- //Set the j2ee level to this version
- String label = J2EEUtils.getLabelFromJ2EEVersion(versions[i]);
- j2eeVersionCombo.setText(label);
- setJ2EEVersionFromJ2EEVersionCombo();
- }
- }
- }
-
-
- private boolean isServerValid(String serverFactoryId, String j2eeVersion)
- {
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- if (stJ2EEVersion == null)
- return false;
-
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null)
- {
- IRuntimeType serverRuntime = serverType.getRuntimeType();
- IModuleType[] mTypes = serverRuntime.getModuleTypes();
- for (int i=0; i<mTypes.length; i++)
- {
- IModuleType mType = mTypes[i];
- String type = mType.getId();
- String moduleVersion = mType.getVersion();
- if (type.equals(IServerTargetConstants.WEB_TYPE) && moduleVersion.equals(stJ2EEVersion))
- {
- //Found a match, return true!
- return true;
- }
- }
- }
- //no match found or the server type was null. Return false.
- return false;
- }
-
- private void validateServerRuntimeSelection() {
- // Check if the extension exists
- if (selectionMode_ == MODE_SERVICE) {
- if (selectedServerFactoryID_!=null && selectedRuntime_!=null) {
- // rskreg
- //WebServiceServerRuntimeType wssrt = wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_, selectedRuntime_.getId(), typeId_);
- // rskreg
- // rm WebServiceServerRuntimeType wssrt =
- // wssrtRegistry.getWebServiceServerRuntimeType(selectedServerFactoryID_,
- // selectedRuntime_.getId(), wse.getWebServiceType());
- // rm if (wssrt!=null &&
- // wssrtRegistry.isServerSupportedForChosenType(wse.getWebServiceType(),selectedServerFactoryID_))
- // {
-
- //rskreg
- boolean wssrtSupported = WebServiceRuntimeExtensionUtils.isServerRuntimeTypeSupported(selectedServerFactoryID_,selectedRuntime_.getId(),typeId_);
- //if (wssrt != null && wssrtRegistry.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
- //setOKStatusMessage();
- //}
-
- if (wssrtSupported && WebServiceRuntimeExtensionUtils.isServerSupportedForChosenType(typeId_, selectedServerFactoryID_)) {
- setOKStatusMessage();
- }
- // rskreg
- else {
- setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
- }
- }
- }
- else {
- // rm String clientId =
- // wsctRegistry.getClientTypeIdByName(clientScenarioId_);
- String clientId = typeId_;
- // rm String clientId =
- // wsctRegistry.getClientTypeIdByName(wse.getProxySelected());
- // rskreg
-
- //WebServiceServer wss = wsctRegistry.getWebServiceServerByFactoryId(selectedServerFactoryID_);
-
- //if (wss == null || selectedRuntime_ == null || !wsctRegistry.webServiceClientRuntimeTypeExists(wss.getId(), selectedRuntime_.getId(), clientId)) {
- //setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
- //}
- if (selectedServerFactoryID_==null || selectedRuntime_ == null || !WebServiceRuntimeExtensionUtils.webServiceClientRuntimeTypeExists(selectedServerFactoryID_, selectedRuntime_.getId(), clientId)) {
- setERRORStatusMessage("%MSG_INVALID_SRT_SELECTIONS");
- }
- // rskreg
- else {
- setOKStatusMessage();
- }
- }
- // Disable OK button if the runtime selection is invalid
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- if (runtimeSel == null || runtimeSel.length <= 0 || runtimeSel[0].getText().length() == 0) {
- disableOKButton();
- }
- // Disable OK button if server selection is invalid
- TreeItem[] serverSel = serverList_.getSelection();
- String currentSelection = (serverSel != null && serverSel.length > 0) ? serverSel[0].getText() : "";
- if (serverSel == null || currentSelection.length() == 0) {
- disableOKButton();
- }
- if (!serverLabels_.containsKey(currentSelection) || !existingServersTable_.containsKey(currentSelection)) {
- disableOKButton();
- setOKStatusMessage();
- }
- // Disable OK button if category is selected rather than a server
- if (serverSel.length > 0 && serverSel[0].getItemCount()!=0) {
- disableOKButton();
- }
- else {
- enableOKButton();
- }
-
- }
-
- private void setOKStatusMessage() {
- messageBanner_.setText(getMessage("%PAGE_DESC_WS_RUNTIME_SELECTION"));
- Color black = new Color(thisShell.getDisplay(), 0x00, 0, 0);
- messageBanner_.setForeground(black);
- enableOKButton();
- }
-
- private void setERRORStatusMessage(String message) {
- messageBanner_.setText(getMessage(message));
- Color red = new Color(thisShell.getDisplay(), 0xFF, 0, 0);
- messageBanner_.setForeground(red);
- disableOKButton();
- }
-
- private void disableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(false);
- }
-
- private void enableOKButton() {
- if (getButton(0) != null)
- getButton(0).setEnabled(true);
- }
-
- protected void okPressed() {
- setJ2EEVersionFromJ2EEVersionCombo();
- //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
- setReturnCode(OK);
- close();
- }
-
- private void setJ2EEVersionFromJ2EEVersionCombo()
- {
- if (j2eeVersionCombo.getEnabled())
- {
- String j2eeLabel = j2eeVersionCombo.getText();
- String j2eeVersionString = J2EEUtils.getJ2EEVersionFromLabel(j2eeLabel);
- if (j2eeVersionString != null && j2eeVersionString.length() > 0)
- j2eeVersion = j2eeVersionString;
- else
- j2eeVersion = null;
- }
- else
- j2eeVersion = null;
- }
- /**
- * Called when an event occurs on the page. Handles the event and revalidates the page.
- *
- * @param event
- * The event that occured.
- */
- public void handleEvent(Event event) {
- if (!validateOn_)
- return;
- enableOKButton();
- if (viewSelectionByRuntimeButton_ == event.widget) {
- handleRuntimeViewSelectionEvent();
- return;
- }
- else if (viewSelectionByServerButton_ == event.widget) {
- handleServerViewSelectionEvent();
- return;
- }
- else if (viewSelectionByExploreButton_ == event.widget) {
- handleExploreViewSelectionEvent();
- return;
- }
- else if (j2eeVersionCombo == event.widget) {
- setJ2EEVersionFromJ2EEVersionCombo();
- //j2eeVersion = (j2eeVersionCombo.getEnabled()) ? j2eeVersionCombo.getText() : null;
- return;
- }
- else if (runtimesList_ == event.widget) {
- TreeItem[] runtimeSel = runtimesList_.getSelection();
- processRuntimeListSelection(runtimeSel[0].getText());
- validateServerRuntimeSelection();
- setJ2EEVersions();
- setJ2EEVersionBasedOnServer();
- }
- else if (serverList_ == event.widget) {
- processServerListSelection();
- validateServerRuntimeSelection();
- setJ2EEVersionBasedOnServer();
- }
- }
-
- private void handleRuntimeViewSelectionEvent() {
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- primaryGroup_.layout();
-
- // TODO: Show all runtimes, and only servers supported by current type id
- }
-
- //
- // Called by handleEvent() when the user selects the layout to view
- //
- public void handleServerViewSelectionEvent() {
- GridLayout gl = new GridLayout();
- gl.numColumns = 1;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- primaryGroup_.layout();
- serversGroup_.setLocation(5, 5);
- runtimesGroup_.setLocation(4, 100);
- serversGroup_.layout();
- runtimesGroup_.layout();
-
- // TODO: Show all servers, and only runtimes supported by the current type id
- }
-
- //
- // Called by handleEvent() when the user selects the layout to view
- //
- private void handleExploreViewSelectionEvent() {
- GridLayout gl;
- gl = (GridLayout) primaryGroup_.getLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- GridData gd = new GridData(GridData.FILL_BOTH);
- primaryGroup_.setLayout(gl);
- primaryGroup_.setLayoutData(gd);
- primaryGroup_.layout();
-
- // TODO: Show all servers and runtimes from the type id
-
- }
-
- private void processRuntimeListSelection(String runtimeName) {
- // rskreg
- if (selectionMode_ == MODE_SERVICE) {
- //selectedRuntime_ = wssrtRegistry.getWebServiceRuntimeByLabel(runtimeName);
- selectedRuntime_ = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeByLabel(runtimeName);
- }
- else {
- //selectedRuntime_ = wsctRegistry.getWebServiceRuntimeByName(runtimeName);
- selectedRuntime_ = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeByLabel(runtimeName);
- }
- // rskreg
- }
-
- private void processServerListSelection() {
- String currentSelection;
- TreeItem[] serverSel = serverList_.getSelection();
- if (serverSel != null && serverSel.length > 0) {
- currentSelection = serverSel[0].getText();
- if (serverLabels_.containsKey(currentSelection) || existingServersTable_.containsKey(currentSelection)) {
- if (existingServersTable_.containsKey(currentSelection)) {
- selectedServer_ = (IServer) existingServersTable_.get(currentSelection);
- selectedServerLabel_ = currentSelection;
- selectedServerFactoryID_ = selectedServer_.getServerType().getId();
- }
- else if (serverLabels_.containsKey(currentSelection)) {
- TreeItem parentItem = serverSel[0].getParentItem();
- if (parentItem != null && !parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
- selectedServerLabel_ = currentSelection;
- selectedServer_ = null;
- selectedServerFactoryID_ = (String) serverLabels_.get(currentSelection);
- }
- }
-
- // check if isExistingServer or new ServerType
- TreeItem parentItem = serverSel[0].getParentItem();
- if (parentItem != null && parentItem.getText().equalsIgnoreCase(getMessage("%LABEL_TREE_EXISTING_SERVERS"))) {
- setIsExistingServer(true);
- }
- else {
- setIsExistingServer(false);
- }
- }
- else {
- selectedServer_ = null;
- selectedServerLabel_ = null;
- selectedServerFactoryID_ = null;
- setIsExistingServer(false);
- return;
- }
- }
- }
-
- private static String getMessage(String key) {
- return WebServiceConsumptionUIPlugin.getMessage(key);
- }
-
- private static String getMessage(String key, Object[] args) {
- return WebServiceConsumptionUIPlugin.getMessage(key, args);
- }
-
- private void setRuntimesGroup() {
- runtimesList_.removeAll();
- String[] runtimes = null;
-
- if (selectionMode_ == MODE_SERVICE) {
- // rskreg
- //runtimes = wssrtRegistry.getRuntimesByType(typeId_);
- runtimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(typeId_);
- }
- else {
- //runtimes = wsctRegistry.getAllClientRuntimes();
- runtimes = WebServiceRuntimeExtensionUtils.getAllClientRuntimes();
- // rskreg
- }
-
- TreeItem[] runtimeName = new TreeItem[runtimes.length];
-
- if (runtimes != null) {
- for (int i = 0; i < runtimes.length; i++) {
- String runtimeLabel = getRuntimeLabel(runtimes[i]);
- runtimeName[i] = new TreeItem(runtimesList_, SWT.NONE);
- runtimeName[i].setText(runtimeLabel);
-
- if (runtimes[i].equalsIgnoreCase(defaultRuntime_)) {
- runtimesList_.setSelection(new TreeItem[] { runtimeName[i]});
- selectedRuntime_ = getRuntime(runtimes[i]);
- }
- }
- }
- }
-
- private String getRuntimeLabel(String type) {
- return getRuntime(type).getLabel();
- }
-
- // rskreg
- private WebServiceRuntimeInfo getRuntime(String type) {
- if (selectionMode_ == MODE_SERVICE) {
- //return wssrtRegistry.getRuntimeById(type);
- return WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(type);
- }
- else {
- //return wsctRegistry.getRuntimeById(type);
- return WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(type);
- }
- }
- // rskreg
-
- // Returns the server Factory Id given a server name
- private String getServerSelectionFactoryId(String selectedServerName) {
- if (serverLabels_.containsKey(selectedServerName) && !isExistingServer_)
- return (String) serverLabels_.get(selectedServerName);
- else {
- return ((IServer) existingServersTable_.get(selectedServerName)).getServerType().getId();
- }
- }
-
- /**
- *
- * ServersList class
- *
- * Class which easily creates the Tree structure and entries for existing servers and server types
- */
- public class ServersList {
-
- private TreeItem[] existingServersTree;
- private TreeItem[] serverTypesTree;
- boolean existingServer = false;
-
- public void setServerTreeItems(Tree serversList) {
- this.setExistingServersTree(serversList);
- this.setServerTypesTree(serversList);
- }
-
- public void setExistingServersTree(Tree serverList) {
- String[] serverIds = this.getAllExistingServers();
- existingServersTree = new TreeItem[1];
- TreeItem[] existingServerItems = new TreeItem[serverIds.length];
- existingServersTree[0] = new TreeItem(serverList, SWT.NONE);
- existingServersTree[0].setText(getMessage("%LABEL_TREE_EXISTING_SERVERS"));
- ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(EXISTING_SERVERS_ICON);
- if (id != null)
- existingServersTree[0].setImage(id.createImage());
- for (int k = 0; k < serverIds.length; k++) {
- IServerType serverType = ServerCore.findServerType(((IServer) existingServersTable_.get(serverIds[k])).getServerType().getId());
- if (serverType != null) {
- existingServerItems[k] = new TreeItem(existingServersTree[0], SWT.NONE);
- existingServerItems[k].setText(serverIds[k]);
- if (serverIds[k].equalsIgnoreCase(defaultServer_) && getIsExistingServer()) {
- existingServersTree[0].setExpanded(true);
- serverList.setSelection(new TreeItem[] { existingServerItems[k]});
- existingServer = true;
- RuntimeServerSelectionDialog.this.setIsExistingServer(true);
- selectedServer_ = (IServer) existingServersTable_.get(defaultServer_);
- selectedServerLabel_ = serverIds[k];
- selectedServerFactoryID_ = selectedServer_.getServerType().getId();
- }
- existingServerItems[k].setImage(ServerUICore.getLabelProvider().getImage(serverType));
- }
- }
- }
-
- public void setServerTypesTree(Tree serverList) {
-
- TreeItem[] serverTypesTree = new TreeItem[1];
- serverTypesTree[0] = new TreeItem(serverList, SWT.NONE);
- serverTypesTree[0].setText(getMessage("%LABEL_TREE_SERVER_TYPES"));
- ImageDescriptor id = WebServiceConsumptionUIPlugin.getImageDescriptor(SERVER_TYPES_ICON);
- if (id != null)
- serverTypesTree[0].setImage(id.createImage());
- Hashtable categories_ = new Hashtable();
- Hashtable categoryTreeItem = new Hashtable();
- String[] serverIds = null;
- // rm String wst = wse.getWebServiceType();
- if (selectionMode_ == MODE_SERVICE) {
- // rskreg
- //serverIds = wssrtRegistry.getServerFactoryIdsByType(typeId_);
- serverIds = WebServiceRuntimeExtensionUtils.getServerFactoryIdsByType(typeId_);
- // rskreg
- }
- else {
- //serverIds = wsctRegistry.getServerFactoryIdsByClientType(typeId_);
- // rskreg
- //serverIds = wsctRegistry.getAllClientServerFactoryIds();
- serverIds = WebServiceRuntimeExtensionUtils.getAllClientServerFactoryIds();
- // rskreg
-
- }
- // rm serverId =
- // wssrtRegistry.getServerFactoryIdsByType(wse.getWebServiceType());
- if (serverIds == null) {
- serverIds = getAllServerTypes();
- }
- TreeItem[] parent = new TreeItem[serverIds.length];
- TreeItem[] item = new TreeItem[serverIds.length];
- if (serverIds != null) {
- for (int i = 0; i < serverIds.length; i++) {
- String server = ServerUtils.getInstance().getServerLabelForId(serverIds[i]);
- if (server != null) {
- RuntimeServerSelectionDialog.this.serverLabels_.put(server, serverIds[i]);
- IServerType serverType = ServerCore.findServerType(serverIds[i]);
- IRuntimeType runtimeType = serverType.getRuntimeType();
- if (!categories_.containsKey(serverType) && runtimeType != null) {
- categories_.put(serverType, runtimeType);
- if (categoryTreeItem.get(runtimeType) == null) {
- String categoryText = runtimeType.getName();
- Image categoryImage = ServerUICore.getLabelProvider().getImage(runtimeType);
- parent[i] = new TreeItem(serverTypesTree[0], SWT.NONE);
- parent[i].setText(categoryText);
- parent[i].setImage(categoryImage);
- categoryTreeItem.put(runtimeType, parent[i]);
- }
- else {
- parent[i] = (TreeItem) categoryTreeItem.get(runtimeType);
- }
- String factoryText = serverType.getName();
- Image factoryImage = ServerUICore.getLabelProvider().getImage(serverType);
- item[i] = new TreeItem(parent[i], SWT.NONE);
- item[i].setText(factoryText);
- item[i].setImage(factoryImage);
- item[i].setData(serverType);
- if (factoryText.equalsIgnoreCase(defaultServer_) && !existingServer) {
- serverList.setSelection(new TreeItem[] { item[i]});
- selectedServer_ = null;
- selectedServerLabel_ = factoryText;
- selectedServerFactoryID_ = (String) serverLabels_.get(selectedServerLabel_);
- }
- }
- }
- }
- }
-
- }
-
- /**
- * Get all servers in the workspace
- *
- * @return String[] of existing server names
- */
- private String[] getAllExistingServers() {
- Vector serverIds = new Vector();
- {
- IServer[] servers = ServerCore.getServers();
- if (servers != null && servers.length!=0) {
- for (int i = 0; i < servers.length; i++) {
- IServer server = (IServer) servers[i];
- serverIds.add(server.getName());
- existingServersTable_.put(server.getName(), server);
- }
- }
- }
- return (String[]) serverIds.toArray(new String[serverIds.size()]);
- }
-
- /**
- * Get all server types available for creation
- *
- * @return String[] of server names
- */
- private String[] getAllServerTypes() {
- Vector serverTypes_ = new Vector();
- IServerType[] defaultServersList = ServerCore.getServerTypes();
- for (int i = 0; i < defaultServersList.length; i++) {
- IServerType serverType = (IServerType) defaultServersList[i];
- serverTypes_.add(serverType.getId());
- }
- return (String[]) serverTypes_.toArray(new String[serverTypes_.size()]);
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
deleted file mode 100644
index 8bd1b5d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionFilter.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceImpl;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-
-public class TypeSelectionFilter
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private IStructuredSelection initSelection_;
-
- /*
- * @deprecated should be removed
- */
- public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, HashMap webServiceTypes)
- {
-
- HashSet supportedTypes = new HashSet();
- if (initialSelection != null && initialSelection.size() == 1)
- {
-
- // Check for null initial selection
- Object initialObject = initialSelection.getFirstElement();
- if (initialObject == null)
- {
- return null;
- }
- // Match up resource type metadata with initial selection
- Iterator iter = webServiceTypes.values().iterator();
- while (iter.hasNext())
- {
- IWebServiceType wst = (IWebServiceType)iter.next();
- String typeId = (String)wst.getId();
- if (!supportedTypes.contains(typeId))
- {
- String[] resourceTypes = wst.getResourceTypeMetadata();
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = wst.getExtensionMetadata();
- if (acceptsName(name, extensions))
- {
- supportedTypes.add(typeId);
- }
- }
-
- }
- }
- }
- }
-
- }
-
- if (supportedTypes.isEmpty())
- return null;
- else
- {
- return (String[])supportedTypes.toArray(new String[0]);
- }
- }
-
- public String[] getWebServiceTypeByInitialSelection(IStructuredSelection initialSelection, ArrayList webServiceTypeList)
- {
-
- ArrayList supportedTypes = new ArrayList();
- if (initialSelection != null && initialSelection.size() == 1)
- {
-
- // Check for null initial selection
- Object initialObject = initialSelection.getFirstElement();
- if (initialObject == null)
- {
- return null;
- }
- // Match up resource type metadata with initial selection
- Iterator iter = webServiceTypeList.iterator();
- while (iter.hasNext())
- {
- String wst = (String)iter.next();
- String scenario = wst.substring(0,wst.indexOf("/"));
- String implId = wst.substring(wst.indexOf("/")+1);
- //IWebServiceType wst = (IWebServiceType)iter.next();
- //String typeId = (String)wst.getId();
- if (scenario.equals(String.valueOf(WebServiceScenario.BOTTOMUP)) && !supportedTypes.contains(wst))
- {
-
-
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
- String[] resourceTypes = wsimpl.getResourceTypeMetadata();
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = wsimpl.getExtensionMetadata();
- if (acceptsName(name, extensions))
- {
- supportedTypes.add(wst);
- }
- }
-
- }
- }
- }
- }
-
- //If no wsImpls have accepted this selection, check if this is WSDL. If it is,
- //add the top-down Java service type to the list.
- if (supportedTypes.isEmpty())
- {
- String[] resourceTypes = {"File", "IResource", "String", "ServiceImpl", "ServiceRefImpl", "WSDLResourceImpl"};
- for (int i=0; i<resourceTypes.length; i++)
- {
- if (resourceTypes[i]!=null)
- {
- if ((initialObject.getClass().getName()).endsWith(resourceTypes[i]))
- {
- String name = null;
- IResource resource = null;
-
- try
- {
- resource = ResourceUtils.getResourceFromSelection(initialObject);
- }
- catch( CoreException exc )
- {
- resource = null;
- }
-
- if (resource instanceof IContainer)
- {
- name = initialObject.getClass().getName();
- }
- else if( resource != null )
- {
- name = resource.getFullPath().toString();
- }
- else
- {
- name = initialObject.getClass().getName();
- }
- String[] extensions = {".wsdl", ".wsil", ".html", ".ServiceImpl", ".ServiceRefImpl", ".WSDLResourceImpl"};
- if (acceptsName(name, extensions))
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append("org.eclipse.jst.ws.wsImpl.java");
- String entry = entrybuff.toString();
- supportedTypes.add(entry);
- }
- }
-
- }
- }
- }
-
- }
-
-
-
- if (supportedTypes.isEmpty())
- {
- //It's not a registered implementation and its not WSDL so return null;
- return null;
- }
- else
- {
- return (String[])supportedTypes.toArray(new String[0]);
- }
- }
- //
- // Checks if the given name is acceptable based upon its extension
- //
- private boolean acceptsName ( String name, String[] extensions)
- {
- //Return true if "all" extensions are supported.
-
- if (extensions[0]!=null)
- {
- if (extensions[0].equals("all"))
- {
- return true;
- }
- }
-
- for (int i=0; i<extensions.length; i++)
- {
- if (extensions[i]!=null)
- {
- if (name.endsWith(extensions[i]))
- return true;
- }
- }
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
deleted file mode 100644
index 198c12d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/TypeSelectionMetadata.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
- //
- // This class holds the set of distinguishing factors in determining
- // the default Web service type. The default Web Service type will be determined
- // by pattern matching the initial selection with the supported extension
- // and the resource type metadata specified in the manifest file.
- //
- public class TypeSelectionMetadata
- {
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public String[] extensionMeta;
- public String[] resourceTypeMeta;
-
- public TypeSelectionMetadata(String extensionMD, String resourceTypeMD)
- {
- setExtensionMetadata(extensionMD);
- setResourceTypeMetadata(resourceTypeMD);
- }
-
- public void setExtensionMetadata(String extensionMetadata)
- {
- StringTokenizer st = new StringTokenizer(extensionMetadata);
- extensionMeta = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String exten = (String)st.nextToken();
- if (exten!=null)
- {
- extensionMeta[i]=exten;
- }
- i++;
- }
-
- }
-
- public String[] getExtensionMetadata()
- {
- return extensionMeta;
- }
-
- public void setResourceTypeMetadata(String resourceTypeMetadata)
- {
- StringTokenizer st = new StringTokenizer(resourceTypeMetadata);
- resourceTypeMeta = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String resourceType = (String)st.nextToken();
- if (resourceType!=null)
- {
- resourceTypeMeta[i]=resourceType;
- }
- i++;
- }
- }
-
- public String[] getResourceTypeMetadata()
- {
- return resourceTypeMeta;
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceClientTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceClientTypeRegistry.java
deleted file mode 100644
index 670b4da..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceClientTypeRegistry.java
+++ /dev/null
@@ -1,660 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreAssemblyFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreDeployFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreDevelopFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ClientPreInstallFragment;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBindingList;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class WebServiceClientTypeRegistry implements CommandRegistry
-{
- private static WebServiceClientTypeRegistry instance_;
-
- private Vector configElems_;
- private HashSet typeNames_; // no duplicate client type names
- private HashMap types_;
- private HashMap clientTypeAndIds_;
- private HashMap clientIdToLabel_;
-
- private HashMap webServiceServers;
- private HashMap webServiceRuntimes;
- private HashMap webServiceClientTypes;
-
- private DataMappingRegistry dataMappingRegistry_;
- private WidgetRegistry widgetRegistry_;
- private CanFinishRegistry canFinishRegistry_;
- private HashMap factoryCache_;
-
- private WebServiceClientTypeRegistry()
- {
- }
-
- //
- // Loads WebServiceClientType objects into this registry.
- // This is done by querying the plugin registry for all extensions
- // hanging on the webServiceClientType extension point. Extensions
- // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceClientType
- // interface.
- //
- private void loadTypes ()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "webServiceClientType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
-
- if (elem.getName().equals("webServiceServer")) {
- WebServiceServer wss = new WebServiceServer(elem);
- webServiceServers.put(elem.getAttribute("id"), wss);
- }
- else if (elem.getName().equals("webServiceRuntime")) {
- WebServiceRuntime rt = new WebServiceRuntime(elem);
- webServiceRuntimes.put(elem.getAttribute("id"), rt);
- }
- else if (elem.getName().equals("webServiceClientType"))
- {
-
- String name = elem.getAttribute( "name" );
- typeNames_.add( name );
-
- String typeId = elem.getAttribute("clientType");
- if (typeId==null) {
- typeId = name;
- }
-
- String id = elem.getAttribute("id");
- clientTypeAndIds_.put(name, typeId);
- String serverId = elem.getAttribute("server");
- String runtimeId = elem.getAttribute("runtime");
- WebServiceServerRuntimeClientType wst = new WebServiceServerRuntimeClientType(serverId, runtimeId, typeId, name, elem);
- webServiceClientTypes.put(id, wst);
- types_.put(id, null );
- clientIdToLabel_.put( typeId, name );
- }
- configElems_.add( elem );
-
- }
- }
-
-
- /**
- * Loads WebServiceClientType objects into this registry.
- * See method getInstance().
- */
- private void load ()
- {
- typeNames_ = new HashSet();
- configElems_ = new Vector();
- types_ = new HashMap();
- clientTypeAndIds_ = new HashMap();
- webServiceClientTypes = new HashMap();
- webServiceRuntimes = new HashMap();
- webServiceServers = new HashMap();
- clientIdToLabel_ = new HashMap();
- loadTypes();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static WebServiceClientTypeRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceClientTypeRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- public WebServiceRuntime getRuntimeById( String id )
- {
- return (WebServiceRuntime)webServiceRuntimes.get( id );
- }
-
- public String[] getRuntimesByType(String typeId)
- {
- IConfigurationElement[] elems = getConfigurationElement(typeId);
- Vector runtimesVector = new Vector();
- String[] runtimeIds = new String[elems.length];
- for (int i=0; i<elems.length; i++)
- {
- IConfigurationElement elem = (IConfigurationElement)elems[i];
- runtimeIds[i] = elem.getAttribute("runtime");
- }
- return runtimeIds;
- }
-
- public boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
- {
- IWebServiceRuntime wsr = (IWebServiceRuntime)webServiceRuntimes.get(runtimeId);
- String[] j2eeVersions = wsr.getJ2EEVersions();
- if (j2eeVersions==null || j2eeVersions.length==0)
- return true;
-
- for(int i=0; i<j2eeVersions.length; i++)
- {
- if (j2eeVersions[i].equals(j2eeVersionId))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
- {
- //Vector serverFactoryIds = new Vector();
- Iterator it = webServiceClientTypes.values().iterator();
- while (it.hasNext()) {
- WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)it.next();
- if (wssrt.runtimeId_!=null) {
- if ((wssrt.runtimeId_).equalsIgnoreCase(runtimeId)) {
- WebServiceServer wss = (WebServiceServer)webServiceServers.get(wssrt.serverId_);
- String thisFactoryId = wss.getFactoryId();
- IServerType serverType = ServerCore.findServerType(thisFactoryId);
- if (serverType == null)
- continue;
-
- String thisServerTargetId = serverType.getRuntimeType().getId();
- if (thisServerTargetId.equals(serverTargetId))
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Returns the names of all registered <code>WebServiceClientType</code>
- * objects.
- * @return The names of all registered <code>WebServiceClientType</code>
- * objects.
- */
- public String[] getWebServiceClientTypeNames ()
- {
- return (String[])typeNames_.toArray( new String[0] );
- }
-
- public LabelsAndIds getClientTypeLabels()
- {
- LabelsAndIds labelIds = new LabelsAndIds();
- Iterator iterator = clientIdToLabel_.entrySet().iterator();
- int size = clientIdToLabel_.size();
- String[] labels = new String[size];
- String[] ids = new String[size];
- int index = 0;
-
- labelIds.setLabels_( labels );
- labelIds.setIds_( ids );
-
- while( iterator.hasNext() )
- {
- Map.Entry entry = (Map.Entry)iterator.next();
-
- ids[index] = (String)entry.getKey();
- labels[index] = (String)entry.getValue();
- index++;
- }
-
- return labelIds;
- }
-
- /**
- * Returns the IConfigurationElement given the server, runtime, and type attributes
- * The benefit of getting the IConfigurationElement is that the corresponding class
- * file and plugin are not loaded immediately.
- * @param server label
- * @param runtime label
- * @param type label
- * @return IConfiguration element
- */
- public IConfigurationElement getConfigurationElementFor(String serverId, String runtimeId, String typeId)
- {
- Iterator iter = webServiceClientTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)iter.next();
- if (wssrt.hasConfigurationElementFor(serverId, runtimeId, typeId)) {
- return wssrt.element_;
- }
- }
- return null;
- }
-
- public IConfigurationElement getConfigElementFor(String factoryId, String runtimeId, String typeId)
- {
- Iterator iter = webServiceClientTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)iter.next();
- if (wssrt.hasConfigElementFor(factoryId, runtimeId, typeId)) {
- return wssrt.element_;
- }
- }
- return null;
- }
-
- public String getClientExtensionIdFor(String serverId, String runtimeId, String typeId) {
- IConfigurationElement element = getConfigurationElementFor(serverId, runtimeId, typeId);
- return element.getAttribute("id");
- }
-
- public IConfigurationElement getConfigurationElementById(String id) {
-
- WebServiceServerRuntimeClientType wsrt = (WebServiceServerRuntimeClientType)webServiceClientTypes.get(id);
- return (IConfigurationElement)wsrt.element_;
-
- }
-
- public IConfigurationElement[] getConfigurationElement(String clientTypeId)
- {
- Vector v = new Vector();
- for (Iterator it = configElems_.iterator(); it.hasNext();)
- {
- IConfigurationElement element = (IConfigurationElement)it.next();
- String clientType = element.getAttribute("clientType");
- if (clientType != null && clientType.equals(clientTypeId))
- v.add(element);
- }
- return (IConfigurationElement[])v.toArray(new IConfigurationElement[0]);
- }
-
- public IConfigurationElement[] getConfigurationElement(String clientTypeId, String runtimeId)
- {
- Vector v = new Vector();
- for (Iterator it = configElems_.iterator(); it.hasNext();)
- {
- IConfigurationElement element = (IConfigurationElement)it.next();
- String clientType = element.getAttribute("clientType");
- String runtime = element.getAttribute("runtime");
- if (clientType != null && runtime != null && clientType.equals(clientTypeId) && runtime.equals(runtimeId))
- v.add(element);
- }
- return (IConfigurationElement[])v.toArray(new IConfigurationElement[0]);
- }
-
-
-
- public String getServerIdForFactoryId(String factoryId) {
-
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext()) {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss.getFactoryId().equals(factoryId)) {
- return wss.getId();
- }
- }
- return null;
-
- }
-
- public String getServerFactoryIdByServerLabel(String label) {
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext()) {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss.getLabel().equals(label)) {
- return wss.getFactoryId();
- }
- }
- return null;
- }
-
- public WebServiceRuntime getWebServiceRuntimeByName(String runtimeName) {
- Iterator iter = webServiceRuntimes.values().iterator();
- while (iter.hasNext()) {
- WebServiceRuntime wsr = (WebServiceRuntime)iter.next();
- if (wsr.getLabel().equals(runtimeName)) {
- return wsr;
- }
- }
- return null;
- }
-
- public WebServiceServer getWebServiceServerByFactoryId(String factoryId) {
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext()) {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss.getFactoryId().equals(factoryId)) {
- return wss;
- }
- }
- return null;
- }
-
- public String getServerInstanceLabelFromInstanceId( String instanceId )
- {
- IServer server = ServerCore.findServer( instanceId );
-
- return server.getName();
- }
-
- public String[] getAllClientServerFactoryIds() {
- String[] serverFactoryIds = new String[webServiceServers.size()];
- int i=0;
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext()) {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss.getFactoryId()!=null) {
- serverFactoryIds[i]=wss.getFactoryId();
- i++;
- }
- }
- return serverFactoryIds;
- }
-
- public String[] getAllClientRuntimes() {
- String[] runtimes = new String[webServiceRuntimes.size()];
- int i=0;
- Iterator iter = webServiceRuntimes.values().iterator();
- while (iter.hasNext()) {
- WebServiceRuntime wsr = (WebServiceRuntime)iter.next();
- if (wsr.getId() != null) {
- runtimes[i]=wsr.getId();
- i++;
- }
- }
- return runtimes;
- }
-
- public String getRuntimeLabelById(String runtimeId) {
- WebServiceRuntime wsRuntime = (WebServiceRuntime)webServiceRuntimes.get(runtimeId);
- if (wsRuntime!=null) {
- return wsRuntime.getLabel();
- }
- return null;
- }
-
- public String getClientTypeIdByName(String name) {
- return (String)clientTypeAndIds_.get(name);
- }
-
- public IWebServiceRuntime getWebServiceRuntimeById(String runtimeId)
- {
- return (IWebServiceRuntime)webServiceRuntimes.get(runtimeId);
- }
-
-
- /**
- * Gets the runtime IDs of all web service server runtime type
- * with an server factory ID equals to the input
- * @param server factory ID
- * @return array of runtime IDs
- */
- public String[] getRuntimeIdsByServerFactoryId(String serverFactoryID) {
- Vector runtimeIds = new Vector();
- Iterator it = webServiceClientTypes.values().iterator();
- while (it.hasNext()) {
- WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)it.next();
- if (wssrt.serverId_!=null) {
- String serverId = wssrt.serverId_;
- WebServiceServer wss = (WebServiceServer)webServiceServers.get(serverId);
- String wssfId = wss.getFactoryId();
- if (wssfId.equals(serverFactoryID))
- runtimeIds.add(wssrt.runtimeId_);
- /*
- String wssFactoryId = ((WebServiceServer)webServiceServers.get(wssrt.serverId_)).getFactoryId();
- if (wssFactoryId.equalsIgnoreCase(serverFactoryID)) {
- runtimeIds.add(wssrt.runtimeId_);
- }
- */
- }
- }
- return (String[])runtimeIds.toArray(new String[0]);
- }
-
- public String[] getServerFactoryIdsByClientType(String clientTypeName) {
-
- Vector factoryIds = new Vector();
- String clientTypeId = getClientTypeIdByName(clientTypeName);
- Iterator iter = webServiceClientTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)iter.next();
- if ((wssrt.typeId_).equalsIgnoreCase(clientTypeId)) {
- WebServiceServer wss = (WebServiceServer)webServiceServers.get(wssrt.serverId_);
- factoryIds.add(wss.getFactoryId());
- }
-
- }
- return (String[])factoryIds.toArray(new String[0]);
-
- }
-
- /**
- * Gets the server factoryIds of all web service server runtime type
- * with an runtime Id equals to the input
- * @param runtime Id
- * @return array of factory Ids
- */
- public String[] getServerFactoryIdsByRuntimeId(String runtimeID) {
- Vector serverFactoryIds = new Vector();
- Iterator it = webServiceClientTypes.values().iterator();
- while (it.hasNext()) {
- WebServiceServerRuntimeClientType wssrt = (WebServiceServerRuntimeClientType)it.next();
- if (wssrt.runtimeId_!=null) {
- if ((wssrt.runtimeId_).equalsIgnoreCase(runtimeID)) {
- WebServiceServer wss = (WebServiceServer)webServiceServers.get(wssrt.serverId_);
- serverFactoryIds.add(wss.getFactoryId());
- }
- }
- }
- return (String[])serverFactoryIds.toArray(new String[0]);
- }
-
- public boolean webServiceClientRuntimeTypeExists(String serverId, String runtimeId, String typeId) {
- if (getConfigurationElementFor(serverId, runtimeId, typeId)==null)
- return false;
- return true;
-
- }
-
- public String[] getServerFactoryIdsByType(String clientTypeId)
- {
- String clientTypeName = (String)clientIdToLabel_.get(clientTypeId);
- return getServerFactoryIdsByClientType(clientTypeName);
- }
-
- public boolean isServerSupportedForChosenType(String clientTypeId, String serverFactoryID)
- {
- String[] supportedServerFactoryIds = getServerFactoryIdsByType(clientTypeId);
- if (supportedServerFactoryIds!=null && supportedServerFactoryIds.length>0)
- {
- for (int i=0; i<supportedServerFactoryIds.length; i++)
- {
- if (supportedServerFactoryIds[i].equals(serverFactoryID))
- return true;
- }
- }
- return false;
- }
-
- /**
- * WebServiceServerRuntimeClientType is the cached metadata including the IConfiguration
- */
- public final class WebServiceServerRuntimeClientType
- {
-
- private String typeId_ = null;
- private String serverId_ = null;
- private String runtimeId_ = null;
- private IConfigurationElement element_;
- private boolean requiresServerRuntime_ = false;
- private String label_;
-
- protected WebServiceServerRuntimeClientType(String serverId, String runtimeId,String typeId, String label, IConfigurationElement elem)
- {
- typeId_ = new String(typeId.trim());
- if (serverId!=null)
- serverId_ = new String(serverId.trim());
- if (runtimeId!=null)
- runtimeId_ = new String(runtimeId.trim());
- element_ = elem;
- if (serverId_!=null && runtimeId_!=null) {
- requiresServerRuntime_ = true;
- }
-
- label_ = label;
- }
-
- public boolean hasConfigurationElementFor(String serverID, String runtimeID, String typeID) {
- if (typeId_.equalsIgnoreCase(typeID) && !requiresServerRuntime_)
- return true;
-
- if (requiresServerRuntime_) {
- if (typeId_.equalsIgnoreCase(typeID) &&
- serverId_.equalsIgnoreCase(serverID) &&
- runtimeId_.equalsIgnoreCase(runtimeID))
- return true;
- }
- return false;
- }
-
- public boolean hasConfigElementFor(String factoryID, String runtimeID, String typeID) {
- if (typeId_.equalsIgnoreCase(typeID) && !requiresServerRuntime_)
- return true;
-
- if (requiresServerRuntime_)
- {
- String serverID = getServerIdForFactoryId( factoryID );
-
- if (typeId_.equalsIgnoreCase(typeID) &&
- serverId_.equalsIgnoreCase(serverID) &&
- runtimeId_.equalsIgnoreCase(runtimeID))
- return true;
- }
- return false;
- }
-
- public IConfigurationElement getClientTypeConfigurationElementFor(String serverID, String runtimeID, String typeID)
- {
- if (this.typeId_.equalsIgnoreCase(typeID) && serverID==null && runtimeID==null)
- return this.element_;
-
- if (this.typeId_.equalsIgnoreCase(typeID) &&
- this.serverId_.equalsIgnoreCase(serverID) &&
- this.runtimeId_.equalsIgnoreCase(runtimeID))
- return this.element_;
- return null;
- }
- }
-
- public CommandFragmentFactoryFactory getFactoryFactory( String[] ids )
- {
- String hashKey = ids[2] + "#" + ids[1] + "#" + ids[0];
- CommandWidgetBinding binding = (CommandWidgetBinding)factoryCache_.get( hashKey );
-
- if( binding == null )
- {
- IConfigurationElement element = getConfigElementFor( ids[2], ids[1], ids[0] );
-
- if( element == null ) return null;
-
- binding = createBinding( element );
-
- factoryCache_.put( hashKey, binding );
-
- binding.registerDataMappings( dataMappingRegistry_ );
-
- if( widgetRegistry_ != null )
- {
- binding.registerWidgetMappings( widgetRegistry_ );
- binding.registerCanFinish( canFinishRegistry_ );
- }
- }
-
- return binding;
- }
-
- private CommandWidgetBinding createBinding(IConfigurationElement element )
- {
- Vector bindings = new Vector(4);
- Vector fragments = new Vector(4);
-
- addBinding( element, "developBinding", bindings );
- addBinding( element, "assemblyBinding", bindings );
- addBinding( element, "deployBinding", bindings );
- addBinding( element, "installBinding", bindings );
-
- fragments.add( new ClientPreDevelopFragment() );
- fragments.add( new ClientPreAssemblyFragment() );
- fragments.add( new ClientPreDeployFragment() );
- fragments.add( new ClientPreInstallFragment() );
-
- return new CommandWidgetBindingList( bindings, fragments );
- }
-
- private void addBinding( IConfigurationElement element, String bindingName, Vector list )
- {
- Object binding = null;
-
- if( element.getAttribute( bindingName ) != null )
- {
- try
- {
- binding = element.createExecutableExtension( bindingName );
- }
- catch( CoreException exc )
- {
- }
- }
-
- list.add( binding );
- }
-
- public void setDataMappingRegistry( DataMappingRegistry registry )
- {
- dataMappingRegistry_ = registry;
-
- // We need to rebuild the factory cache each time we start the client
- // wizard.
- factoryCache_ = new HashMap();
- }
-
- public void setWidgetRegistry( WidgetRegistry registry )
- {
- widgetRegistry_ = registry;;
- }
-
- public void setCanFinishRegistry( CanFinishRegistry registry )
- {
- canFinishRegistry_ = registry;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
deleted file mode 100644
index 64bc552..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceInfo.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-
-/**
-* This type is used to hold user or calculated
-* data to be use by finsih tasks
-*/
-public interface WebServiceInfo
-{
-
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceRuntime.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceRuntime.java
deleted file mode 100644
index 3b9eef6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceRuntime.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact.
-*/
-public class WebServiceRuntime implements IWebServiceRuntime
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private IConfigurationElement element_;
- public String runtimeId_;
- public String runtimeLabel_;
- public String runtimeDescription_;
- public String[] j2eeVersions;
-
-
- public WebServiceRuntime(IConfigurationElement elem)
- {
- super();
- this.element_ = elem;
- }
-
- /**
- * Returns the id of this Web Service runtime.
- * @return id of this Web Service runtime.
- */
- public String getId ()
- {
- if (runtimeId_ == null)
- runtimeId_ = element_.getAttribute("id");
- return runtimeId_;
- }
-
-
- /**
- * Returns a locale specific description of this Web Service runtime.
- * @return A locale specific description of this Web Service runtime.
- */
- public String getDescription ()
- {
- if (runtimeDescription_ == null)
- runtimeDescription_ = element_.getAttribute("description");
- return runtimeDescription_;
- }
-
- /**
- * Returns a short, locale specific Label of this Web Service runtime.
- * @return A short, locale specific Label of this Web Service runtime.
- */
- public String getLabel ()
- {
- if (runtimeLabel_==null)
- runtimeLabel_ = WebServiceConsumptionUIPlugin.getMessage((String)element_.getAttribute("label"));
- return runtimeLabel_;
- }
-
- /**
- * Returns a True if this runtime has been set as default
- * @return a boolean
- */
- public boolean getIsDefault()
- {
- return Boolean.valueOf(element_.getAttribute("isDefault")).booleanValue();
- }
-
- /**
- * Returns a String, J2EE version
- * @return
- */
- public String[] getJ2EEVersions()
- {
- if (j2eeVersions == null)
- {
- String attr = element_.getAttribute("j2eeversion");
- if (attr != null)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- j2eeVersions = new String[size];
- for (int i = 0; i < j2eeVersions.length; i++)
- j2eeVersions[i] = st.nextToken();
- }
- }
- return j2eeVersions;
- }
-
- /**
- * Returns the configuration element associated with
- * this runtime.
- *
- * @return org.eclipse.core.runtime.IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement()
- {
- return element_;
- }
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServer.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServer.java
deleted file mode 100644
index b42e47a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServer.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public class WebServiceServer implements IWebServiceServer
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public IConfigurationElement element_;
- public String serverId_;
- public String factoryId_;
- public String serverLabel_;
-
- public WebServiceServer(IConfigurationElement elem)
- {
- super();
- this.element_ = elem;
- }
- /**
- * Returns the id of this Web Service type.
- * @return id of this Web Service type.
- */
- public String getId ()
- {
- if (serverId_==null)
- serverId_ = element_.getAttribute("id");
- return serverId_;
- }
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getFactoryId ()
- {
- if (factoryId_==null)
- factoryId_ = element_.getAttribute("factoryId");
- return factoryId_;
- }
-
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getLabel ()
- {
- if (serverLabel_ == null)
- {
- IServerType serverType = ServerCore.findServerType(getFactoryId());
- serverLabel_ = ServerUICore.getLabelProvider().getText(serverType);
- }
- return serverLabel_;
- }
-
- /**
- * Returns a True if this server has been set as default
- * @return a boolean
- */
- public boolean getIsDefault()
- {
-
- return Boolean.valueOf(element_.getAttribute("isDefault")).booleanValue();
- }
-
- /**
- * Returns runtime target Id
- * @return String
- */
- public String getRuntimeTypeId()
- {
- return element_.getAttribute("runtimeTypeIds");
- }
-
- /**
- * Returns the configuration element associated with
- * this type.
- *
- * @return org.eclipse.core.runtime.IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement()
- {
- return this.element_;
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeType.java
deleted file mode 100644
index df6e1d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeType.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service-Server-Runtime artifact. The primary purpose of a WebServiceServerRuntimeType
-* object is to manufacture the wizard pages that support the type, server, and runtime configuration.
-*/
-public interface WebServiceServerRuntimeType
-{
- /**
- * Returns a short, locale specific name of this Web Service Server-Runtime type.
- * @return A short, locale specific name of this Web Service Server-Runtime type.
- */
- public String getName ();
-
- /**
- * Returns a locale specific description of this Web Service Server-Runtime type.
- * @return A locale specific description of this Web Service Server-Runtime type.
- */
- public String getDescription ();
-
- /**
- * Returns a label for the Server supported by this Web Service Server-Runtime type
- * @return A server label from server plugins
- */
- public String getServerLabel();
-
- /**
- * Sets a label for the Server supported by this Web Service Server-Runtime type
- * @param A server label from server plugins
- */
- public void setServerLabel(String serverLabel);
-
- /**
- * Returns a label for the deployment runtime of this Web Service Server-Runtime type
- * @return A label for the deployment runtime
- */
- public String getRuntimeLabel();
-
- /**
- * Sets a label for the deployment runtime of this Web Service Server-Runtime type
- * @param A label for the deployment runtime
- */
- public void setRuntimeLabel(String runtimeLabel);
-
- /**
- * Returns a label for the Web Service type associated with this WebServiceServerRuntimeType
- * @return A label for the Web Service type
- */
- public String getWebServiceTypeLabel();
-
- /**
- * Returns whether or not a Web Module is required for this WebServiceServerRuntimeType
- * @return true if requireWebModule
- */
- public boolean isWebModuleRequired();
-
- /**
- * Sets the boolean value at runtime according to requireWebModule attribute from the manifest file
- * @param requireWebModule
- */
- public void setWebModuleRequired(boolean requireWebModule);
-
- /**
- * Returns whether or not an EJB Module is required for this WebServiceServerRuntimeType
- * @return true is requireEJBModule is true
- */
- public boolean isEJBModuleRequired();
-
- /**
- * Sets the boolean value at runtime according to requireEJBModule attribute from the manifest file
- * @param requireEJBModule
- */
- public void setEJBModuleRequired(boolean requireEJBModule);
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeTypeRegistry.java
deleted file mode 100644
index 340aab3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceServerRuntimeTypeRegistry.java
+++ /dev/null
@@ -1,1200 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreAssemblyFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreDeployFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreDevelopFragment;
-import org.eclipse.jst.ws.internal.consumption.fragments.ServicePreInstallFragment;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactoryFactory;
-import org.eclipse.wst.command.internal.env.core.registry.CommandRegistry;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBindingList;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class WebServiceServerRuntimeTypeRegistry implements CommandRegistry
-{
-
- private static WebServiceServerRuntimeTypeRegistry instance_;
-
- private IConfigurationElement[] indexedConfigElems_;
-
- private HashMap webServiceServers;
- private HashMap webServiceRuntimes;
- private HashMap webServiceTypes;
- private HashMap webServiceServerRuntimeTypes;
-
- private Hashtable runtimesByType_;
- private Hashtable runtimeLabelById_;
- private Hashtable runtimeIdByLabel_;
- private Hashtable serversByType_;
- private Hashtable serverLabelByFactoryId_;
- private Hashtable serverFactoryIdByLabel_;
-
- private Hashtable configElemsById_;
-
- private DataMappingRegistry dataMappingRegistry_;
- private WidgetRegistry widgetRegistry_;
- private CanFinishRegistry canFinishRegistry_;
- private HashMap factoryCache_;
-
- private SelectionListChoices serverToRuntimeToJ2EE_;
- private Log log_;
-
- public WebServiceServerRuntimeTypeRegistry() {
- log_ = new EclipseLog();
- }
- //
- // Loads WebServiceServerRuntimeType objects into this registry.
- // This is done by querying the plugin registry for all extensions
- // hanging on the WebServiceServerRuntimeType extension point. Extensions
- // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceServerRuntimeType
- // interface.
- //
- private void loadTypes ()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "webServiceServerRuntimeType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- if (elem.getName().equals("webServiceServer"))
- {
- WebServiceServer wss = new WebServiceServer(elem);
- webServiceServers.put(elem.getAttribute("id"), wss);
- String serverLabel = wss.getLabel();
- if (serverLabel != null && serverLabel.length()>0)
- {
- if (!serverLabelByFactoryId_.containsKey(wss.getFactoryId()));
- serverLabelByFactoryId_.put(wss.getFactoryId(), serverLabel);
- if (!serverFactoryIdByLabel_.containsKey(serverLabel));
- serverFactoryIdByLabel_.put(serverLabel, wss.getFactoryId());
- }
-
- }
- else if (elem.getName().equals("webServiceRuntime"))
- {
- WebServiceRuntime rt = new WebServiceRuntime(elem);
- webServiceRuntimes.put(elem.getAttribute("id"), rt);
- if(!runtimeLabelById_.containsKey(rt.getId()))
- runtimeLabelById_.put(rt.getId(), rt.getLabel());
- if(!runtimeIdByLabel_.containsKey(rt.getLabel()))
- runtimeIdByLabel_.put(rt.getLabel(), rt.getId());
-
- }
- else if (elem.getName().equals("webServiceType"))
- {
- WebServiceTypeImpl wst = new WebServiceTypeImpl(elem);
- webServiceTypes.put(elem.getAttribute("id"), wst);
- }
- else if (elem.getName().equals("webServiceServerRuntimeType"))
- {
- configElemsById_.put(elem.getAttribute("id"), elem);
-
- String typeId = elem.getAttribute("type");
- String serverId = elem.getAttribute("server");
- String runtimeId = elem.getAttribute("runtime");
- WebServiceServerRuntimeType_ wssrt = new WebServiceServerRuntimeType_(serverId, runtimeId, typeId, elem);
- webServiceServerRuntimeTypes.put(elem.getAttribute("id"), wssrt);
-
- setRuntimesByType(typeId,runtimeId);
- setServersByType(typeId, serverId);
-
- }
-
- }
- catch (Exception e)
- {
- log_.log(Log.ERROR, 5058, this, "loadTypes", e);
- }
-
- }
- }
-
-
- /**
- * Sets the Web service runtimes and type from each extension
- * in a Hashtable. The type is the key, and value is a Vector containing
- * each runtime supported in that Web service type.
- * @param runtime name
- * @param type name
- */
- private void setRuntimesByType(String typeId, String runtime)
- {
- if(runtimesByType_.get(typeId)!=null)
- {
- Vector v = (Vector)runtimesByType_.get(typeId);
- if (!v.contains(runtime.trim())) {
- v.add(runtime.trim());
- }
- }
- else
- {
- Vector vect = new Vector();
- vect.add(runtime.trim());
- runtimesByType_.put(typeId,vect);
- }
- }
-
- public WebServiceRuntime getRuntimeById( String id )
- {
- return (WebServiceRuntime)webServiceRuntimes.get( id );
- }
-
- /**
- * Gets the Web sevice runtimes vector given a type
- * @param Web service type
- * @return array of runtime labels
- */
- public String[] getRuntimesByType(String webServiceType)
- {
- String[] runtimes;
- if (runtimesByType_.containsKey(webServiceType))
- {
- Vector vect =(Vector)runtimesByType_.get(webServiceType);
- runtimes = new String[vect.size()];
- for (int i=0; i<vect.size(); i++)
- {
- String runtimeId = (String)vect.elementAt(i);
- WebServiceRuntime wsr = (WebServiceRuntime)webServiceRuntimes.get(runtimeId);
- if (wsr!=null) {
- runtimes[i] = (String)wsr.getId();
- }
- }
- return runtimes;
-
- }
- else
- {
- log_.log(Log.ERROR, 5059, this, "getRuntimesByType", "runtimes not found for Web service type "+webServiceType);
- return null;
- }
-
- }
-
- public boolean isRuntimeSupportedForType(String webServiceTypeId, String runtimeId)
- {
- String[] runtimes = getRuntimesByType(webServiceTypeId);
- for(int i=0;i<runtimes.length;i++)
- {
- if (runtimes[i].equals(runtimeId))
- return true;
- }
- return false;
- }
-
- public boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
- {
- IWebServiceRuntime wsr = (IWebServiceRuntime)webServiceRuntimes.get(runtimeId);
- String[] j2eeVersions = wsr.getJ2EEVersions();
- if (j2eeVersions==null || j2eeVersions.length==0)
- return true;
-
- for(int i=0; i<j2eeVersions.length; i++)
- {
- if (j2eeVersions[i].equals(j2eeVersionId))
- {
- return true;
- }
- }
- return false;
- }
-
- public boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
- {
- Iterator it = webServiceServerRuntimeTypes.values().iterator();
- while (it.hasNext())
- {
- WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)it.next();
- if (wssrt!=null) {
- if (wssrt.runtimeId_.equals(runtimeId))
- {
- IWebServiceServer wsserver = getWebServiceServerById(wssrt.serverId_);
- String thisFactoryId = wsserver.getFactoryId();
- IServerType serverType = ServerCore.findServerType(thisFactoryId);
- if (serverType == null)
- continue;
-
- String thisServerTargetId = serverType.getRuntimeType().getId();
- if (thisServerTargetId.equals(serverTargetId))
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Gets the server factoryIDs of all web service server runtime type
- * with an runtime ID equals to the input
- * @param runtime ID
- * @return array of factory IDs
- */
- public String[] getServerFactoryIDByRuntimeID(String runtimeID) {
- Vector v = new Vector();
- Iterator it = webServiceServerRuntimeTypes.values().iterator();
- while (it.hasNext()) {
- WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)it.next();
- if (wssrt!=null) {
- if (wssrt.runtimeId_.equals(runtimeID))
- v.add(getWebServiceServerById(wssrt.serverId_).getFactoryId());
-
- }
- }
- String[] serverFactoryIDs = new String[v.size()];
- for (int i = 0; i < v.size(); i++) {
- serverFactoryIDs[i] = (String)v.get(i);
- }
- return serverFactoryIDs;
- }
-
- /**
- * Gets the runtime IDs of all web service server runtime type
- * with an server factory ID equals to the input
- * @param server factory ID
- * @return array of runtime IDs
- */
- public String[] getRuntimeIDsByServerFactoryID(String serverFactoryID) {
- Vector v = new Vector();
- Iterator it = webServiceServerRuntimeTypes.values().iterator();
- while (it.hasNext()) {
- WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)it.next();
- if (wssrt!=null) {
- IWebServiceServer wss = getWebServiceServerById(wssrt.serverId_);
- String wssfId = wss.getFactoryId();
- if (wssfId.equals(serverFactoryID))
- {
- if (!v.contains(wssrt.runtimeId_))
- {
- v.add(wssrt.runtimeId_);
- }
- }
- /*if (getWebServiceServerById(wssrt.serverId_).getFactoryId().equals(serverFactoryID))
- v.add(getWebServiceRuntimeById(wssrt.runtimeId_).getId());*/
- }
- }
- String[] runtimeIDs = new String[v.size()];
- for (int i = 0; i < v.size(); i++) {
- runtimeIDs[i] = (String)v.get(i);
- }
- return runtimeIDs;
- }
-
- /**
- * Sets the Web service servers and type from each extension
- * in a Hashtable. The type is the key, and value is a Vector containing
- * each runtime supported in that Web service type.
- * @param server name
- * @param type name
- */
- private void setServersByType(String typeId, String server)
- {
- if(serversByType_.get(typeId)!=null)
- {
- Vector v = (Vector)serversByType_.get(typeId);
- if (!v.contains(server.trim()))
- {
- v.add(server.trim());
- }
- }
- else
- {
- Vector vect = new Vector();
- vect.add(server.trim());
- serversByType_.put(typeId, vect);
- }
-
- }
-
- /**
- * Gets the Web service servers vector given a type
- * @param Web service type
- * @return array of server factory Ids
- */
- public String[] getServerFactoryIdsByType(String webServiceType)
- {
- String[] servers;
- if (serversByType_.containsKey(webServiceType))
- {
- Vector vect = (Vector)serversByType_.get(webServiceType);
- servers = new String[vect.size()];
- for (int i=0; i<vect.size(); i++)
- {
- String serverId = (String)vect.elementAt(i);
- WebServiceServer wss = (WebServiceServer)webServiceServers.get(serverId);
- if (wss!=null) {
- servers[i] = (String)wss.getFactoryId(); //Note: returning server factory Ids
- }
- }
- return servers;
- }
- else
- {
- log_.log(Log.ERROR, 5060, this, "getServerByType", "Web service server not found for Web service type "+webServiceType);
- return null;
- }
-
- }
-
- public IWebServiceRuntime getWebServiceRuntimeByLabel(String runtimeLabel)
- {
- Iterator iter = webServiceRuntimes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntime wsr = (WebServiceRuntime)iter.next();
- if (wsr!=null) {
- if (runtimeLabel.equals(wsr.getLabel()))
- return wsr;
- }
- }
- return null;
- }
-
- public IWebServiceRuntime getWebServiceRuntimeById(String runtimeId)
- {
- return (IWebServiceRuntime)webServiceRuntimes.get(runtimeId);
- }
-
- public IWebServiceServer getWebServiceServerByFactoryId(String serverFactoryId)
- {
- if (serverFactoryId==null)
- return null;
-
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss!=null && wss.getFactoryId()!=null) {
- if (serverFactoryId.equals(wss.getFactoryId())) {
- return wss;
- }
- }
- }
- return null;
-
- }
-
- public IWebServiceServer getWebServiceServerByLabel(String serverLabel)
- {
- if (serverLabel==null)
- return null;
-
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss!=null) {
- if (serverLabel.equals(wss.getLabel()))
- return wss;
- }
- }
- return null;
-
- }
-
- public IWebServiceServer getWebServiceServerById(String serverId)
- {
- return (IWebServiceServer)webServiceServers.get(serverId);
- }
-
- public IWebServiceType getWebServiceTypeByLabel(String typeLabel)
- {
- Iterator iter = webServiceTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceTypeImpl wst = (WebServiceTypeImpl)iter.next();
- if (wst!=null) {
- if (typeLabel.equals(wst.getLabel()))
- return wst;
- }
- }
- return null;
- }
-
- public IWebServiceType getWebServiceTypeById(String typeId)
- {
- if (webServiceTypes.get(typeId)!= null)
- return (WebServiceTypeImpl)webServiceTypes.get(typeId);
- return null;
- }
-
- /**
- * Returns true if an EJB project is needed to host a Web service
- * of the type identified by typeId. If multiple natureIds are specified in the
- * "includeNatures" attribute, only the first one is checked. If no natureIds are specified,
- * false is returned.
- *
- * @deprecated
- * Should be refactored in future
- */
- public boolean requiresEJBProject(String typeId)
- {
- IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeId);
- if (wst != null)
- {
- IConfigurationElement elem = wst.getConfigurationElement();
- String includedNatures = elem.getAttribute("includeNatures");
- if (includedNatures==null || includedNatures.length()==0)
- {
- return false;
- }
- else
- {
- StringTokenizer st = new StringTokenizer(includedNatures);
- if(st.hasMoreTokens())
- {
- String firstIncludedNature = st.nextToken();
- if (firstIncludedNature.equals(IEJBNatureConstants.NATURE_ID))
- return true;
- }
- }
- }
- return false;
- }
-
- /**
- * Returns a list of valid projects for the Web service type with an id of typeId.
- * In the case where the Web service type extension does not specify which project
- * natures are included, a array of all Web and EJB projects in the workspace will
- * be returned.
- * @param typeId
- * @return IProject[] an array of valid projects
- */
- public IProject[] getProjectsByWebServiceType(String typeId)
- {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList validProjects = new ArrayList();
-// IWebServiceType wst = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceTypeById(typeId);
-// if (wst != null)
-// {
-
- //TODO: This section needs to be refactored to filter ArtifactEdits
- // and uphold project topology described in the extension
-
-// IConfigurationElement elem = wst.getConfigurationElement();
-// String includedNatures = elem.getAttribute("includeNatures");
-// String excludedNatures = elem.getAttribute("excludeNatures");
-// if (includedNatures!=null && includedNatures.length()>0)
-// {
-// for (int i = 0; i < projects.length; i++)
-// {
-// if (include(projects[i], includedNatures) && exclude(projects[i], excludedNatures))
-// validProjects.add(projects[i]);
-// }
-// return (IProject[])validProjects.toArray(new IProject[0]);
-// }
-// }
-
- //If wst was null or the extension didn't specify which project natures are
- // to be included, revert to the old behaviour
- for (int j = 0; j < projects.length; j++)
- {
- if (ResourceUtils.isWebProject(projects[j]) || ResourceUtils.isEJBProject(projects[j]))
- validProjects.add(projects[j]);
- }
- return (IProject[])validProjects.toArray(new IProject[0]);
- }
-
- private boolean include(IProject project, String include)
- {
- StringTokenizer st = new StringTokenizer(include);
- while(st.hasMoreTokens())
- {
- try
- {
- if (project.hasNature(st.nextToken()))
- return true;
- }
- catch (CoreException ce)
- {
- }
- }
- return false;
- }
-
- private boolean exclude(IProject project, String exclude)
- {
- StringTokenizer st = new StringTokenizer(exclude);
- while(st.hasMoreTokens())
- {
- try
- {
- if (project.hasNature(st.nextToken()))
- return false;
- }
- catch (CoreException ce)
- {
- }
- }
- return true;
- }
-
- //
- // Loads WebServiceServerRuntimeType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- runtimesByType_ = new Hashtable();
- serversByType_ = new Hashtable();
- configElemsById_ = new Hashtable();
- runtimeIdByLabel_ = new Hashtable();
- runtimeLabelById_ = new Hashtable();
- serverFactoryIdByLabel_ = new Hashtable();
- serverLabelByFactoryId_ = new Hashtable();
-
- webServiceServers = new HashMap();
- webServiceRuntimes = new HashMap();
- webServiceTypes = new HashMap();
-
- webServiceServerRuntimeTypes = new HashMap();
-
- loadTypes();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceServerRuntimeTypeRegistry object.
- */
- public static WebServiceServerRuntimeTypeRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceServerRuntimeTypeRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- /**
- * Returns the Web Service type names of all registered <code>WebServiceServerRuntimeType</code>
- * objects.
- * @return The Web Service type names of all registered <code>WebServiceServerRuntimeType</code>
- * objects.
- */
- public String[] getWebServiceTypeNames()
- {
-
- String[] types = new String[webServiceTypes.size()];
-
- int i=0;
- Iterator iter = webServiceTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceTypeImpl wst = (WebServiceTypeImpl)iter.next();
- if (wst!=null) {
- types[i] = wst.getLabel();
- i++;
- }
- }
- return types;
- }
-
- public LabelsAndIds getServiceTypeLabels()
- {
- LabelsAndIds labelIds = new LabelsAndIds();
- Iterator iterator = webServiceTypes.values().iterator();
- int size = webServiceTypes.size();
- String[] labels = new String[size];
- String[] ids = new String[size];
- int index = 0;
-
- labelIds.setLabels_( labels );
- labelIds.setIds_( ids );
-
- while( iterator.hasNext() )
- {
- WebServiceTypeImpl type = (WebServiceTypeImpl)iterator.next();
-
- ids[index] = type.getId();
- labels[index] = type.getLabel();
- index++;
- }
-
- return labelIds;
- }
-
- /**
- * Returns the IConfigurationElement given the server, runtime, and type attributes
- * The benefit of getting the IConfigurationElement is that the corresponding class
- * file and plugin are not loaded immediately.
- * @param server label
- * @param runtime label
- * @param type label
- * @return IConfiguration element
- */
- public IConfigurationElement getConfigurationElementFor(String serverId, String runtimeId, String typeId)
- {
- if (serverId==null || runtimeId==null || typeId==null)
- return null;
- Iterator iter = webServiceServerRuntimeTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)iter.next();
- if (wssrt!=null ) {
- if (wssrt.getConfigurationElementFor(serverId, runtimeId, typeId)!=null)
- return wssrt.getConfigurationElementFor(serverId, runtimeId,typeId);
- }
- }
- return null;
- }
-
- public IConfigurationElement getConfigElementFor(String factoryId, String runtimeId, String typeId)
- {
- Iterator iter = webServiceServerRuntimeTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceServerRuntimeType_ wssrt = (WebServiceServerRuntimeType_)iter.next();
- if (wssrt.hasConfigElementFor(factoryId, runtimeId, typeId)) {
- return wssrt.element_;
- }
- }
- return null;
- }
-
- public boolean requiresWebModuleFor(String server, String runtime, String type)
- {
- IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
- if (elem==null)
- {
- return false; // report error here instead
- }
- return Boolean.valueOf(elem.getAttribute("requireWebModule")).booleanValue();
- }
-
- public boolean requiresEJBModuleFor(String server, String runtime, String type)
- {
- IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
- if (elem==null)
- {
- return false;
- }
- return Boolean.valueOf(elem.getAttribute("requireEJBModule")).booleanValue();
- }
-
- /**
- * Returns the id of the <code>WebServiceServerRuntimeType</code> corresponding to the Server,
- * Runtime, and Web Service Type.
- */
- public boolean webServiceServerRuntimeTypeExists(String serverID, String runtimeID, String typeID)
- {
- return (getConfigurationElementFor(serverID, runtimeID, typeID) != null);
- }
-
- /**
- * Returns the id of the <code>WebServiceServerRuntimeType</code> corresponding to the Server,
- * Runtime, and Web Service Type.
- */
- public String getWebServiceServerRuntimeTypeName(String server, String runtime, String type)
- {
- IConfigurationElement elem = (IConfigurationElement)getConfigurationElementFor(server, runtime, type);
- return (elem==null ? null : elem.getAttribute("id"));
- }
-
- /**
- * Returns the <code>WebServiceServerRuntimeType</code> corresponding to the Server,
- * Runtime, and Web Service type. This will return the <code>WebServiceServerRuntimeType</code>
- * object and set the properties found in the manifest file. i.e. isWebModuleRequired, isEJBModuleRequired
- * @param server label
- * @param runtime label
- * @param Web service type
- * @return WebServiceServerRuntimeType object
- */
- public WebServiceServerRuntimeType getWebServiceServerRuntimeType(String server, String runtime, String type)
- {
-
- WebServiceServerRuntimeType wssrt = null;
- String serverId = getWebServiceServerByFactoryId(server).getId();
- IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
-
- if( elem == null )
- {
- // We couldn't find the server and runtime specified so we will
- // find the default server and runtime.
-
- server = getDefaultServerValueFor(type);
- runtime = getDefaultRuntimeValueFor(type);
-
- elem = getConfigurationElementFor(server, runtime, type);
-
- }
-
- return wssrt;
-
- }
-
-
- /**
- * Returns the <code>WebServiceServerRuntimeType</code> given the type name.
- * @param type name
- * @retrun WebServiceServerRuntimeType object
- */
- public WebServiceServerRuntimeType getWebServiceServerRuntimeTypeById(String id)
- {
- WebServiceServerRuntimeType wssrt = null;
- if (configElemsById_.containsKey(id))
- {
- try {
- IConfigurationElement elem = (IConfigurationElement)configElemsById_.get(id);
- Object webServiceType = elem.createExecutableExtension("class");
- if (webServiceType instanceof WebServiceServerRuntimeType)
- {
- wssrt = (WebServiceServerRuntimeType)webServiceType;
- wssrt.setServerLabel(elem.getAttribute("server"));
- wssrt.setRuntimeLabel(elem.getAttribute("runtime"));
- wssrt.setWebModuleRequired( Boolean.valueOf(elem.getAttribute("requireWebModule")).booleanValue() );
- wssrt.setEJBModuleRequired( Boolean.valueOf(elem.getAttribute("requireEJBModule")).booleanValue() );
- }
- else
- {
- String implementedInterface = "org.eclipse.jst.ws.ui.wizard.WebServiceServerRuntimeType ";
- String errMsg = "Extensions of the WebServiceServerRuntimeTypes extension point must implement the ";
- errMsg = errMsg + implementedInterface + "interface.";
- log_.log(Log.ERROR, 5061, this, "getWebServiceServerRuntimeTypeById", errMsg);
- }
- }
- catch (CoreException ce)
- {
- log_.log(Log.ERROR, 5062, this, "getWebServiceServerRuntimeTypeById", ce);
- }
- }
-
- return wssrt;
- }
-
- public String[] getWebServiceTypeBySelection(IStructuredSelection selection)
- {
-
- TypeSelectionFilter tsf = new TypeSelectionFilter();
- String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, webServiceTypes);
- return wst == null ? null : wst;
-
- }
-
- public IWebServiceType getWebServiceTypeByTypeLabel(String webServiceTypeLabel)
- {
-
- Iterator iter = webServiceTypes.values().iterator();
- while (iter.hasNext())
- {
- WebServiceTypeImpl wst = (WebServiceTypeImpl)iter.next();
- if (wst!=null) {
- if (wst.getLabel().equals(webServiceTypeLabel)) {
- return wst;
- }
- }
- }
- return null;
- }
-
- public boolean isInitialSelectionValidForChosenType(IStructuredSelection selection, String typeName)
- {
- String[] supportedTypes = getWebServiceTypeBySelection(selection);
- if (supportedTypes!=null)
- {
- for (int i=0; i<supportedTypes.length; i++)
- {
- if (supportedTypes[i].equals(typeName))
- return true;
- }
- }
- return false;
-
- }
-
- public boolean isServerSupportedForChosenType(String typeId, String serverID)
- {
- if (serversByType_.containsKey(typeId))
- {
- Vector vect = (Vector)serversByType_.get(typeId);
- for (int i=0; i<vect.size(); i++)
- {
- WebServiceServer wss = (WebServiceServer)webServiceServers.get((String)vect.elementAt(i));
- if (serverID!=null) {
- if (serverID.equalsIgnoreCase(wss.getFactoryId()))
- return true;
- }
- }
- }
- return false;
- }
-
- public boolean isServerRuntimeTypeSupported(String server, String runtime, String type) {
-
- WebServiceServerRuntimeType wssrt = null;
- IConfigurationElement elem = getConfigurationElementFor(server, runtime, type);
- return elem == null ? false : true;
-
- }
-
- public String getDefaultServerValueFor(String typeId)
- {
- String[] servers;
- if (serversByType_.containsKey(typeId))
- {
- Vector vect = (Vector)serversByType_.get(typeId);
- servers = new String[vect.size()];
- for (int i=0; i<vect.size(); i++)
- {
- String serverId = (String)vect.elementAt(i);
- WebServiceServer wss = (WebServiceServer)webServiceServers.get(serverId);
- servers[i] = (String)wss.getId();
- }
- return servers[0];
- }
- else
- {
- log_.log(Log.ERROR, 5063, this, "getServerByType", "Unable to find default server for "+typeId);
- return null;
- }
-
- }
-
- public String getDefaultRuntimeValueFor(String typeId)
- {
- String[] runtimeName = getRuntimesByType(typeId);
- for (int i=0; i<runtimeName.length; i++)
- {
- WebServiceRuntime wsr = (WebServiceRuntime)webServiceRuntimes.get(runtimeName[i]);
- if (wsr.getIsDefault())
- return runtimeName[i];
- }
- return runtimeName[0];
- }
-
- public String getServerIdForFactoryId(String factoryId) {
-
- Iterator iter = webServiceServers.values().iterator();
- while (iter.hasNext()) {
- WebServiceServer wss = (WebServiceServer)iter.next();
- if (wss.getFactoryId().equals(factoryId)) {
- return wss.getId();
- }
- }
- return null;
-
- }
-
- public final class WebServiceServerRuntimeType_
- {
-
- public String typeId_;
- public String serverId_;
- public String runtimeId_;
- public IConfigurationElement element_;
-
- public WebServiceServerRuntimeType_(String serverId, String runtimeId,String typeId, IConfigurationElement elem)
- {
- this.typeId_ = typeId;
- this.serverId_ = serverId;
- this.runtimeId_ = runtimeId;
- this.element_ = elem;
- }
-
- public IConfigurationElement getConfigurationElementFor(String serverID, String runtimeID, String typeID)
- {
- if (this.typeId_.equals(typeID) && this.serverId_.equals(serverID) && this.runtimeId_.equals(runtimeID))
- return this.element_;
- return null;
- }
-
- public boolean hasConfigElementFor(String factoryID, String runtimeID, String typeID)
- {
- String serverID = getServerIdForFactoryId( factoryID );
-
- if (typeId_.equalsIgnoreCase(typeID) &&
- serverId_.equalsIgnoreCase(serverID) &&
- runtimeId_.equalsIgnoreCase(runtimeID))
- {
- return true;
- }
-
- return false;
- }
-
-
- }
-
- public CommandFragmentFactoryFactory getFactoryFactory( String[] ids )
- {
- String hashKey = ids[2] + "#" + ids[1] + "#" + ids[0];
- CommandWidgetBinding binding = (CommandWidgetBinding)factoryCache_.get( hashKey );
-
- if( binding == null )
- {
- IConfigurationElement element = getConfigElementFor( ids[2], ids[1], ids[0] );
-
- if( element == null ) return null;
-
- binding = createBinding( element );
-
- factoryCache_.put( hashKey, binding );
-
- binding.registerDataMappings( dataMappingRegistry_ );
-
- if( widgetRegistry_ != null )
- {
- binding.registerWidgetMappings( widgetRegistry_ );
- binding.registerCanFinish( canFinishRegistry_ );
- }
- }
-
- return binding;
- }
-
- private CommandWidgetBinding createBinding(IConfigurationElement element )
- {
- Vector bindings = new Vector(4);
- Vector fragments = new Vector(4);
-
- addBinding( element, "developBinding", bindings );
- addBinding( element, "assemblyBinding", bindings );
- addBinding( element, "deployBinding", bindings );
- addBinding( element, "installBinding", bindings );
-
- fragments.add( new ServicePreDevelopFragment() );
- fragments.add( new ServicePreAssemblyFragment() );
- fragments.add( new ServicePreDeployFragment() );
- fragments.add( new ServicePreInstallFragment() );
-
- return new CommandWidgetBindingList( bindings, fragments );
- }
-
- private void addBinding( IConfigurationElement element, String bindingName, Vector list )
- {
- Object binding = null;
-
- if( element.getAttribute( bindingName ) != null )
- {
- try
- {
- binding = element.createExecutableExtension( bindingName );
- }
- catch( CoreException exc )
- {
- }
- }
-
- list.add( binding );
- }
-
- public void setDataMappingRegistry( DataMappingRegistry registry )
- {
- dataMappingRegistry_ = registry;
-
- // We need to rebuild the factory cache each time we start the server
- // wizard.
- factoryCache_ = new HashMap();
- }
-
- public void setWidgetRegistry( WidgetRegistry registry )
- {
- widgetRegistry_ = registry;;
- }
-
- public void setCanFinishRegistry( CanFinishRegistry registry )
- {
- canFinishRegistry_ = registry;
- }
-
- public String[] getAllServerFactoryIds()
- {
- Object[] servers = webServiceServers.values().toArray();
- String[] factoryIds = new String[servers.length];
- for (int i=0; i<servers.length; i++)
- {
- WebServiceServer wss = (WebServiceServer)servers[i];
- factoryIds[i] = wss.getFactoryId();
- }
- return factoryIds;
- }
-
- public String getServerFactoryIdFromServerId(String serverId)
- {
- Object[] servers = webServiceServers.values().toArray();
- for (int i=0; i<servers.length; i++)
- {
- WebServiceServer wss = (WebServiceServer)servers[i];
- if (serverId == wss.getId())
- {
- return wss.getFactoryId();
- }
-
- }
- return null;
- }
-
- /*
- * Returns a cascading list of valid choices for server, runtime, and J2EE levels.
- * This is an intersection of what is available for service and client.
- */
- public SelectionListChoices getServerToRuntimeToJ2EE()
- {
- if (serverToRuntimeToJ2EE_!=null)
- {
- return serverToRuntimeToJ2EE_;
- }
-
- String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
- SelectionList serversList = new SelectionList(servers, 0);
- Vector choices = new Vector();
- for (int i=0; i<servers.length; i++)
- {
- choices.add(getRuntimeChoices(servers[i]));
- }
- serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
- return serverToRuntimeToJ2EE_;
-
- }
-
- private SelectionListChoices getRuntimeChoices(String serverFactoryId)
- {
- String[] serviceRuntimes = getRuntimeIDsByServerFactoryID(serverFactoryId);
- String[] clientRuntimes = WebServiceClientTypeRegistry.getInstance().getRuntimeIdsByServerFactoryId(serverFactoryId);
- String[] runtimes = getStringArrayIntersection(serviceRuntimes, clientRuntimes);
- SelectionList runtimesList = new SelectionList(runtimes, 0);
- Vector choices = new Vector();
- for (int i=0; i<runtimes.length; i++)
- {
- choices.add(getJ2EEChoices(runtimes[i]));
- }
- return new SelectionListChoices(runtimesList, choices);
- }
-
- private SelectionListChoices getJ2EEChoices(String runtimeId)
- {
- String[] serviceJ2EEVersions = getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
- String[] clientJ2EEVersions = WebServiceClientTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
- String[] j2eeVersions = getStringArrayIntersection(serviceJ2EEVersions, clientJ2EEVersions);
- SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
- return new SelectionListChoices(j2eeVersionsList, null);
- }
-
- public String getServerLabel(String factoryId)
- {
- if (factoryId==null || factoryId.length()==0)
- return null;
-
- if (serverLabelByFactoryId_.containsKey(factoryId))
- {
- return (String)serverLabelByFactoryId_.get(factoryId);
- }
- else
- {
- return null;
- }
- }
-
- public String getServerFactoryId(String label)
- {
- if (label==null || label.length()==0)
- return null;
-
- if (serverFactoryIdByLabel_.containsKey(label))
- {
- return (String)serverFactoryIdByLabel_.get(label);
- }
- else
- {
- return null;
- }
- }
-
- public String getRuntimeLabel(String id)
- {
- if (id==null || id.length()==0)
- return null;
-
- return (String) runtimeLabelById_.get(id);
- }
-
- public String getRuntimeId(String label)
- {
- if (label==null || label.length()==0)
- return null;
-
- return (String)runtimeIdByLabel_.get(label);
- }
-
- private String[] getStringArrayIntersection(String[] a1, String[] a2)
- {
- Vector vf = new Vector();
- if (a1==null || a2==null)
- {
- return convertToStringArray(vf.toArray());
- }
-
- for (int i=0; i<a1.length; i++)
- {
- for (int j=0; j<a2.length; j++)
- {
- if (a1[i].equals(a2[j]))
- {
- vf.add(a1[i]);
- break;
- }
- }
- }
-
- return convertToStringArray(vf.toArray());
- }
-
- private String[] convertToStringArray(Object[] a)
- {
- if (a==null) return new String[0];
-
- int length = a.length;
- String[] sa = new String[length];
- for (int i=0; i<length; i++)
- {
- Object obj = a[i];
- if (obj instanceof String)
- {
- sa[i] = (String)obj;
- }
- }
- return sa;
- }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceType.java
deleted file mode 100644
index 3a8f4fb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public interface WebServiceType
-{
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getName ();
-
- /**
- * Returns a locale specific description of this Web Service type.
- * @return A locale specific description of this Web Service type.
- */
- public String getDescription ();
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeImpl.java
deleted file mode 100644
index 229de46..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeImpl.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This is the interface for objects that represent a kind of
-* Web Service artifact. The primary purpose of a WebServiceType
-* object is to manufacture the wizard pages that support the type.
-*/
-public class WebServiceTypeImpl implements IWebServiceType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public IConfigurationElement element_;
- public String typeId_;
- public String typeLabel_;
- public String[] extensionMetadata_;
- public String[] resourceTypeMetadata_;
- public Boolean canFinish_;
-
- public WebServiceTypeImpl(IConfigurationElement elem)
- {
- super();
- this.element_ = elem;
- }
- /**
- * Returns the id of this Web Service type.
- * @return id of this Web Service type.
- */
- public String getId ()
- {
- if (typeId_==null)
- typeId_ = element_.getAttribute("id");
- return typeId_;
- }
- /**
- * Returns a short, locale specific name of this Web Service type.
- * @return A short, locale specific name of this Web Service type.
- */
- public String getLabel ()
- {
- if (typeLabel_ == null)
- typeLabel_ = element_.getAttribute("label");
- return typeLabel_;
- }
-
- /**
- * Returns a locale specific description of this Web Service type's extension metadata.
- * @return A locale specific description of this Web Service type's extension metadata.
- */
- public String[] getExtensionMetadata ()
- {
- if (extensionMetadata_ ==null)
- {
- StringTokenizer st = new StringTokenizer(element_.getAttribute("extensionMetadata"));
- extensionMetadata_ = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String exten = (String)st.nextToken();
- if (exten!=null)
- {
- extensionMetadata_[i]=exten;
- }
- i++;
- }
- }
- return this.extensionMetadata_;
- }
-
- /**
- * Returns a locale specific description of this Web Service type's resource metadata.
- * @return A locale specific description of this Web Service type's resource metadata.
- */
- public String[] getResourceTypeMetadata ()
- {
- if (resourceTypeMetadata_ == null)
- {
- StringTokenizer st = new StringTokenizer(element_.getAttribute("resourceTypeMetadata"));
- resourceTypeMetadata_ = new String[st.countTokens()];
- int i=0;
- while (st.hasMoreElements())
- {
- String resourceType = (String)st.nextToken();
- if (resourceType!=null)
- {
- resourceTypeMetadata_[i]=resourceType;
- }
- i++;
- }
- }
- return resourceTypeMetadata_;
- }
-
- /**
- * Returns true if the plugin.xml contains an attribute of "canFinish" with a value of true. Otherwise,
- * false is returned. Note: if the "canFinish" attribute is not specified true is returned by default.
- * @return Returns whether or not the user can finish on the pages before the web service type pages.
- */
- public boolean getCanFinish()
- {
- if( canFinish_ == null )
- {
- String canFinishString = element_.getAttribute("canFinish");
-
- canFinish_ = canFinishString == null ? new Boolean( true ) : Boolean.valueOf( canFinishString );
- }
-
- return canFinish_.booleanValue();
- }
-
- /**
- * Returns the configuration element associated with
- * this type.
- *
- * @return org.eclipse.core.runtime.IConfigurationElement
- */
- public IConfigurationElement getConfigurationElement()
- {
- return this.element_;
- }
-
- public String getObjectSelectionWidget()
- {
- return element_.getAttribute("objectSelectionWidget");
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeRegistry.java
deleted file mode 100644
index e158231..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/WebServiceTypeRegistry.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-public class WebServiceTypeRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static WebServiceTypeRegistry instance_;
-
- private Hashtable typesByName_;
- private String[] typeNames_;
-
- //
- // Loads WebServiceType objects into this registry.
- // This is done by querying the plugin registry for all extensions
- // hanging on the webServiceType extension point. Extensions
- // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceType
- // interface.
- //
- private void loadTypes ()
- {
- Log log = new EclipseLog();
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "webServiceType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- Object webServiceType = elem.createExecutableExtension("class");
- if (webServiceType instanceof WebServiceType)
- {
- add((WebServiceType)webServiceType);
- }
- else
- {
- String implementedInterface = "org.eclipse.jst.ws.ui.wizard.WebServiceType ";
- String errMsg = "Extensions of the webServiceTypes extension point must implement the ";
- errMsg = errMsg + implementedInterface + "interface.";
- log.log(Log.ERROR, 5056, this, "loadTypes", errMsg);
- }
- } catch (CoreException e)
- {
- log.log(Log.ERROR, 5057, this, "loadTypes", e);
- }
- }
- }
-
- //
- // Loads WebServiceType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- typesByName_ = new Hashtable();
- loadTypes();
- indexTypesByName();
- }
-
- //
- // Add the given WebServiceType to this registry.
- // See method load().
- //
- private void add ( WebServiceType wst )
- {
- typesByName_.put(wst.getName(),wst);
- }
-
- //
- // Builds an index of WebServiceType objects by their names.
- // See method load().
- //
- private void indexTypesByName ()
- {
- if (typeNames_ == null)
- {
- typeNames_ = new String[typesByName_.size()];
- Enumeration e = typesByName_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- typeNames_[i] = (String)e.nextElement();
- }
- }
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceTypeRegistry object.
- */
- public static WebServiceTypeRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceTypeRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- /**
- * Returns all registered <code>WebServiceType</code> objects.
- * @return All registered <code>WebServiceType</code> objects.
- */
- public WebServiceType[] getWebServiceTypes ()
- {
- WebServiceType[] wsts = new WebServiceType[typesByName_.size()];
- Enumeration e = typesByName_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- wsts[i] = (WebServiceType)e.nextElement();
- }
- return wsts;
- }
-
- /**
- * Returns the names of all registered <code>WebServiceType</code>
- * objects.
- * @return The names of all registered <code>WebServiceType</code>
- * objects.
- */
- public String[] getWebServiceTypeNames ()
- {
- return typeNames_;
- }
-
- /**
- * Returns the <code>WebServiceType</code> object of the given
- * <code>name</code> or null if there is no such object.
- * @param name The name of the <code>WebServiceType</code> to find.
- * @return The <code>WebServiceType</code> or null if no such object
- * was found.
- */
- public WebServiceType getWebServiceTypeByName ( String name )
- {
- return (name == null ? null : (WebServiceType)typesByName_.get(name));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
deleted file mode 100644
index 486cd31..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBM.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistryIBM implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryIBM() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_IBM");
- }
-
- public String getInquiryURL() {
- return "http://uddi.ibm.com/ubr/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://uddi.ibm.com/ubr/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.ibm.com/ubr/registry.html";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
deleted file mode 100644
index cee8627..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryIBMTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistryIBMTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryIBMTest() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_IBM_TEST");
- }
-
- public String getInquiryURL() {
- return "http://uddi.ibm.com/testregistry/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://uddi.ibm.com/testregistry/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.ibm.com/testregistry/registry.html";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
deleted file mode 100644
index 0125bcb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoft.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistryMicrosoft implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryMicrosoft() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT");
- }
-
- public String getInquiryURL() {
- return "http://uddi.microsoft.com/inquire";
- }
-
- public String getPublishURL() {
- return "https://uddi.microsoft.com/publish";
- }
-
- public String getRegistrationURL() {
- return "https://uddi.microsoft.com/register.aspx";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
deleted file mode 100644
index 5d2a353..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryMicrosoftTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistryMicrosoftTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryMicrosoftTest() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_MICROSOFT_TEST");
- }
-
- public String getInquiryURL() {
- return "http://test.uddi.microsoft.com/inquire";
- }
-
- public String getPublishURL() {
- return "https://test.uddi.microsoft.com/publish";
- }
-
- public String getRegistrationURL() {
- return "http://test.uddi.microsoft.com/register.aspx";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
deleted file mode 100644
index 0efba43..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryNTTComm.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryNTTComm() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_NTTCOMM");
- }
-
- public String getInquiryURL() {
- return "http://www.uddi.ne.jp/ubr/inquiryapi";
- }
-
- public String getPublishURL() {
- return "https://www.uddi.ne.jp/ubr/publishapi";
- }
-
- public String getRegistrationURL() {
- return "http://www.ntt.com/uddi/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
deleted file mode 100644
index 72c2a87..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAP.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistrySAP() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_SAP");
- }
-
- public String getInquiryURL() {
- return "http://uddi.sap.com/UDDI/api/inquiry/";
- }
-
- public String getPublishURL() {
- return "https://uddi.sap.com/UDDI/api/publish/";
- }
-
- public String getRegistrationURL() {
- return "http://uddi.sap.com/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
deleted file mode 100644
index c8beef5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistrySAPTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistrySAPTest() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_SAP_TEST");
- }
-
- public String getInquiryURL() {
- return "http://udditest.sap.com/UDDI/api/inquiry/";
- }
-
- public String getPublishURL() {
- return "https://udditest.sap.com/UDDI/api/publish/";
- }
-
- public String getRegistrationURL() {
- return "http://udditest.sap.com/";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
deleted file mode 100644
index e4d9e65..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-public interface PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public String getName();
- public String getInquiryURL();
- public String getPublishURL();
- public String getRegistrationURL();
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
deleted file mode 100644
index d42d6eb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wizard/uddi/PublicUDDIRegistryXMethods.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wizard.uddi;
-
-import org.eclipse.wst.ws.internal.plugin.WSPlugin;
-
-public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- public PublicUDDIRegistryXMethods() {
- }
-
- public String getName() {
- return WSPlugin.getResourceString("%PUBLICUDDIREGISTRYTYPE_NAME_XMETHODS");
- }
-
- public String getInquiryURL() {
- //return "http://uddi.xmethods.net/inquire";
- return "http://uddi.xmethods.net/inquire2";
- }
-
- // Read-only registry. The publish and registration URLs don't exist.
- public String getPublishURL() {
- return "https://uddi.xmethods.net/publish2";
- }
-
- public String getRegistrationURL() {
- return "http://www.xmethods.net/ve2/Register.po?event=registerOrg";
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
deleted file mode 100644
index 4e146a7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/AddWSDLToWSILWrapperCommand.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.wsil.AddWSDLToWSILCommand;
-
-
-
-public class AddWSDLToWSILWrapperCommand extends SimpleCommand
-{
- private AddWSDLToWSILCommand command;
- private Arguments args;
-
- public AddWSDLToWSILWrapperCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand", "org.eclipse.jst.ws.internal.consumption.ui.wsil.AddWSDLToWSILWrapperCommand");
- }
-
- public Status execute(Environment env)
- {
- if (command == null)
- command = new AddWSDLToWSILCommand();
- if (!args.isEmpty())
- {
- command.setArguments(args.getStringArguments());
- command.setWWWAuthenticationHandler(new DialogWWWAuthentication(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()));
- return command.execute(env);
- }
- return new SimpleStatus("");
- }
- /**
- * @param args The args to set.
- */
- public void setArgs(Arguments args)
- {
- this.args = args;
- }
-
- /**
- * @param command The command to set.
- */
- public void setCommand(AddWSDLToWSILCommand command)
- {
- this.command = command;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
deleted file mode 100644
index 7a177c5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Arguments.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import java.util.Vector;
-
-public class Arguments
-{
- private Vector args_;
-
- public Arguments()
- {
- args_ = new Vector();
- }
-
- public void add(String key, Object value)
- {
- args_.add(key);
- if (value != null)
- args_.add(value);
- }
-
- public void remove(String key)
- {
- int index = args_.indexOf(key);
- if (index >= 0)
- {
- args_.remove(index);
- args_.remove(index+1);
- }
- }
-
- public Object get(String key)
- {
- int index = args_.indexOf(key);
- if (index >= 0)
- return args_.get(index+1);
- else
- return null;
- }
-
- public void clear()
- {
- args_.clear();
- }
-
- public Object[] getArguments()
- {
- Object[] args = new Object[args_.size()];
- args_.copyInto(args);
- return args;
- }
-
- public String[] getStringArguments()
- {
- String[] args = new String[args_.size()];
- for (int i = 0; i < args.length; i++)
- args[i] = args_.get(i).toString();
- return args;
- }
-
- public boolean isEmpty()
- {
- return args_.isEmpty();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
deleted file mode 100644
index 61f9d54..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/DialogWWWAuthentication.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler;
-
-
-public class DialogWWWAuthentication extends Dialog implements WWWAuthenticationHandler
-{
-
- /*CONTEXT_ID DBAS0001 for the HTTP basic authentication user name*/
- private final String INFOPOP_DBAS_USERNAME = WebServiceConsumptionUIPlugin.ID + ".DBAS0001";
-
- /*CONTEXT_ID DBAS0002 for the HTTP basic authentication password*/
- private final String INFOPOP_DBAS_PASSWORD = WebServiceConsumptionUIPlugin.ID + ".DBAS0002";
-
- private String usernameString_;
- private String passwordString_;
-
- private Text username_;
- private Text password_;
-
- private WWWAuthenticationException wwwae_;
-
- public DialogWWWAuthentication(Shell shell)
- {
- super(shell);
- usernameString_ = null;
- passwordString_ = null;
- wwwae_ = null;
- }
-
- /**
- * Called when the Cancel button is pressed.
- */
- protected void cancelPressed()
- {
- usernameString_ = null;
- passwordString_ = null;
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- */
- protected void okPressed()
- {
- String usernameString = username_.getText();
- usernameString_ = (usernameString.length() > 0) ? usernameString : null;
- String passwordString = password_.getText();
- passwordString_ = (passwordString.length() > 0) ? passwordString : null;
- setReturnCode(Dialog.OK);
- super.okPressed();
- }
-
- /**
- * See {@link org.eclipse.jface.window.Window#configureShell}.
- * @param shell The shell.
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(getMessage("%DIALOG_TITLE_HTTP_BASIC_AUTH"));
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea(Composite parent)
- {
- Composite composite = (Composite)super.createDialogArea(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.verticalSpacing = 15;
- composite.setLayout(gl);
-
- Label label = new Label(composite, SWT.WRAP);
- label.setText(getMessage("%LABEL_URL"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- label = new Label(composite, SWT.WRAP);
- label.setText(wwwae_.getURL());
- label.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- label = new Label(composite, SWT.WRAP);
- label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_USERNAME"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- username_ = new Text(composite, SWT.BORDER);
- username_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- username_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_USERNAME"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_USERNAME);
-
- label = new Label(composite, SWT.WRAP);
- label.setText(getMessage("%LABEL_HTTP_BASIC_AUTH_PASSWORD"));
- label.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
-
- password_ = new Text(composite, SWT.BORDER);
- password_.setEchoChar('*');
- password_.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
- password_.setToolTipText(getMessage("%TOOLTIP_HTTP_BASIC_AUTH_PASSWORD"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(username_, INFOPOP_DBAS_PASSWORD);
-
- return composite;
- }
-
- private String getMessage(String msgId)
- {
- return WebServiceConsumptionUIPlugin.getMessage(msgId);
- }
-
- public void handleWWWAuthentication(WWWAuthenticationException wwwae)
- {
- usernameString_ = null;
- passwordString_ = null;
- wwwae_ = wwwae;
- open();
- }
-
- public String getUsername()
- {
- return usernameString_;
- }
-
- public String getPassword()
- {
- return passwordString_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
deleted file mode 100644
index aa98c14..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/TableViewerEditor.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.ITableLabelProvider;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.TableEditor;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.KeyListener;
-import org.eclipse.swt.events.MouseEvent;
-import org.eclipse.swt.events.MouseListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.events.TraverseEvent;
-import org.eclipse.swt.events.TraverseListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.graphics.Rectangle;
-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.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.PlatformUI;
-
-
-public class TableViewerEditor extends Composite
-{
- private int DEFAULT_TABLE_HEIGHT_HINT = 100;
- private int DEFAULT_COLUMN_WIDTH = 80;
-
- private String[] columns_;
- private TableViewer tableViewer_;
- private Table table_;
- private TableEditor editor_;
- private TableEditorListener tableEditorListener_;
- private Text text_;
- private Button add_;
- private Button remove_;
-
- private List values_;
- private Object defaultValue_;
-
- public TableViewerEditor(Composite parent, String[] columns, List initValues, Object defaultValue)
- {
- super(parent, SWT.NONE);
- columns_ = columns;
- values_ = new ArrayList();
- if (initValues != null && initValues.size() > 0)
- values_.addAll(initValues);
- defaultValue_ = (defaultValue != null) ? defaultValue : new String("");
- createPartControl(this);
- }
-
- private void createPartControl(Composite parent)
- {
- GridLayout gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- setLayout(gl);
- setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- Composite composite = new Composite(parent, SWT.NONE);
- gl = new GridLayout();
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- composite.setLayout(gl);
- composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-
- table_ = new Table(composite, SWT.SINGLE | SWT.FULL_SELECTION | SWT.BORDER);
- GridData gd = new GridData(GridData.FILL_BOTH);
- gd.heightHint = DEFAULT_TABLE_HEIGHT_HINT;
- table_.setLayoutData(gd);
- table_.setHeaderVisible(true);
- table_.setLinesVisible(true);
- TableLayout tableLayout = new TableLayout();
- int maxWidth = DEFAULT_COLUMN_WIDTH;
- for (int i = 0; i < columns_.length; i++)
- {
- TableColumn tableColumn = new TableColumn(table_, SWT.NONE);
- tableColumn.setText(columns_[i]);
- tableColumn.pack();
- int tableColumnWidth = Math.max(DEFAULT_COLUMN_WIDTH, tableColumn.getWidth());
- maxWidth = Math.max(maxWidth, tableColumnWidth);
- ColumnWeightData columnData = new ColumnWeightData(tableColumnWidth, tableColumnWidth, true);
- tableLayout.addColumnData(columnData);
- }
- table_.setLayout(tableLayout);
- // initialize the table editor
- editor_ = new TableEditor(table_);
- // The editor must have the same size as the cell and must
- // not be any smaller than 50 pixels.
- editor_.horizontalAlignment = SWT.LEFT;
- editor_.grabHorizontal = true;
- editor_.minimumWidth = maxWidth;
- tableEditorListener_ = new TableEditorListener();
- table_.addMouseListener(tableEditorListener_);
- tableViewer_ = new TableViewer(table_);
- tableViewer_.getControl().addKeyListener(
- new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Del
- if (((int)e.character) == 127)
- handleDeleteKeyPressed();
- // Enter or space
- if (((int)e.character) == 13 || ((int)e.character) == 32)
- tableEditorListener_.editSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- tableViewer_.setContentProvider(new ListContentProvider());
- tableViewer_.setLabelProvider(new ListLabelProvider());
- tableViewer_.setInput(values_);
- tableViewer_.addSelectionChangedListener(
- new ISelectionChangedListener()
- {
- public void selectionChanged(SelectionChangedEvent event)
- {
- enableRemove(true);
- }
- }
- );
-
- Composite buttonComposite = new Composite(composite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.makeColumnsEqualWidth = true;
- buttonComposite.setLayout(gl);
- buttonComposite.setLayoutData(new GridData(GridData.GRAB_HORIZONTAL | GridData.HORIZONTAL_ALIGN_BEGINNING));
-
- add_ = new Button(buttonComposite, SWT.PUSH);
- add_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_ADD"));
- add_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- add_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleAddButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
-
- remove_ = new Button(buttonComposite, SWT.PUSH);
- remove_.setText(WebServiceConsumptionUIPlugin.getMessage("%LABEL_REMOVE"));
- remove_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- remove_.addSelectionListener(
- new SelectionListener()
- {
- public void widgetSelected(SelectionEvent event)
- {
- handleRemoveButtonSelected(event);
- }
- public void widgetDefaultSelected(SelectionEvent event)
- {
- }
- }
- );
- enableRemove(false);
- }
-
- private void enableRemove(boolean enabled)
- {
- remove_.setEnabled(enabled && !tableViewer_.getSelection().isEmpty());
- }
-
- private void handleAddButtonSelected(SelectionEvent event)
- {
- values_.add(defaultValue_);
- refresh();
- setSelectionAsObject(values_.get(table_.getItemCount()-1));
- tableEditorListener_.editSelection();
- }
-
- private void handleRemoveButtonSelected(SelectionEvent event)
- {
- handleDeleteKeyPressed();
- }
-
- private void handleDeleteKeyPressed()
- {
- internalDispose();
- ISelection selection = tableViewer_.getSelection();
- if (selection != null && !selection.isEmpty() && (selection instanceof IStructuredSelection))
- {
- int selectionIndex = table_.getSelectionIndex();
- int selectionCount = table_.getItemCount();
- values_.remove(selectionIndex);
- if (selectionIndex < selectionCount-1)
- setSelectionAsObject(values_.get(selectionIndex));
- else if (selectionCount -2 >= 0)
- setSelectionAsObject(values_.get(selectionCount-2));
- refresh();
- }
- }
-
- private void internalRefresh()
- {
- // synchronize text field, previously selected table cell and model (inputObject)
- if (text_ != null)
- {
- TableItem oldTableItem = editor_.getItem();
- int oldColumnIndex = editor_.getColumn();
- if (oldTableItem != null && oldColumnIndex >= 0 && oldColumnIndex < columns_.length)
- {
- String oldText = text_.getText();
- oldTableItem.setText(oldColumnIndex, oldText);
- int oldRowIndex = table_.indexOf(oldTableItem);
- values_.set(oldRowIndex, oldText);
- }
- }
- }
-
- private void setSelectionAsObject(Object object)
- {
- tableViewer_.setSelection(new StructuredSelection(object), true);
- }
-
- public void setToolTipText(String string)
- {
- table_.setToolTipText(string);
- }
-
- public void setInfopop(String string)
- {
- PlatformUI.getWorkbench().getHelpSystem().setHelp(table_, string);
- }
-
- public void setInput(List list)
- {
- values_.clear();
- values_.addAll(list);
- }
-
- public void refresh()
- {
- internalRefresh();
- tableViewer_.refresh();
- }
-
- public TableItem[] getItems()
- {
- internalRefresh();
- return table_.getItems();
- }
-
- public void setEnabled(boolean enabled)
- {
- super.setEnabled(enabled);
- add_.setEnabled(enabled);
- enableRemove(enabled);
- }
-
- public void dispose()
- {
- super.dispose();
- internalDispose();
- if (editor_ != null)
- editor_.dispose();
- if (table_ != null)
- table_.dispose();
- if (add_ != null)
- add_.dispose();
- if (remove_ != null)
- remove_.dispose();
- }
-
- private void internalDispose()
- {
- if (text_ != null)
- text_.dispose();
- text_ = null;
- }
-
- protected class TableEditorListener implements MouseListener
- {
- private int currSelectionIndex_;
- private int editRow_;
- private int editColumn_;
-
- public TableEditorListener()
- {
- super();
- currSelectionIndex_ = -1;
- editRow_ = -1;
- editColumn_ = -1;
- }
-
- public void mouseDoubleClick(MouseEvent e)
- {
- mouseDown(e);
- }
-
- public void mouseDown(MouseEvent e)
- {
- // refresh table
- internalRefresh();
- // Clean up previous text editor control
- internalDispose();
- // update table
- if (table_.isFocusControl())
- {
- int selectedRowIndex = getSelectedRow(table_, e.y);
- if (currSelectionIndex_ != -1 && selectedRowIndex != -1 && currSelectionIndex_ == selectedRowIndex)
- {
- TableItem tableItem = table_.getItem(selectedRowIndex);
- int selectedColumnIndex = getSelectedColumn(tableItem, e.x, e.y);
- if (selectedColumnIndex != -1 && (text_ == null || text_.isDisposed() || selectedColumnIndex != editor_.getColumn()))
- editSelection(selectedRowIndex, selectedColumnIndex);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- public void mouseUp(MouseEvent e)
- {
- }
-
- private int getSelectedRow(Table table, int y)
- {
- TableItem[] tableItems = table.getItems();
- for (int i = 0; i < tableItems.length; i++)
- {
- Rectangle rectangle = tableItems[i].getBounds(0);
- if (rectangle != null && y >= rectangle.y && y < (rectangle.y + rectangle.height))
- return i;
- }
- return -1;
- }
-
- private int getSelectedColumn(TableItem tableItem, int x, int y)
- {
- for (int i = 0; i < columns_.length; i++)
- {
- if (tableItem.getBounds(i).contains(x, y))
- return i;
- }
- return -1;
- }
-
- private void editSelection(int row, int column)
- {
- editRow_ = row;
- editColumn_ = column;
- TableItem tableItem = table_.getItem(row);
- // Setup adapter for the new selection
- text_ = new Text(table_, SWT.NONE);
- String text = tableItem.getText(column);
- text_.setText((text != null) ? text : "");
- text_.addKeyListener(new KeyListener()
- {
- public void keyPressed(KeyEvent e)
- {
- // Esc
- if (((int)e.character) == 27)
- cancelSelection();
- }
- public void keyReleased(KeyEvent e)
- {
- }
- }
- );
- text_.addTraverseListener(new TraverseListener()
- {
- public void keyTraversed(TraverseEvent e)
- {
- if (e.detail == SWT.TRAVERSE_TAB_NEXT)
- traverseTabNext();
- else if (e.detail == SWT.TRAVERSE_TAB_PREVIOUS)
- traverseTabPrevious();
- }
- }
- );
- editor_.setEditor(text_, tableItem, column);
- text_.setFocus();
- text_.selectAll();
- }
-
- protected void traverseTabNext()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == table_.getItems().length-1 && editColumn_ == columns_.length-1))
- {
- if (editColumn_ < columns_.length-1)
- editColumn_++;
- else
- {
- editColumn_ = 0;
- editRow_++;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- protected void traverseTabPrevious()
- {
- internalRefresh();
- internalDispose();
- if (!(editRow_ == 0 && editColumn_ == 0))
- {
- if (editColumn_ > 0)
- editColumn_--;
- else
- {
- editColumn_ = columns_.length-1;
- editRow_--;
- table_.select(editRow_);
- }
- editSelection(editRow_, editColumn_);
- }
- }
-
- public void cancelSelection()
- {
- internalDispose();
- internalRefresh();
- }
-
- public void editSelection()
- {
- int selectedRowIndex = table_.getSelectionIndex();
- if (selectedRowIndex != -1 && columns_.length > 0)
- {
- // refresh table
- internalRefresh();
- // Clean up any previous editor control
- internalDispose();
- editSelection(selectedRowIndex, 0);
- }
- currSelectionIndex_ = selectedRowIndex;
- }
- }
-
- protected class ListContentProvider implements IStructuredContentProvider
- {
- public void dispose()
- {
- }
-
- public void inputChanged(Viewer viewer, Object oldInput, Object newInput)
- {
- tableViewer_.add(getElements(newInput));
- }
-
- public Object[] getElements(Object inputElement)
- {
- if (inputElement instanceof List)
- {
- List list = (List)inputElement;
- Object[] objects = new Object[list.size()];
- for (int i = 0; i < objects.length; i++)
- objects[i] = list.get(i);
- return objects;
- }
- else
- return new Object[0];
- }
- }
-
- protected class ListLabelProvider implements ITableLabelProvider
- {
- public Image getColumnImage(Object element, int columnIndex)
- {
- return null;
- }
-
- public String getColumnText(Object element, int columnIndex)
- {
- return element.toString();
- }
-
- public void addListener(ILabelProviderListener listener)
- {
- }
-
- public void removeListener(ILabelProviderListener listener)
- {
- }
-
- public boolean isLabelProperty(Object element, String property)
- {
- return true;
- }
-
- public void dispose()
- {
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
deleted file mode 100644
index 41e17c3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsil/Utils.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsil;
-
-import java.net.MalformedURLException;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-
-
-public class Utils
-{
- public Utils()
- {
- }
-
- public String toFileSystemURI(String relativePlatformURI)
- {
- if (relativePlatformURI != null)
- return toFileSystemURI(ResourceUtils.findResource(relativePlatformURI));
- else
- return null;
- }
-
- public String toFileSystemURI(IResource res)
- {
- if (res != null)
- {
- IPath path = res.getLocation();
- if (path != null)
- {
- try
- {
- return path.toFile().toURL().toString();
- }
- catch (MalformedURLException murle)
- {
- }
- }
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
deleted file mode 100644
index 2e3d20c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ClientType.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class ClientType {
-
- private IConfigurationElement elem_;
- private Hashtable webServiceClientImpls_;
-
- private String id;
- private WebServiceClientImpl webServiceClientImpl;
- private String[] moduleTypesInclude;
- private String[] moduleTypesExclude;
- private String webServiceClientTypeId;
-
-
-
- public ClientType(IConfigurationElement elem_, Hashtable webServiceClientImpls_)
- {
- super();
- this.elem_ = elem_;
- this.webServiceClientImpls_ = webServiceClientImpls_;
- }
-
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
-
-
- public String[] getModuleTypesExclude()
- {
- if (moduleTypesExclude==null)
- {
- String attr = elem_.getAttribute("moduleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- moduleTypesExclude = new String[size];
- for (int i = 0; i < moduleTypesExclude.length; i++)
- moduleTypesExclude[i] = st.nextToken();
- }
- }
- return moduleTypesExclude;
- }
-
-
-
-
- public String[] getModuleTypesInclude()
- {
- if (moduleTypesInclude==null)
- {
- String attr = elem_.getAttribute("moduleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- moduleTypesInclude = new String[size];
- for (int i = 0; i < moduleTypesInclude.length; i++)
- moduleTypesInclude[i] = st.nextToken();
- }
- }
- return moduleTypesInclude;
- }
-
-
-
-
- public WebServiceClientImpl getWebServiceClientImpl()
- {
- if (webServiceClientImpl==null)
- {
- String wscimplId = elem_.getAttribute("implId");
- webServiceClientImpl = (WebServiceClientImpl)webServiceClientImpls_.get(wscimplId);
- }
- return webServiceClientImpl;
- }
-
-
-
- /*
- public String getWebServiceClientTypeId()
- {
- if (webServiceClientTypeId==null)
- {
- webServiceClientTypeId = elem_.getAttribute("webServiceClientTypeId");
- }
- return webServiceClientTypeId;
- }
- */
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
deleted file mode 100644
index 3abfb44..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Context.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-/**
- * @author rsinha
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class Context implements IContext {
- private WebServiceScenario scenario;
- private boolean develop;
- private boolean assemble;
- private boolean deploy;
- private boolean install;
- private boolean run;
- private boolean client;
- private boolean test;
- private boolean publish;
- private boolean overWriteFiles;
- private boolean createFolders;
- private boolean checkOutFiles;
-
- public boolean getAssemble() {
- return assemble;
- }
-
- public boolean getCheckOutFiles() {
- return checkOutFiles;
- }
-
- public boolean getClient() {
- return client;
- }
-
- public boolean getCreateFolders() {
- return createFolders;
- }
-
- public boolean getDeploy() {
- return deploy;
- }
-
- public boolean getDevelop() {
- return develop;
- }
-
- public boolean getInstall() {
- return install;
- }
-
- public boolean getOverWriteFiles() {
- return overWriteFiles;
- }
-
- public boolean getPublish() {
- return publish;
- }
-
- public boolean getRun() {
- return run;
- }
-
- public WebServiceScenario getScenario() {
- return scenario;
- }
-
- public boolean getTest() {
- return test;
- }
-
- public void setAssemble(boolean assemble) {
- this.assemble = assemble;
- }
-
-
- public void setCheckOutFiles(boolean checkOutFiles) {
- this.checkOutFiles = checkOutFiles;
- }
-
-
- public void setClient(boolean client) {
- this.client = client;
- }
-
-
- public void setCreateFolders(boolean createFolders) {
- this.createFolders = createFolders;
- }
-
-
- public void setDeploy(boolean deploy) {
- this.deploy = deploy;
- }
-
-
- public void setDevelop(boolean develop) {
- this.develop = develop;
- }
-
-
- public void setInstall(boolean install) {
- this.install = install;
- }
-
-
- public void setOverWriteFiles(boolean overWriteFiles) {
- this.overWriteFiles = overWriteFiles;
- }
-
-
- public void setPublish(boolean publish) {
- this.publish = publish;
- }
-
-
- public void setRun(boolean run) {
- this.run = run;
- }
-
-
- public void setScenario(WebServiceScenario scenario) {
- this.scenario = scenario;
- }
-
-
- public void setTest(boolean test) {
- this.test = test;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
deleted file mode 100644
index ec46403..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/Selection.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-
-public class Selection implements ISelection {
-
- private Object[] selection;
-
- public Object[] getSelection()
- {
- return selection;
- }
-
- public void setSelection(Object[] selection)
- {
- this.selection = selection;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
deleted file mode 100644
index 28c6f50..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/ServiceType.java
+++ /dev/null
@@ -1,220 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class ServiceType {
-
- private IConfigurationElement elem_;
- private Hashtable webServiceImpls_;
- private HashMap webServiceTypes_;
- private String id;
- private WebServiceImpl webServiceImpl;
- private String[] bottomUpModuleTypesInclude;
- private String[] topDownModuleTypesInclude;
- private String[] bottomUpModuleTypesExclude;
- private String[] topDownModuleTypesExclude;
- private IWebServiceType webServiceType;
-
-
-
- public ServiceType(IConfigurationElement elem_, Hashtable webServiceImpls_, HashMap webServiceTypes_)
- {
- super();
- this.elem_ = elem_;
- this.webServiceImpls_ = webServiceImpls_;
- this.webServiceTypes_ = webServiceTypes_;
- }
-
- public String[] getBottomUpModuleTypesExclude()
- {
- if (bottomUpModuleTypesExclude==null)
- {
- String attr = elem_.getAttribute("buModuleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- bottomUpModuleTypesExclude = new String[size];
- for (int i = 0; i < bottomUpModuleTypesExclude.length; i++)
- bottomUpModuleTypesExclude[i] = st.nextToken();
- }
- }
- return bottomUpModuleTypesExclude;
- }
-
- public void setBottomUpModuleTypesExclude(String[] bottomUpModuleTypesExclude)
- {
- this.bottomUpModuleTypesExclude = bottomUpModuleTypesExclude;
- }
-
- public String[] getBottomUpModuleTypesInclude()
- {
- if (bottomUpModuleTypesInclude==null)
- {
- String attr = elem_.getAttribute("buModuleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- bottomUpModuleTypesInclude = new String[size];
- for (int i = 0; i < bottomUpModuleTypesInclude.length; i++)
- bottomUpModuleTypesInclude[i] = st.nextToken();
- }
- }
- return bottomUpModuleTypesInclude;
- }
-
- public void setBottomUpModuleTypesInclude(String[] bottomUpModuleTypesInclude)
- {
- this.bottomUpModuleTypesInclude = bottomUpModuleTypesInclude;
- }
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String[] getTopDownModuleTypesExclude()
- {
- if (topDownModuleTypesExclude==null)
- {
- String attr = elem_.getAttribute("tdModuleTypesExclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- topDownModuleTypesExclude = new String[size];
- for (int i = 0; i < topDownModuleTypesExclude.length; i++)
- topDownModuleTypesExclude[i] = st.nextToken();
- }
- }
- return topDownModuleTypesExclude;
- }
-
- public void setTopDownModuleTypesExclude(String[] topDownModuleTypesExclude)
- {
- this.topDownModuleTypesExclude = topDownModuleTypesExclude;
- }
-
- public String[] getTopDownModuleTypesInclude()
- {
- if (topDownModuleTypesInclude==null)
- {
- String attr = elem_.getAttribute("tdModuleTypesInclude");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- topDownModuleTypesInclude = new String[size];
- for (int i = 0; i < topDownModuleTypesInclude.length; i++)
- topDownModuleTypesInclude[i] = st.nextToken();
- }
- }
- return topDownModuleTypesInclude;
- }
-
- public void setTopDownModuleTypesInclude(String[] topDownModuleTypesInclude)
- {
- this.topDownModuleTypesInclude = topDownModuleTypesInclude;
- }
-
- /*
- public IWebServiceType getWebSerivceType()
- {
- if (webServiceType==null)
- {
- String wsid = elem_.getAttribute("webServiceTypeId");
- webServiceType = (IWebServiceType)webServiceTypes_.get(wsid);
- }
- return webServiceType;
- }
- */
-
- public void setWebServiceType(IWebServiceType webServiceType)
- {
- this.webServiceType = webServiceType;
- }
-
- public WebServiceImpl getWebServiceImpl()
- {
- if (webServiceImpl == null)
- {
- String wsimplId = elem_.getAttribute("implId");
- webServiceImpl = (WebServiceImpl)webServiceImpls_.get(wsimplId);
- }
- return webServiceImpl;
- }
-
- public void setWebServiceImpl1(WebServiceImpl webServiceImpl)
- {
- this.webServiceImpl = webServiceImpl;
- }
-
- public boolean supportsScenario(int scenario)
- {
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- String[] bus = getBottomUpModuleTypesInclude();
- if (bus!=null && bus.length>0)
- {
- return true;
- }
- break;
- case WebServiceScenario.TOPDOWN:
- String[] tds = getTopDownModuleTypesInclude();
- if (tds!=null && tds.length>0)
- {
- return true;
- }
- break;
- default:
-
- }
-
- return false;
- }
-
- public String[] getModuleTypesInclude(int scenario)
- {
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- return getBottomUpModuleTypesInclude();
- case WebServiceScenario.TOPDOWN:
- return getTopDownModuleTypesInclude();
- default:
- }
-
- return null;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
deleted file mode 100644
index d187b3a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceClientImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceClientImpl {
-
- private IConfigurationElement elem_;
- private String id;
- private String label;
-
- public WebServiceClientImpl(IConfigurationElement elem_)
- {
- super();
- this.elem_ = elem_;
- }
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
deleted file mode 100644
index 971875c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceImpl.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-public class WebServiceImpl {
-
- private IConfigurationElement elem_;
- private String id;
- private String label;
- private String[] resourceTypeMetadata;
- private String[] extensionMetadata;
- private String objectSelectionWidget;
-
- public WebServiceImpl(IConfigurationElement elem_)
- {
- super();
- this.elem_ = elem_;
- }
-
- public String[] getExtensionMetadata()
- {
- if (extensionMetadata==null)
- {
- String attr = elem_.getAttribute("extensionMetadata");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- extensionMetadata = new String[size];
- for (int i = 0; i < extensionMetadata.length; i++)
- extensionMetadata[i] = st.nextToken();
- }
- }
- return extensionMetadata;
- }
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-
-
- public String[] getResourceTypeMetadata()
- {
- if (resourceTypeMetadata==null)
- {
- String attr = elem_.getAttribute("resourceTypeMetadata");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- resourceTypeMetadata = new String[size];
- for (int i = 0; i < resourceTypeMetadata.length; i++)
- resourceTypeMetadata[i] = st.nextToken();
- }
- }
- return resourceTypeMetadata;
- }
-
- public String getObjectSelectionWidget()
- {
- if (objectSelectionWidget==null)
- {
- objectSelectionWidget = elem_.getAttribute("objectSelectionWidget");
- }
- return objectSelectionWidget;
- }
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
deleted file mode 100644
index 3bbef16..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionRegistry.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceTypeImpl;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionRegistry
-{
-
- private static WebServiceRuntimeExtensionRegistry instance_;
-
- HashMap webServiceTypes_;
-
- ArrayList webServiceTypesList_;
-
- ArrayList webServiceClientTypesList_;
-
- Hashtable webServiceImpls_;
-
- Hashtable webServiceClientImpls_;
-
- Hashtable serviceTypes_;
-
- Hashtable clientTypes_;
-
- Hashtable webServiceRuntimes_;
-
- /**
- * Returns a singleton instance of this class.
- *
- * @return A singleton WebServiceRuntimeExtensionRegistry object.
- */
- public static WebServiceRuntimeExtensionRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceRuntimeExtensionRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- private void load()
- {
- // Can't get rid of webServiceTypes in M4
- webServiceTypes_ = new HashMap();
- webServiceTypesList_ = new ArrayList();
- webServiceClientTypesList_ = new ArrayList();
- webServiceImpls_ = new Hashtable();
- webServiceClientImpls_ = new Hashtable();
- serviceTypes_ = new Hashtable();
- clientTypes_ = new Hashtable();
- webServiceRuntimes_ = new Hashtable();
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
-
- //Load WebServiceTypes
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "webServiceServerRuntimeType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
-
- if (elem.getName().equals("webServiceType"))
- {
- WebServiceTypeImpl wst = new WebServiceTypeImpl(elem);
- webServiceTypes_.put(elem.getAttribute("id"), wst);
- }
- }
-
- //Load WebServiceImpls
- IConfigurationElement[] wsImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsImpl");
-
- for(int idx=0; idx<wsImplExts.length; idx++)
- {
- IConfigurationElement elem = wsImplExts[idx];
-
- if (elem.getName().equals("webServiceImpl"))
- {
- WebServiceImpl wsimpl = new WebServiceImpl(elem);
- webServiceImpls_.put(elem.getAttribute("id"), wsimpl);
- }
- }
-
- //Load WebServiceClientImpls
- IConfigurationElement[] wsClientImplExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "wsClientImpl");
-
- for(int idx=0; idx<wsClientImplExts.length; idx++)
- {
- IConfigurationElement elem = wsClientImplExts[idx];
-
- if (elem.getName().equals("webServiceClientImpl"))
- {
- WebServiceClientImpl wsClientImpl = new WebServiceClientImpl(elem);
- webServiceClientImpls_.put(elem.getAttribute("id"), wsClientImpl);
- }
- }
-
- //Load ServiceTypes
- IConfigurationElement[] serviceTypeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "serviceType");
-
- for(int idx=0; idx<serviceTypeExts.length; idx++)
- {
- IConfigurationElement elem = serviceTypeExts[idx];
-
- if (elem.getName().equals("serviceType"))
- {
- ServiceType st = new ServiceType(elem,webServiceImpls_,webServiceTypes_);
- serviceTypes_.put(elem.getAttribute("id"), st);
- }
- }
-
- //Load ClientTypes
- IConfigurationElement[] clientTypeExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "clientType");
-
- for(int idx=0; idx<clientTypeExts.length; idx++)
- {
- IConfigurationElement elem = clientTypeExts[idx];
-
- if (elem.getName().equals("clientType"))
- {
- ClientType ct = new ClientType(elem,webServiceClientImpls_);
- clientTypes_.put(elem.getAttribute("id"), ct);
- }
- }
-
- //Load WebSerivceRuntimes
- IConfigurationElement[] wsrtExts = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui", "webServiceRuntime");
-
- for(int idx=0; idx<wsrtExts.length; idx++)
- {
- IConfigurationElement elem = wsrtExts[idx];
-
- if (elem.getName().equals("webServiceRuntime"))
- {
- WebServiceRuntimeInfo wsrtInfo = new WebServiceRuntimeInfo(elem, serviceTypes_, clientTypes_);
- webServiceRuntimes_.put(elem.getAttribute("id"), wsrtInfo);
-
- //Update the type lists
- updateWebServiceTypeList(wsrtInfo);
- updateWebServiceClientTypeList(wsrtInfo);
-
- }
- }
- }
-
- private void updateWebServiceTypeList(WebServiceRuntimeInfo wsrtInfo)
- {
- ServiceType[] sts = wsrtInfo.getServiceTypes();
- if (sts != null)
- {
- for (int j = 0; j < sts.length; j++)
- {
- String implId = sts[j].getWebServiceImpl().getId();
- String[] bus = sts[j].getBottomUpModuleTypesInclude();
- String[] tds = sts[j].getTopDownModuleTypesInclude();
- if (bus != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.BOTTOMUP));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- if (tds != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.TOPDOWN));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceTypesList_.contains(entry))
- {
- webServiceTypesList_.add(entry);
- }
- }
- }
- }
- }
-
- private void updateWebServiceClientTypeList(WebServiceRuntimeInfo wsrtInfo)
- {
- ClientType[] cts = wsrtInfo.getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- String implId = cts[j].getWebServiceClientImpl().getId();
- String[] mods = cts[j].getModuleTypesInclude();
- if (mods != null)
- {
- StringBuffer entrybuff = new StringBuffer();
- entrybuff.append(String.valueOf(WebServiceScenario.CLIENT));
- entrybuff.append("/");
- entrybuff.append(implId);
- String entry = entrybuff.toString();
- if (!webServiceClientTypesList_.contains(entry))
- {
- webServiceClientTypesList_.add(entry);
- }
- }
- }
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
deleted file mode 100644
index 5443ca9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java
+++ /dev/null
@@ -1,1005 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.IWebServiceType;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.TypeSelectionFilter;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceTypeImpl;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.ui.ServerUICore;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class WebServiceRuntimeExtensionUtils
-{
- private static WebServiceRuntimeExtensionRegistry registry = WebServiceRuntimeExtensionRegistry.getInstance();
- private static SelectionListChoices serverToRuntimeToJ2EE_;
- private static Hashtable serverFactoryIdByLabel_;
- private static Hashtable runtimeIdByLabel_;
-
- public static IWebServiceRuntime getWebServiceRuntime( String runtimeId )
- {
- WebServiceRuntimeInfo wsrtInfo = getWebServiceRuntimeById(runtimeId);
- IWebServiceRuntime webserviceRuntime = null;
- if (wsrtInfo != null)
- {
- webserviceRuntime = wsrtInfo.getWebServiceRuntime();
- }
-
- return webserviceRuntime;
- }
-
- public static IWebServiceType getWebServiceTypeById(String id)
- {
- Object result = registry.webServiceTypes_.get(id);
-
- if (result!=null)
- {
- return (WebServiceTypeImpl)result;
- }
- return null;
- }
-
- public static WebServiceImpl getWebServiceImplById(String id)
- {
- Object result = registry.webServiceImpls_.get(id);
- if (result!=null)
- {
- return (WebServiceImpl)result;
- }
- return null;
- }
-
- public static int getScenarioFromTypeId(String typeId)
- {
- return Integer.parseInt(typeId.substring(0,typeId.indexOf("/")));
- }
-
- public static String getImplIdFromTypeId(String typeId)
- {
- return typeId.substring(typeId.indexOf("/")+1);
- }
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static ServiceType getServiceType(String runtimeId, String typeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt!=null)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getImplIdFromTypeId(typeId);
- //Return the first service type that supports the impl and scenario
- ServiceType[] sts = wsrt.getServiceTypes();
- if (sts != null)
- {
- for (int i = 0; i < sts.length; i++)
- {
- String thisImplId = sts[i].getWebServiceImpl().getId();
- if (implId.equals(thisImplId))
- {
- // Check if scenario is supported
- if (sts[i].supportsScenario(scenario))
- {
- return sts[i];
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public static WebServiceRuntimeInfo getWebServiceRuntimeById(String id)
- {
- Object result = registry.webServiceRuntimes_.get(id);
- if (result!=null)
- {
- return (WebServiceRuntimeInfo)result;
- }
- return null;
- }
-
- public static WebServiceRuntimeInfo getWebServiceRuntimeByLabel(String label)
- {
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- if (wsr!=null) {
- if (label.equals(wsr.getLabel()))
- return wsr;
- }
- }
- return null;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static String[] getRuntimesByType(String typeId)
- {
- int scenario = getScenarioFromTypeId(typeId);
- String implId = getImplIdFromTypeId(typeId);
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- ServiceType[] sts = wsr.getServiceTypes();
- if (sts != null)
- {
- for (int i = 0; i < sts.length; i++)
- {
- String thisImplId = sts[i].getWebServiceImpl().getId();
- if (implId.equals(thisImplId))
- {
- // Check if scenario is supported
- if (sts[i].supportsScenario(scenario))
- {
- ids.add(wsr.getId());
- break;
- }
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isRuntimeSupportedForType(String typeId, String runtimeId)
- {
- String[] runtimeIds = getRuntimesByType(typeId);
- if (runtimeIds!=null)
- {
- for (int i=0; i < runtimeIds.length; i++)
- {
- if (runtimeIds[i].equals(runtimeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static String[] getServerFactoryIdsByType(String typeId)
- {
- String[] wsrts = getRuntimesByType(typeId);
- if (wsrts == null )
- {
- return null;
- }
-
- ArrayList ids = new ArrayList();
- for (int i=0; i<wsrts.length ;i++)
- {
- String[] fIds = getWebServiceRuntimeById(wsrts[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j=0; j<fIds.length; j++)
- {
- if (!ids.contains(fIds[j]))
- {
- ids.add(fIds[j]);
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isServerSupportedForChosenType(String typeId, String serverFactoryId)
- {
- String[] fIds = getServerFactoryIdsByType(typeId);
- if (fIds == null)
- {
- return false;
- }
-
- for (int i=0;i<fIds.length;i++)
- {
- if (serverFactoryId.equals(fIds[i]))
- {
- return true;
- }
- }
-
- return false;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean isServerRuntimeTypeSupported(String serverFactoryId, String runtimeId, String typeId)
- {
- String[] rIds = getRuntimesByType(typeId);
- if (rIds == null)
- {
- return false;
- }
-
- for (int i = 0; i < rIds.length; i++)
- {
- if (runtimeId.equals(rIds[i]))
- {
- String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j = 0; j < fIds.length; j++)
- {
- if (serverFactoryId.equals(fIds[j]))
- {
- // Found it!
- return true;
- }
- }
- }
- }
- }
-
- return false;
- }
-
- public static boolean doesRuntimeSupportJ2EELevel(String j2eeVersionId, String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt==null)
- return false;
-
- String[] j2eeVersions = wsrt.getJ2eeLevels();
- if (j2eeVersions==null || j2eeVersions.length==0)
- return true;
-
- for(int i=0; i<j2eeVersions.length; i++)
- {
- if (j2eeVersions[i].equals(j2eeVersionId))
- {
- return true;
- }
- }
- return false;
- }
-
- public static boolean doesRuntimeSupportServerTarget(String serverTargetId, String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt==null)
- return false;
-
- String[] fIds = wsrt.getServerFactoryIds();
- for(int i=0;i<fIds.length;i++)
- {
- IServerType serverType = ServerCore.findServerType(fIds[i]);
- if (serverType == null)
- continue;
-
- String thisServerTargetId = serverType.getRuntimeType().getId();
- if (thisServerTargetId.equals(serverTargetId))
- return true;
- }
-
- return false;
- }
-
- /**
- * Returns a list of valid projects for the Web service type with an id of typeId.
- * In the case where the Web service type extension does not specify which project
- * natures are included, a array of all Web and EJB projects in the workspace will
- * be returned.
- * @param typeId
- * @return IProject[] an array of valid projects
- */
- public static IProject[] getAllProjects()
- {
- IProject[] projects = ResourcesPlugin.getWorkspace().getRoot().getProjects();
- ArrayList validProjects = new ArrayList();
- for (int i = 0; i < projects.length; i++)
- {
- if (!projects[i].getName().equals("Servers") && !projects[i].getName().startsWith("."))
- {
- validProjects.add(projects[i]);
- }
- }
-
- return (IProject[])validProjects.toArray(new IProject[0]);
- // rsktodo
- /*
- IWebServiceType wst = getWebServiceTypeById(typeId);
- if (wst != null)
- {
- IConfigurationElement elem = wst.getConfigurationElement();
- String includedNatures = elem.getAttribute("includeNatures");
- String excludedNatures = elem.getAttribute("excludeNatures");
- if (includedNatures!=null && includedNatures.length()>0)
- {
- for (int i = 0; i < projects.length; i++)
- {
- if (include(projects[i], includedNatures) && exclude(projects[i], excludedNatures))
- validProjects.add(projects[i]);
- }
- return (IProject[])validProjects.toArray(new IProject[0]);
- }
- }
-
- //If wst was null or the extension didn't specify which project natures are
- // to be included, revert to the old behaviour
- for (int j = 0; j < projects.length; j++)
- {
- if (ResourceUtils.isWebProject(projects[j]) || ResourceUtils.isEJBProject(projects[j]))
- validProjects.add(projects[j]);
- }
- return (IProject[])validProjects.toArray(new IProject[0]);
- */
- // rsktodo
- }
-
- private static boolean include(IProject project, String include)
- {
- StringTokenizer st = new StringTokenizer(include);
- while(st.hasMoreTokens())
- {
- try
- {
- if (project.hasNature(st.nextToken()))
- return true;
- }
- catch (CoreException ce)
- {
- }
- }
- return false;
- }
-
- private static boolean exclude(IProject project, String exclude)
- {
- StringTokenizer st = new StringTokenizer(exclude);
- while(st.hasMoreTokens())
- {
- try
- {
- if (project.hasNature(st.nextToken()))
- return false;
- }
- catch (CoreException ce)
- {
- }
- }
- return true;
- }
-
- public static LabelsAndIds getServiceTypeLabels()
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", registry );
-
- LabelsAndIds labelIds = new LabelsAndIds();
- Iterator iterator = registry.webServiceTypesList_.iterator();
- int size = registry.webServiceTypesList_.size();
- String[] labels = new String[size];
- String[] ids = new String[size];
- int index = 0;
-
- labelIds.setLabels_( labels );
- labelIds.setIds_( ids );
-
- while( iterator.hasNext() )
- {
- String wst = (String)iterator.next();
- int scenario = getScenarioFromTypeId(wst);
- String implId = getImplIdFromTypeId(wst);
- WebServiceImpl wsimpl = WebServiceRuntimeExtensionUtils.getWebServiceImplById(implId);
- String impllabel = wsimpl.getLabel();
- ids[index] = wst;
- String scenLabel = "";
- switch(scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- scenLabel = msgUtils.getMessage(WebServiceScenario.BOTTOMUP_LABEL);
- break;
- case WebServiceScenario.TOPDOWN:
- scenLabel = msgUtils.getMessage(WebServiceScenario.TOPDOWN_LABEL);
- break;
- default:
- }
- labels[index] = scenLabel +" "+impllabel;
- index++;
- }
-
- return labelIds;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static String getDefaultRuntimeValueFor(String typeId)
- {
- String[] rIds = getRuntimesByType(typeId);
- if (rIds == null)
- {
- return null;
- }
-
- return rIds[0];
- }
-
-
- public static String getDefaultServerValueFor(String typeId)
- {
- String[] fIds = getServerFactoryIdsByType(typeId);
- if (fIds==null)
- return null;
-
- return fIds[0];
- }
-
- public static String[] getWebServiceTypeBySelection(IStructuredSelection selection)
- {
- TypeSelectionFilter tsf = new TypeSelectionFilter();
- String[] wst = tsf.getWebServiceTypeByInitialSelection(selection, registry.webServiceTypesList_);
- return wst == null ? null : wst;
- }
- /**
- * Returns true if an EJB project is needed to host a Web service
- * of the type identified by typeId. If multiple natureIds are specified in the
- * "includeNatures" attribute, only the first one is checked. If no natureIds are specified,
- * false is returned.
- *
- * @deprecated
- * Should be refactored in future
- */
- public static boolean requiresEJBProject(String typeId)
- {
- IWebServiceType wst = getWebServiceTypeById(typeId);
- if (wst != null)
- {
- IConfigurationElement elem = wst.getConfigurationElement();
- String includedNatures = elem.getAttribute("includeNatures");
- if (includedNatures==null || includedNatures.length()==0)
- {
- return false;
- }
- else
- {
- StringTokenizer st = new StringTokenizer(includedNatures);
- if(st.hasMoreTokens())
- {
- String firstIncludedNature = st.nextToken();
- if (firstIncludedNature.equals(IEJBNatureConstants.NATURE_ID))
- return true;
- }
- }
- }
- return false;
- }
-
- /*
- * @param typeId will be a String of the format "0/implId"
- * where the digit before the "/" represents the scenario
- * (e.g. WebServiceScenario.BOTTOM_UP) and the implId is the id
- * of the WebServiceImpl
- */
- public static boolean requiresEJBProject(String runtimeId, String typeId)
- {
- ServiceType st = getServiceType(runtimeId, typeId);
- if (st!=null)
- {
- String[] includedNatures = st.getModuleTypesInclude(getScenarioFromTypeId(typeId));
- if (includedNatures!=null && includedNatures.length>0)
- {
- if (includedNatures[0].equals(IModuleConstants.JST_EJB_MODULE))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static boolean requiresEJBModuleFor(String serverFactoryId, String runtimeId, String typeId)
- {
- // rsktodo
- return false;
- }
-
- //Ported from the former WebServiceClientRegistry
-
- public static String getRuntimeLabelById(String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt == null)
- return null;
-
- return wsrt.getLabel();
- }
-
- public static String getServerLabelById(String serverFactoryId)
- {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- String serverLabel = ServerUICore.getLabelProvider().getText(serverType);
- return serverLabel;
- }
-
- public static String getServerInstanceLabelFromInstanceId( String instanceId )
- {
- IServer server = ServerCore.findServer( instanceId );
- return server.getName();
- }
-
- public static boolean doesRuntimeSupportServer(String runtimeId, String factoryId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
- if (wsrt != null)
- {
- String[] fids = wsrt.getServerFactoryIds();
- if (fids!=null)
- {
- for (int i=0; i<fids.length; i++)
- {
- if (fids[i].equals(factoryId))
- {
- return true;
- }
- }
- }
- }
- return false;
- }
-
- public static String getFirstSupportedServer(String runtimeId)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(runtimeId);
-
- if (wsrt != null)
- {
- String[] fids = wsrt.getServerFactoryIds();
- if (fids!=null && fids.length>0)
- {
- return fids[0];
- }
- }
-
- return null;
- }
-
-
- public static String[] getRuntimesByClientType(String clientImplId)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- ClientType[] cts = wsr.getClientTypes();
- if (cts != null)
- {
- for (int i = 0; i < cts.length; i++)
- {
- String wsClientImplId = cts[i].getWebServiceClientImpl().getId();
- if (wsClientImplId.equals(clientImplId))
- {
- ids.add(wsr.getId());
- break;
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
- }
-
-
-
- public static boolean webServiceClientRuntimeTypeExists(String serverFactoryId, String runtimeId, String clientTypeId)
- {
- String[] rIds = getRuntimesByClientType(clientTypeId);
- if (rIds == null)
- {
- return false;
- }
-
- for (int i = 0; i < rIds.length; i++)
- {
- if (runtimeId.equals(rIds[i]))
- {
- String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j = 0; j < fIds.length; j++)
- {
- if (serverFactoryId.equals(fIds[j]))
- {
- // Found it!
- return true;
- }
- }
- }
- }
- }
-
- return false;
- }
-
- public static String[] getAllClientRuntimes()
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- ClientType[] cts = wsr.getClientTypes();
- if (cts!=null && cts.length>0)
- {
- //this runtime supports the client scenario
- ids.add(wsr.getId());
- }
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
- }
-
-
- public static String[] getAllClientServerFactoryIds()
- {
- String[] rIds = getAllClientRuntimes();
- if (rIds==null)
- return null;
-
- ArrayList ids = new ArrayList();
- for (int i=0; i<rIds.length ;i++)
- {
- String[] fIds = getWebServiceRuntimeById(rIds[i]).getServerFactoryIds();
- if (fIds != null)
- {
- for (int j=0; j<fIds.length; j++)
- {
- if (!ids.contains(fIds[j]))
- {
- ids.add(fIds[j]);
- }
- }
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
-
-
- public static String[] getClientProjectTypes(String clientImplId, String runtimeId)
- {
- String[] rIds = getRuntimesByClientType(clientImplId);
- if (rIds == null)
- {
- return null;
- }
-
- for (int i = 0; i < rIds.length; i++)
- {
- if (runtimeId.equals(rIds[i]))
- {
- ClientType[] cts = getWebServiceRuntimeById(rIds[i]).getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- String thisClientImplId = cts[j].getWebServiceClientImpl().getId();
- if (clientImplId.equals(thisClientImplId))
- {
- // Found the one!
- String[] projectTypes = cts[j].getModuleTypesInclude();
- return projectTypes;
- }
- }
- }
- }
- }
-
- return null;
- }
-
- public static boolean doesRuntimeSupportComponentType(String clientImplId, String runtimeId, String componentTypeId)
- {
- String[] compTypeIds = getClientProjectTypes(clientImplId, runtimeId);
- if (compTypeIds!=null)
- {
- for (int i=0; i<compTypeIds.length; i++)
- {
- if (compTypeIds[i].equals(componentTypeId))
- {
- return true;
- }
- }
- }
-
- return false;
- }
-
- public static LabelsAndIds getClientTypeLabels()
- {
-
- LabelsAndIds labelIds = new LabelsAndIds();
- String[] idsArray = new String[0];
- String[] labelsArray = new String[0];
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
-
- String[] rIds = getAllClientRuntimes();
- if (rIds == null)
- {
- return labelIds;
- }
-
- ArrayList ids = new ArrayList();
- ArrayList labels = new ArrayList();
-
- for (int i=0; i < rIds.length; i++)
- {
- WebServiceRuntimeInfo wsrt = getWebServiceRuntimeById(rIds[i]);
- ClientType[] cts = wsrt.getClientTypes();
- if (cts != null)
- {
- for (int j = 0; j < cts.length; j++)
- {
- ClientType ct = cts[j];
- // String id = ct.getWebServiceClientTypeId();
- String id = ct.getWebServiceClientImpl().getId();
- if (!ids.contains(id))
- {
- ids.add(id);
- labels.add(ct.getWebServiceClientImpl().getLabel());
- }
- }
- }
-
- }
-
- if (ids.size() > 0)
- {
- idsArray = (String[]) ids.toArray(new String[0]);
- labelsArray = (String[]) labels.toArray(new String[0]);
- labelIds.setIds_(idsArray);
- labelIds.setLabels_(labelsArray);
- }
-
- return labelIds;
-
- }
-
- //Utilities used by the ServerRuntimePreferencePage
-
- public static SelectionListChoices getServerToRuntimeToJ2EE()
- {
- if (serverToRuntimeToJ2EE_!=null)
- {
- return serverToRuntimeToJ2EE_;
- }
-
- //String[] servers = getStringArrayIntersection(getAllServerFactoryIds(), WebServiceClientTypeRegistry.getInstance().getAllClientServerFactoryIds());
- String[] servers = getAllServerFactoryIds();
- SelectionList serversList = new SelectionList(servers, 0);
- Vector choices = new Vector();
- for (int i=0; i<servers.length; i++)
- {
- choices.add(getRuntimeChoices(servers[i]));
- }
- serverToRuntimeToJ2EE_ = new SelectionListChoices(serversList, choices);
- return serverToRuntimeToJ2EE_;
-
- }
-
- private static SelectionListChoices getRuntimeChoices(String serverFactoryId)
- {
-
- String[] runtimes = getRuntimeIDsByServerFactoryID(serverFactoryId);
- SelectionList runtimesList = new SelectionList(runtimes, 0);
- Vector choices = new Vector();
- for (int i=0; i<runtimes.length; i++)
- {
- choices.add(getJ2EEChoices(runtimes[i]));
- }
- return new SelectionListChoices(runtimesList, choices);
- }
-
- private static SelectionListChoices getJ2EEChoices(String runtimeId)
- {
- //String[] serviceJ2EEVersions = getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
- //String[] clientJ2EEVersions = WebServiceClientTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId).getJ2EEVersions();
- //String[] j2eeVersions = getStringArrayIntersection(serviceJ2EEVersions, clientJ2EEVersions);
- WebServiceRuntimeInfo wsr = getWebServiceRuntimeById(runtimeId);
- if (wsr==null)
- {
- return null;
- }
-
- String[] j2eeVersions = wsr.getJ2eeLevels();
- SelectionList j2eeVersionsList = new SelectionList(j2eeVersions, 0);
- return new SelectionListChoices(j2eeVersionsList, null);
- }
-
- private static String[] getAllServerFactoryIds()
- {
- ArrayList ids = new ArrayList();
- if (serverFactoryIdByLabel_ == null)
- {
- serverFactoryIdByLabel_ = new Hashtable();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo) iter.next();
- String[] sfids = wsr.getServerFactoryIds();
- for (int i = 0; i < sfids.length; i++)
- {
- if (!ids.contains(sfids[i]))
- {
- ids.add(sfids[i]);
- String label = getServerLabelById(sfids[i]);
- serverFactoryIdByLabel_.put(label, sfids[i]);
- }
- }
- }
- }
- else
- {
- Iterator fids = serverFactoryIdByLabel_.values().iterator();
- while (fids.hasNext())
- {
- String fid = (String)fids.next();
- ids.add(fid);
- }
- }
-
- if (ids.size() > 0)
- {
- String[] serverFactoryIds = (String[])ids.toArray(new String[0]);
- return serverFactoryIds;
- }
-
- return null;
- }
-
- private static String[] getRuntimeIDsByServerFactoryID(String serverFactoryID)
- {
- ArrayList ids = new ArrayList();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- if (doesRuntimeSupportServer(wsr.getId(), serverFactoryID))
- {
- ids.add(wsr.getId());
- }
-
- }
-
- if (ids.size() > 0)
- {
- String[] runtimeIds = (String[])ids.toArray(new String[0]);
- return runtimeIds;
- }
-
- return null;
-
-
- }
-
- public static String getServerFactoryId(String label)
- {
- if (label==null || label.length()==0)
- return null;
-
- if (serverFactoryIdByLabel_ == null)
- {
- getAllServerFactoryIds();
- }
-
- if (serverFactoryIdByLabel_.containsKey(label))
- {
- return (String)serverFactoryIdByLabel_.get(label);
- }
- else
- {
- return null;
- }
- }
-
- public static String getRuntimeId(String label)
- {
-
- if (label==null || label.length()==0)
- return null;
-
- if (runtimeIdByLabel_ == null)
- {
- runtimeIdByLabel_ = new Hashtable();
- Iterator iter = registry.webServiceRuntimes_.values().iterator();
- while (iter.hasNext())
- {
- WebServiceRuntimeInfo wsr = (WebServiceRuntimeInfo)iter.next();
- runtimeIdByLabel_.put(wsr.getLabel(), wsr.getId());
- }
- }
-
- return (String)runtimeIdByLabel_.get(label);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java b/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
deleted file mode 100644
index f49b706..0000000
--- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeInfo.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.ui.wsrt;
-
-import java.util.Hashtable;
-import java.util.StringTokenizer;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-
-
-public class WebServiceRuntimeInfo {
-
- private IConfigurationElement elem_;
- private Hashtable allServiceTypes_;
- private Hashtable allClientTypes_;
-
- private String id;
- private String label;
- private ServiceType[] serviceTypes;
- private ClientType[] clientTypes;
- private java.lang.String[] servletLevels;
- private java.lang.String[] j2eeLevels;
- private java.lang.String[] runtimeIds;
- private java.lang.String[] serverFactoryIds;
- private String className;
- private IWebServiceRuntime webServiceRuntime_;
-
- public WebServiceRuntimeInfo(IConfigurationElement elem_, Hashtable allServiceTypes_, Hashtable allClientTypes_)
- {
- super();
- this.elem_ = elem_;
- this.allServiceTypes_ = allServiceTypes_;
- this.allClientTypes_ = allClientTypes_;
- }
-
- public String getClassName()
- {
- if (className==null)
- {
- className=elem_.getAttribute("class");
- }
- return className;
- }
-
-
- public ClientType[] getClientTypes()
- {
- if (clientTypes==null)
- {
- String attr = elem_.getAttribute("clientTypes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- clientTypes = new ClientType[size];
- for (int i = 0; i < clientTypes.length; i++)
- {
- String ctid = st.nextToken();
- clientTypes[i] = (ClientType)allClientTypes_.get(ctid);
- }
- }
- }
- return clientTypes;
- }
-
-
- public String getId()
- {
- if (id==null)
- {
- id = elem_.getAttribute("id");
- }
- return id;
- }
-
-
- public String getLabel()
- {
- if (label==null)
- {
- label = elem_.getAttribute("label");
- }
- return label;
- }
-
-
- public java.lang.String[] getJ2eeLevels()
- {
- if (j2eeLevels == null)
- {
- String attr = elem_.getAttribute("j2eeLevels");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- j2eeLevels = new String[size];
- for (int i = 0; i < j2eeLevels.length; i++)
- j2eeLevels[i] = st.nextToken();
- }
- }
-
- return j2eeLevels;
- }
-
-
- public java.lang.String[] getRuntimeIds()
- {
- if (runtimeIds == null)
- {
- String attr = elem_.getAttribute("runtimes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- runtimeIds = new String[size];
- for (int i = 0; i < runtimeIds.length; i++)
- runtimeIds[i] = st.nextToken();
- }
- }
-
- return runtimeIds;
- }
-
-
- public java.lang.String[] getServerFactoryIds()
- {
- if (serverFactoryIds == null)
- {
- String attr = elem_.getAttribute("servers");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- serverFactoryIds = new String[size];
- for (int i = 0; i < serverFactoryIds.length; i++)
- serverFactoryIds[i] = st.nextToken();
- }
- }
- return serverFactoryIds;
- }
-
-
- public ServiceType[] getServiceTypes()
- {
- if (serviceTypes==null)
- {
- String attr = elem_.getAttribute("serviceTypes");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- serviceTypes = new ServiceType[size];
- for (int i = 0; i < serviceTypes.length; i++)
- {
- String ctid = st.nextToken();
- serviceTypes[i] = (ServiceType)allServiceTypes_.get(ctid);
- }
- }
- }
- return serviceTypes;
- }
-
-
- public java.lang.String[] getServletLevels()
- {
- if (servletLevels==null)
- {
- String attr = elem_.getAttribute("servletLevels");
- if (attr != null && attr.length()>0)
- {
- StringTokenizer st = new StringTokenizer(attr, " ");
- int size = st.countTokens();
- servletLevels = new String[size];
- for (int i = 0; i < servletLevels.length; i++)
- servletLevels[i] = st.nextToken();
- }
- }
- return servletLevels;
- }
-
- public IWebServiceRuntime getWebServiceRuntime()
- {
- if (webServiceRuntime_ == null)
- {
- try
- {
- webServiceRuntime_ = (IWebServiceRuntime)elem_.createExecutableExtension("class");
- }
- catch(CoreException ce)
- {
-
- }
- }
-
- return webServiceRuntime_;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/.classpath b/bundles/org.eclipse.jst.ws.consumption/.classpath
deleted file mode 100644
index 7c69b4f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="webserviceutils"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.consumption/.cvsignore b/bundles/org.eclipse.jst.ws.consumption/.cvsignore
deleted file mode 100644
index 0a24de6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-build.xml
-temp.folder
-webserviceutils.jar
-wsc.jar
diff --git a/bundles/org.eclipse.jst.ws.consumption/.project b/bundles/org.eclipse.jst.ws.consumption/.project
deleted file mode 100644
index 2a89cfa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/.project
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.consumption</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.wst.wsdl</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
deleted file mode 100644
index b51b842..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,56 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.consumption; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wsc.jar,
- webserviceutils.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.internal.consumption.codegen,
- org.eclipse.jst.ws.internal.consumption.codegen.bean,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions,
- org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors,
- org.eclipse.jst.ws.internal.consumption.command.common,
- org.eclipse.jst.ws.internal.consumption.common,
- org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel,
- org.eclipse.jst.ws.internal.consumption.datamodel.validate,
- org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel,
- org.eclipse.jst.ws.internal.consumption.fragments,
- org.eclipse.jst.ws.internal.consumption.plugin,
- org.eclipse.jst.ws.internal.consumption.sampleapp.codegen,
- org.eclipse.jst.ws.internal.consumption.sampleapp.command,
- org.eclipse.jst.ws.internal.consumption.sampleapp.common,
- org.eclipse.jst.ws.internal.consumption.wsfinder,
- org.eclipse.jst.ws.util
-Require-Bundle: org.eclipse.jem,
- org.eclipse.jem.workbench,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jdt.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.xsd,
- org.eclipse.debug.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.launching,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.jem.workbench,
- org.eclipse.jface,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.parser,
- org.eclipse.wst.server.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.internet.monitor.core,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.wsdl4j,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.consumption/about.html b/bundles/org.eclipse.jst.ws.consumption/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/build.properties b/bundles/org.eclipse.jst.ws.consumption/build.properties
deleted file mode 100644
index c47ab57..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/build.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-source.wsc.jar = src/
-source.webserviceutils.jar = webserviceutils/
-jars.compile.order = wsc.jar,\
- webserviceutils.jar
-bin.includes = plugin.properties,\
- plugin.xml,\
- wsc.jar,\
- webserviceutils.jar,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/plugin.properties
deleted file mode 100644
index f484e26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Consumption
-PLUGIN_PROVIDER=Eclipse.org
-XP_WSFINDER=org.eclipse.jst.ws.internal.consumption.wsfinder
-XP_WEB_SERVICE_START_SERVER_TYPE=WebServiceStartServerType
-XP_SERVER_DEFAULTER=Server Defaulter
diff --git a/bundles/org.eclipse.jst.ws.consumption/plugin.xml b/bundles/org.eclipse.jst.ws.consumption/plugin.xml
deleted file mode 100644
index 1f9a7a3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/plugin.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension-point
- id="wsfinder"
- name="%XP_WSFINDER"/>
-
- <!-- The following extension point will be removed. -->
- <extension-point
- id="webServiceStartServerType"
- name="%XP_WEB_SERVICE_START_SERVER_TYPE"/>
-
- <extension-point
- id="serverDefaulter"
- name="%XP_SERVER_DEFAULTER"/>
-
- <extension
- point="org.eclipse.jst.ws.consumption.webServiceStartServerType">
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.32"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT32_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.40"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT40_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.41"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT41_LOCAL">
- </webServiceStartServerType>
- <webServiceStartServerType
- factoryId="org.eclipse.jst.server.tomcat.50"
- class="org.eclipse.jst.ws.internal.consumption.command.common.StartTomcatServer"
- id="SERVER_ID_TOMCAT50_LOCAL">
- </webServiceStartServerType>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
deleted file mode 100644
index 115f4af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/consumption/plugin.properties
+++ /dev/null
@@ -1,175 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Sample messages
-#
-MSG_ERROR_JTS_PROXY_HAS_NO_METHODS=IWAB0179E Unable to create a sample to the proxy because the proxy does not contain methods.
-MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT=IWAB0180E Unable to create a sample to the proxy because the proxy is not a bean (i.e.. the sample does not have public default constructor).
-MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED=IWAB0181E Unable to create a sample to the proxy because none of the methods in the proxy were processed.
-MSG_WARN_JTS_UNSUPPORTED_TYPE=IWAB0182W The Sample JSP client does not support the following type:
-MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES=IWAB0187W The Sample JSP client does not support Indexed properties.
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS=IWAB0237W The Sample JSP client does not support arrays:
-MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS=IWAB0124W The Sample JSP client does not support input parameters that are not beans:
-MSG_ERROR_JTS_CYCLIC_BEAN=IWAB0188E The Sample JSP client does not support beans containing attributes that reference the beans.
-MSG_WARN_JTS_PROXY_METHODS_OMITTED=IWAB0189W The Sample JSP client omitted some methods because they contained unsupported types.
-MSG_ERROR_SAMPLE_CREATION_CANCELED=IWAB0021E Sample creation was canceled
-MSG_WARN_UNABLE_TO_FIND_PROXY=IWAB0022W The Proxy Resource cound not not be found.
-
-MSG_ERROR_CANNOT_CREATE_COMPONENT=The Web service wizard cannot automatically create component "{0}". Cancel the wizard and create the component manually.
-
-#
-# Filters
-#
-FILTER_MSG_ERROR_NULL_OBJECT=IWAB0097E No object has been provided.
-FILTER_MSG_ERROR_NOT_FILE=IWAB0098E The object "{0}" is not a file.
-FILTER_MSG_ERROR_NOT_FOLDER=IWAB0137E The object "{0}" is not a folder.
-
-JAVA_FILTER_NAME=Java files
-JAVA_FILTER_DESC=Files with names ending in ".java" or ".class".
-JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0102E The file "{0}" does not end in ".java" or ".class".
-
-WSDL_FILTER_NAME=WSDL files
-WSDL_FILTER_DESC=Files with names ending in ".wsdl".
-WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0103E The file "{0}" does not end in ".wsdl".
-
-ISD_FILTER_NAME=ISD files
-ISD_FILTER_DESC=Files with names ending in ".isd".
-ISD_FILTER_MSG_ERROR_WRONG_EXTENSION=IWAB0095E The file "{0}" does not end in ".isd".
-
-FOLDER_FILTER_NAME=Folders
-FOLDER_FILTER_DESC=Folders.
-
-
-#
-# Common messages
-#
-
-
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0069E Web project was not found.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0070E Server was not found.
-
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0072I Publishing Web project.
-
-#
-# Deployment status
-#
-PROGRESS_INFO_COPY_WEBSERVICE_UTILS=IWAB0023I Copying the webservice utilities.
-PROGRESS_INFO_COPYING_FILE=IWAB0197I Copying SOAP run-time file.
-PROGRESS_INFO_START_WEB_PROJECT=IWAB0198I Starting Web project.
-PROGRESS_INFO_PUBLISHING_SERVER=IWAB0199I Publishing server.
-PROGRESS_INFO_STARTING_SERVER=IWAB0200I Starting server.
-PROGRESS_INFO_PUBLISH_WEB_PROJECT=IWAB0205I Publishing Web project.
-
-
-#
-# Deployment messages
-#
-MSG_ERROR_PROJECT_NOT_FOUND=IWAB0207E Web project was not found.
-MSG_ERROR_FILECOPY_WEBSERVICE_UTILS=IWAB0024E Error in copying Webservice Utility file.
-MSG_ERROR_INSTANCE_NOT_FOUND=IWAB0212E Server was not found.
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
-MSG_ERROR_PUBLISH=IWAB0217E Error in publishing Web project.
-MSG_ERROR_ADD_MODULE=Error occured when adding the module, {0}, to the server
-
-MSG_WARN_NO_DB_DRIVER=IWAB0221W Unable to locate db2java.zip, please ensure db2java.zip is added to the server class path.
-
-MSG_ERROR_BAD_SERVER_CONFIG=IWAB0534E Unable to add EAR project to Server Configuration.
-MSG_ERROR_CREATE_SERVER=IWAB0025E Unable to create server.
-
-
-
-#
-# EJB messages
-#
-TASK_LABEL_CREATE_EJB_PROJECT=CreateEJBProjectTask
-TASK_DESC_CREATE_EJB_PROJECT=Create an EJB Project.
-MSG_ERROR_CANNOT_CREATE_EJB_PROJECT=IWAB0432E Unable to create EJB project.
-MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT=IWAB0026E Unable to create application client project {0}.
-MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT=IWAB0027E Unable to create Java project {0}.
-MSG_ERROR_CANNOT_CREATE_EAR_PROJECT=IWAB0062E Unable to create EAR project {0}.
-
-#
-# WebServiceMappingPage Messages
-#
-
-#
-# Validator task descriptions
-#
-TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION=Disable validators.
-TASK_DESC_WEBSERVICE_DISABLE_VALIDATION=Temporarily disabling validators.
-TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION=Restore validators.
-TASK_DESC_WEBSERVICE_RESTORE_VALIDATION=Restoring states of validators.
-TASK_LABEL_WEBSERVICE_DISABLE_BUILD=Disable auto build.
-TASK_DESC_WEBSERVICE_DISABLE_BUILD=Temporarily disabling auto build.
-TASK_LABEL_WEBSERVICE_RESTORE_BUILD=Restore auto build.
-TASK_DESC_WEBSERVICE_RESTORE_BUILD=Restoring state of auto build.
-TASK_LABEL_WEBSERVICE_BUILD_PROJECT=Build project.
-TASK_DESC_WEBSERVICE_BUILD_PROJECT=Building project.
-
-#
-# MISC
-#
-TASK_DESC_CREATE_WEB_PROJECT=Create Web Project
-TASK_LABEL_CREATE_WEB_PROJECT=Create Web Project
-MSG_ERROR_WEB_PROJECT_CREATE=IWAB0310E An error occurred during creation of the Web Project.
-MSG_ERROR_SERVER_VIEW_OPEN=IWAB0126E The server configuration editor is open for {0}. Close it and restart the wizard.
-
-#
-# Default Proxy project messages
-#
-
-
-#
-# DetectNonJavaCharsCommand
-#
-MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE=IWAB0129W Java method {0} in class {1} starts with an upper case letter. Method names should begin with lower case letters.
-MSG_WARN_METHOD_NAME_INVALID=IWAB0131W Java method {0} name contains underscore or numeric digits followed by a lower case letter.\
-Method names should not contain lower case letters after a numeric or underscore.
-MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS=IWAB0132W Boolean property accessor {0} in bean {1} begins with "get". Boolean getter methods should begin wth "is".
-MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE=IWAB0133W The package name {0} of class {1} includes upper case letters. Package names should consist of lower case letters only.
-
-#
-# JavaToModelCommand
-#
-LABEL_OK=OK
-DESCRIPTION_OK=Select OK to continue
-
-LABEL_CANCEL=Cancel
-DESCRIPTION_CANCEL=Select Cancel to cancel
-
-#
-# CreateMonitorCommand
-#
-MSG_ERROR_UNABLE_TO_START_MONITOR=IWAB0001E Unable to monitor port {0} of {1}.
-MSG_INFO_MONITORING_NOT_SUPPORTED=IWAB0002I {0} does not support port monitoring.
-
-#
-# CopyWSDLCommand
-#
-COMMAND_LABEL_COPY_WSDL=Copying WSDL
-COMMAND_DESC_COPY_WSDL=Copying WSDL into the workspace for Web service deployment
-MSG_ERROR_COPY_WSDL=IWAB0028E Failed to copy WSDL {0} to {1}
-
-#
-# AssociateModuleWithEARCommand
-#
-MSG_ERROR_UNABLE_TO_ASSOCIATE=Unable to associate component {0} to ear component {1}.
-
-#
-# CreateModuleCommand
-#
-MSG_ERROR_CREATE_FLEX_PROJET=An error occured during creation of flexible project {0}.
-MSG_ERROR_CREATE_WEB_COMPONENT=An error occured during creation of Web component {0}.
-MSG_ERROR_CREATE_EJB_COMPONENT=An error occured during creation of EJB component {0}.
-MSG_ERROR_CREATE_APPCLIENT_COMPONENT=An error occured during creation of Application Client component {0}.
-MSG_ERROR_CREATE_EAR_COMPONENT=An error occured during creation of EAR component {0}.
-MSG_ERROR_COMPONENT_CREATION=Unable to create project {0} and/or component {1}.
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
deleted file mode 100644
index 45687af..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Generator.java
+++ /dev/null
@@ -1,236 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-/**
-* Objects of this class represent a generator.
-* */
-public class Generator implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * The StringBuffer that holds the codegen
- * */
- protected StringBuffer fbuffer;
-
- /**
- * The Visitor that calls the visit method
- * */
- protected Visitor fVisitor;
-
- /**
- * Vector that holds state data for this generator
- * */
- protected Vector fResidentVector;
-
- /*
- * This int holds the current number
- */
- protected int fUniqueNumber =0;
-
-
- protected String fClientFolderPath;
-
- public static final String FACTORY = "Factory";
-
- public static final String TAB = " ";
- public static final String DOUBLE_TAB = " ";
- public static final String SPACE = " ";
-
- /**
- * Constructor.
- *
- */
- public Generator ()
- {
- fbuffer = new StringBuffer();
- fResidentVector = new Vector();
-
- }
-
- /**
- * Constructor.
- * @param StringBuffer Takes the buffer it will write code to
- */
- public Generator (StringBuffer buffer)
- {
- fbuffer = buffer;
- fResidentVector = new Vector();
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
- public String getClientFolderPath()
- {
- return fClientFolderPath;
- }
-
- public void setClientFolderPath(String fClientFolderPath_)
- {
- fClientFolderPath = fClientFolderPath_;
- }
-
- protected String serviceName = "";
- protected String portName = "";
- protected String packageName = "";
- protected String proxyBaseName = "";
-
- public void setInfo(String service, String port, String packageName, String proxyBase)
- {
- serviceName = service;
- portName = port;
- this.packageName = packageName;
- proxyBaseName = proxyBase;
- }
-
- private static final char[] BAD_SYMBOLS = {'-', ' '}; // symbols that can appear in the folder name but it is not allowed in a java bean name
- private static final char UNDERSCORE = '_'; // replace the above ones by underscore
- public String getSessionBeanId()
- {
- String name = getClientFolderPath();
- int index = name.lastIndexOf("/");
- index++;
- String newName = name.substring(index);
- for ( int i = 0; i < BAD_SYMBOLS.length; i++ ) {
- newName = newName.replace ( BAD_SYMBOLS[i], UNDERSCORE );
- }
- return newName+ "id";
- }
-
- /*
- * The Number Factory is here for naming purposes. In
- * this way we insure no names we create in a piece of
- * code gen are the same. We keep track of the numbers
- * used and we hand back the next one. Like take a number
- * buddy
- * @param int number we are at as the state data has to be settable
- */
- public void setNumberFactory(int number)
- {
- fUniqueNumber = number;
- }
-
-
- /*
- * This is a unique number for state purposes
- * @return int
- */
- public int getNumberFactory()
- {
- return fUniqueNumber;
- }
- /*
- * This is a unique number for naming purposes
- * @return int
- */
- public int getUniqueNumber()
- {
- return fUniqueNumber++;
- }
-
-
- /**
- * returns the current StringBuffer
- * @return StringBuffer Takes the buffer it will write code too
- */
- public StringBuffer getStringBuffer ()
- {
- return fbuffer;
- }
-
-
- /**
- * returns the Visitor that called this generator
- * @return Visitor
- */
- public Visitor getVisitor ()
- {
- return fVisitor;
- }
-
-
-
-
- /**
- * vector used to hold state data
- * @parameter Visitor
- */
- public void putResidentVector (Object object)
- {
- fResidentVector.addElement(object);
- }
-
-
- /**
- * vector used to hold state data
- * @parameter Visitor
- */
- public void setResidentVector (Vector vector)
- {
- fResidentVector = vector;
- }
-
-
- /**
- * returns the resident vector
- * @return Visitor
- */
- public Vector getResidentVector ()
- {
- return fResidentVector;
- }
-
-
- /**
- * This function is used to initialize any state a generator may have
- *
- **/
-
- public void initialize()
- {
- //to be implemented in sublasses
- }
-
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
-
- public Status visit (Object object)
- {
- //implemented by subclasses
- return new SimpleStatus("");
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
deleted file mode 100644
index 6bfb556..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/RelVisitor.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Rel;
-
-
-/**
-* Objects of this class represent a visitor.
-* This vistor will visit elements in a model given a
-* particular rel
-* */
-public class RelVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private int fElementCounter;
- private int fTotalElements;
- private String frelName;
-
- /**
- * Constructor.
- *
- */
-
- public RelVisitor (String relName)
- {
- frelName = relName;
- }
-
- public int getTotalElementsToVisit()
- {
- return fTotalElements;
- }
-
- public boolean isLastElement()
- {
- if(getTotalElementsToVisit() - presentElement() == 0) return true;
- return false;
- }
-
- public int presentElement()
- {
- return fElementCounter;
- }
-
- public void initialize(VisitorAction va)
- {
- //implemented by subclasses
- }
- public Status run (Object sourceElement,VisitorAction vAction)
- {
- Status status = new SimpleStatus("");
- initialize(vAction);
-
- vAction.setVisitor(this);
- Rel rel = ((BasicElement)sourceElement).getRel(frelName);
- //set some state data
- fTotalElements = rel.getNumberOfTargetElements();
- fElementCounter = 0;
-
- Enumeration e = rel.getTargetElements();
- while (e.hasMoreElements()){
- BasicElement targetElement = (BasicElement)e.nextElement();
- fElementCounter++;
- initialize(vAction);
- status = vAction.visit(targetElement);
- }
- return status;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
deleted file mode 100644
index 3739460..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/Visitor.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public interface Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public Status run (Object object, VisitorAction vAction);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
deleted file mode 100644
index 47b72dc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/VisitorAction.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* The visitor walks the model and the VisitorAction
-* does the action
-* */
-public interface VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public Status visit (Object object);
- public void setVisitor(Visitor visitor);
- public void initialize(String residentString);
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
deleted file mode 100644
index 30ffda6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/AttributeVisitor.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class AttributeVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String fResidentString;
- private Vector fResidentVector1;
- private Vector fResidentVector2;
-
- /**
- * Constructor.
- *
- */
-
- public AttributeVisitor ()
- {
- super(TypeElement.REL_ATTRIBUTES);
- fResidentString = "";
- }
-
- public AttributeVisitor (String rel)
- {
- super(rel);
- fResidentString = "";
- }
-
- public void setResidentString(String resident)
- {
- fResidentString = resident;
- }
-
- public void setResidentVector1(Vector resident)
- {
- fResidentVector1 = resident;
- }
-
- public void setResidentVector2(Vector resident)
- {
- fResidentVector2 = resident;
- }
-
-
- public void initialize(VisitorAction vAction)
- {
- //hack for 197726
-
- if(vAction instanceof InputFileAttributeGenerator){
- if(fResidentVector1 == null) fResidentVector1=new Vector();
- if(fResidentVector2 == null) fResidentVector2=new Vector();
- ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
- }
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
deleted file mode 100644
index d6db38b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/FieldVisitor.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.codegen.InputFileAttributeGenerator;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class FieldVisitor extends AttributeVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String fResidentString;
- private Vector fResidentVector1;
- private Vector fResidentVector2;
-
- /**
- * Constructor.
- *
- */
-
- public FieldVisitor ()
- {
- super(TypeElement.REL_FIELDS);
- fResidentString = "";
- }
-
- public void setResidentString(String resident)
- {
- fResidentString = resident;
- }
-
- public void setResidentVector1(Vector resident)
- {
- fResidentVector1 = resident;
- }
-
- public void setResidentVector2(Vector resident)
- {
- fResidentVector2 = resident;
- }
-
-
- public void initialize(VisitorAction vAction)
- {
- //hack for 197726
-
- if(vAction instanceof InputFileAttributeGenerator){
- if(fResidentVector1 == null) fResidentVector1=new Vector();
- if(fResidentVector2 == null) fResidentVector2=new Vector();
- ((InputFileAttributeGenerator)vAction).setParentGetters(fResidentVector1,fResidentVector2);
- }
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
deleted file mode 100644
index 3466462..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/MethodVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class MethodVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public MethodVisitor ()
- {
- super(BeanElement.REL_METHODS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
deleted file mode 100644
index 0749312..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ParameterVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public ParameterVisitor ()
- {
- super(MethodElement.REL_PARAMETERS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
deleted file mode 100644
index 1f62070..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/ReturnParameterVisitor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class ReturnParameterVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public ReturnParameterVisitor ()
- {
- super(MethodElement.REL_RETURN_PARAMETERS);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
deleted file mode 100644
index d254615..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/bean/TypeVisitor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.bean;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class TypeVisitor extends RelVisitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
-
- public TypeVisitor ()
- {
- super(TypeElement.REL_TYPE);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
deleted file mode 100644
index d5965e3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsBeanVisitorAction.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsBeanVisitorAction extends VisitorActionImpl
-{
- private static char UNDERSCORE = '_';
- private boolean serviceBean = false;
-
- public DetectNonJavaCharsBeanVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- // if first bean fisited that means it is the Service bean
- if ( beans == null )
- serviceBean = true;
- }
-
- /**
- * The visit will create the bean
- * Walk the methods
- * @param JavaClass the class to be used to create the bean model
- **/
- public Status visit (Object javaclass)
- {
- JavaClass javaClass = (JavaClass)javaclass;
- String packageName = javaClass.getJavaPackage().getPackageName();
- String beanName = javaClass.getName();
-
- if (!isBeanVisited(javaClass)) {
- addVisitedBean(javaClass);
- // check the bean name
- checkBeanName(beanName);
- checkPackageName(packageName, beanName);
- DetectNonJavaCharsMethodVisitorAction methodVisitorAction = new DetectNonJavaCharsMethodVisitorAction(getMessages(), getBeansVisited());
- JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
- methodVisitor.run(javaClass,methodVisitorAction);
- }
-
- return new SimpleStatus("");
- }
-
- private void checkBeanName(String beanName)
- {
-
- // check if the bean starts with a lower case
- if ( Character.isLowerCase(beanName.charAt(0)))
- addMessage("WARN_BEAN_NAME_STARTS_WITH_LOWER_CASE", new String[]{beanName});
-
-
- //check if the name has an underscore, then next letter should be upper case
- int underScoreIndex = beanName.indexOf(UNDERSCORE);
- String tempName = beanName;
- while(underScoreIndex !=-1) {
- tempName = tempName.substring(underScoreIndex+1);
- if ( Character.isLowerCase(tempName.charAt(0))) {
- addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[] { beanName });
- break;
- }
- else
- underScoreIndex = tempName.indexOf(UNDERSCORE);
- }
- }
-
- private void checkPackageName(String packageName, String beanName)
- {
- if (!packageName.equals(packageName.toLowerCase()))
- addMessage("MSG_WARN_PACKAGE_NAME_HAS_UPPER_CASE", new String[] { packageName, beanName });
- }
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
deleted file mode 100644
index 49dd60d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsMethodVisitorAction.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsMethodVisitorAction extends VisitorActionImpl
-{
- private static char UNDERSCORE = '_';
- private boolean serviceBean = false;
-
- public DetectNonJavaCharsMethodVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- if ( beans.size() == 1)
- serviceBean = true;
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public Status visit (Object imethod)
- {
-
- Method method = (Method)imethod;
- String className = method.getContainingJavaClass().getName();
- String name = method.getName();
-
- if ( serviceBean && !method.isConstructor() )
- checkUpperCase(name, className);
-
- // for service bean or any referenced bean property accessors
- if ( serviceBean || name.startsWith("get") || name.startsWith("set") || name.startsWith("is"))
- {
- checkUnderScore(name, className);
- checkNumericDigits(name, className);
- checkBooleanProperties(method, className);
-
- DetectNonJavaCharsParameterVisitorAction parameterVisitorAction = new DetectNonJavaCharsParameterVisitorAction(getMessages(), getBeansVisited());
- // rsk Passing in null for the environment. DetectNonJavaCharsParameterVisitorAction always returns an OK status.
- JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(null);
- parameterVisitor.run(method, parameterVisitorAction);
- }
-
- return new SimpleStatus("");
- }
-
- private void checkUpperCase(String name, String className)
- {
- // in a service bean check if any method starts with upper case letter
- if ( Character.isUpperCase(name.charAt(0)))
- addMessage("MSG_WARN_JAVA_METHOD_START_WITH_UPPER_CASE", new String[]{name, className});
-
- }
-
- private void checkUnderScore(String name, String className)
- {
- //check if the name has an underscore, then next letter should be upper case
- int underScoreIndex = name.indexOf(UNDERSCORE);
- String tempName = name;
- while(underScoreIndex !=-1) {
- tempName = tempName.substring(underScoreIndex+1);
- if ( Character.isLowerCase(tempName.charAt(0))) {
- addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[]{name, className});
- break;
- }
- else
- underScoreIndex = tempName.indexOf(UNDERSCORE);
- }
- }
-
- private void checkNumericDigits(String name, String className)
- {
- //check if the name has a numeric, then next letter should be upper case
- for ( int i = 0; i < name.length(); i++)
- {
- if ( Character.isDigit(name.charAt(i)))
- {
- if (Character.isLowerCase(name.charAt(i+1))) {
- addMessage("MSG_WARN_METHOD_NAME_INVALID", new String[]{name, className});
- break;
- }
- }
- }
- }
- private void checkBooleanProperties(Method method, String className)
- {
- if (!serviceBean && method.getName().startsWith("get") &&
- (method.getReturnType().getName().equals("boolean") ||
- method.getReturnType().getName().equals("java.lang.Boolean")))
- addMessage("MSG_WARN_BOOLEAN_PROPERTY_ACCESSORS", new String[]{method.getName(), className});
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
deleted file mode 100644
index 92f3c60..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/DetectNonJavaCharsParameterVisitorAction.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.ArrayType;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class DetectNonJavaCharsParameterVisitorAction extends VisitorActionImpl
-{
-
- public DetectNonJavaCharsParameterVisitorAction ( Vector messages, Vector beans)
- {
- super (messages, beans);
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public Status visit (Object ijavaParameter)
- {
-
- JavaParameter javaParameter = (JavaParameter) ijavaParameter;
- JavaClass javaClass = null;
- if ( javaParameter.getJavaType() instanceof JavaClass)
- {
- javaClass = (JavaClass) javaParameter.getJavaType();
- if (javaClass.isArray())
- {
- JavaHelpers componentType = ((ArrayType)javaClass).getComponentTypeAsHelper();
- if (componentType instanceof JavaClass)
- {
- javaClass = (JavaClass)componentType;
- }
- else
- {
- javaClass = null; //The array contains primitive types, there is no need for further checking.
- }
- }
- }
- if (toBeVisited(javaClass)) {
- DetectNonJavaCharsBeanVisitorAction beanVisitorAction = new DetectNonJavaCharsBeanVisitorAction(getMessages(), getBeansVisited());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- beanVisitor.run(javaClass,beanVisitorAction);
- }
-
- return new SimpleStatus("");
- }
-
-
- private boolean toBeVisited (JavaClass javaClass)
- {
- //check for recognized types
- if( javaClass == null ||
- javaClass.isPrimitive() ||
- javaClass.getJavaName().startsWith("javax") ||
- TypeFactory.recognizedBean(javaClass.getJavaName()))
- return false;
- else
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
deleted file mode 100644
index fda6836..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofAttributeVisitorAction.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofAttributeVisitorAction extends JavaMofBeanVisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
- /*
- *Constructor
- **/
- public JavaMofAttributeVisitorAction(Element parentElement, String project, Environment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaParameter the mof element to be used to create the attribute
- **/
-
-
- //bean info code
-
-
- public Status visit (Object propertyDecorator)
- {
- Status status = new SimpleStatus("");
-
- //PropertyDecorator pd = (PropertyDecorator)propertyDecorator;
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)propertyDecorator;
-
-
- try{
- //if the type of this attribute is unsupported dont make an Attribute
- if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)pd.getPropertyType()))
- && (TypeFactory.isUnSupportedType((JavaHelpers)pd.getPropertyType()))){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName(), Status.WARNING );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)pd.getPropertyType()).getJavaName(),null));
- return status;
- }
-
- Method setMethod = pd.getWriteMethod();
- Method getMethod = pd.getReadMethod();
- if(setMethod != null){
- if(setMethod.isStatic()){
- setMethod=null;
- }
- }
- if(getMethod != null){
- if(getMethod.isStatic()){
- getMethod=null;
- }
- }
- if(pd.isfStatic()){
- return status;
- }
-
- AttributeElement attributeElement = (AttributeElement)BeanModelElementsFactory.getBeanModelElement(propertyDecorator,fParentElement);
-
- if(attributeElement != null){
-
- //lets check and see if the getter takes input params
- //if so throw an error
- //now the inputs
- if(getMethod != null){
- JavaParameter javaParameter[] = getMethod.listParametersWithoutReturn();
- if(javaParameter.length > 0){
- if(getReturnParam()) return status;
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES") + getMethod.getName(), Status.WARNING );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_INDEXED_PROPERTIES" ) + getMethod.getName(),null));
- return status;
- }
- }
- if(setMethod != null) attributeElement.setSetterMethod(setMethod.getMethodElementSignature());
- if(getMethod != null) attributeElement.setGetterMethod(getMethod.getMethodElementSignature());
-
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(attributeElement,clientProject, env_);
- typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setBeansCreated(getBeansCreated());
- typeVisitorAction.setReturnParam(getReturnParam());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(pd,typeVisitorAction);
-
- }
-
- return status;
- }catch(Exception e)
- {
- env_.getLog().log(Log.WARNING, 5054, this, "visit", e);
- status = new SimpleStatus("JavaMofAttributeVisitorAction", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.WARNING, e);
- try {
- env_.getStatusHandler().report(status);
- } catch (StatusException e1) {
- status = new SimpleStatus("JavaMofAttributeVisitorAction", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.ERROR);
- }
- return status;
- }
- //env.Log.write(this,"visit",Log.OK,e);}
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
deleted file mode 100644
index f125a98..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofBeanVisitorAction.java
+++ /dev/null
@@ -1,436 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.command.NullStatusMonitor;
-import org.eclipse.jst.ws.internal.command.StatusMonitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofAttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofFieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofMethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofBeanVisitorAction implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private MessageUtils msgUtils_;
- protected Environment env_;
- // protected BeanElement fBeanElement;
-
- protected Visitor fVisitor;
-
- /*
- * The project that defines the context
- **/
- protected String clientProject;
-
- /*
- * The Status monitor
- **/
- protected StatusMonitor monitor_;
-
- /*
- * The model that will be created
- **/
- protected Model fModel;
-
- /*
- * This is the parent element used when creating a
- * new element
- */
- protected Element fParentElement;
-
- /*
- * Methods processed from proxy
- */
- protected Vector fBeansCreated;
-
- private BooleanSelection[] fMethodsSelected;
-
- /*
- * this boolean tells wether the bean is a return parameter or an input parameter
- * usually this should be set around the parametervisitoraction, and passed on from there
- */
- protected boolean fReturnParam=false;
-
- public JavaMofBeanVisitorAction(String clientProject,BooleanSelection[] methods, Environment env)
- {
- this.clientProject = clientProject;
- fMethodsSelected = methods;
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- env_ = env;
- }
-
-
-
- /*
- *Constructor
- * @param Model model is the Model that this bean will be placed in
- * @param IProject used in nature
- **/
- public JavaMofBeanVisitorAction(Model model, String clientProject, Environment env)
- {
- this.clientProject = clientProject;
- fModel = model;
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- env_ = env;
- }
-
- /*
- *Constructor
- * @param Element the parent element that this element will be added too
- * @param IProject used in nature
- **/
- public JavaMofBeanVisitorAction(Element parentElement, String clientProject, Environment env )
- {
- fParentElement = parentElement;
- this.clientProject = clientProject;
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- env_ = env;
- }
-
- /**
- * The visit will create the bean
- * Walk the methods
- * @param JavaClass the class to be used to create the bean model
- **/
- public Status visit (Object javaclass)
- {
- Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
- Status status = new SimpleStatus("");
- JavaClass javaClass = (JavaClass)javaclass;
-
-
- BeanElement beanElement = (BeanElement)BeanModelElementsFactory.getBeanModelElement(javaClass,fParentElement,fModel);
- if(beanElement.isOwnerParameter()) {
- resetBeansCreated();
- }
- fModel = beanElement.getModel();
-
- //this for the subsequent beans that represent types
- //first do the attributes
- //if we are not on the root
- if (!(beanElement == fModel.getRootElement())){
- Enumeration e = getBeansCreated().elements();
- while(e.hasMoreElements()){
- String name = (String)e.nextElement();
- if(name.equals(javaClass.getName())){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_JTS_CYCLIC_BEAN"), Status.WARNING);
- //getStatusMonitor().reportStatus(new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_CYCLIC_BEAN" ),null));
- return status;
- }
- }
-
- JavaMofAttributeVisitorAction attributeVisitorAction = new JavaMofAttributeVisitorAction(beanElement,clientProject, env_);
- //attributeVisitorAction.setStatusMonitor(getStatusMonitor());
- Vector childVector = ((Vector)getBeansCreated().clone());
- childVector.addElement(javaClass.getName());
- attributeVisitorAction.setBeansCreated(childVector);
- attributeVisitorAction.setReturnParam(getReturnParam());
- JavaMofAttributeVisitor attributeVisitor = new JavaMofAttributeVisitor();
- attributeVisitor.setReturnParameter(getReturnParam());
- attributeVisitor.setProject(getProject());
- attributeVisitor.setEnvironment(env_);
- status = attributeVisitor.run(javaClass,attributeVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
-
- JavaMofFieldVisitorAction fieldVisitorAction = new JavaMofFieldVisitorAction(beanElement,clientProject, env_);
- //fieldVisitorAction.setStatusMonitor(getStatusMonitor());
- Vector childVector2 = ((Vector)getBeansCreated().clone());
- childVector2.addElement(javaClass.getName());
- fieldVisitorAction.setBeansCreated(childVector2);
- fieldVisitorAction.setReturnParam(getReturnParam());
- JavaMofFieldVisitor fieldVisitor = new JavaMofFieldVisitor();
- fieldVisitor.setProject(getProject());
- status = fieldVisitor.run(javaClass,fieldVisitorAction);
- //
- severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
-
- }
-
- //this is to insure we are on the proxy
- //now do the methods
- if (beanElement == fModel.getRootElement()){
- //first lets make sure the proxy is in good form
- //-it has a default constructor
- //-it has at least one method
- //otherwise return the problem in the form of a status
-
- if (!proxyCheck(javaClass, status)) return status;
- JavaMofMethodVisitorAction methodVisitorAction = new JavaMofMethodVisitorAction(beanElement,clientProject, env_);
-
- //methodVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofMethodVisitor methodVisitor = new JavaMofMethodVisitor();
- methodVisitor.setMethodSelection(fMethodsSelected);
- status = methodVisitor.run(javaClass,methodVisitorAction);
-
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- //This is where we check for several things:
- //-if no methods were processed because of unsupported types then we send back that result
- //-if there were any methods omitted we should warn them
-
- //first no methods
- if (!methodVisitorAction.wereMethodsProcessed()){
- //this has to be done to insure the dialog is an error
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED"), Status.ERROR);
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_NO_PROXY_METHODS_PROCESSED" ),null));
- }
- //now methods omitted
- else if(methodVisitorAction.wereMethodsOmitted()){
- //The dialog is already a warning so we just need to set the overall message
- status = new SimpleStatus("",msgUtils_.getMessage("MSG_WARN_JTS_PROXY_METHODS_OMITTED"), Status.WARNING);
- return status;
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_PROXY_METHODS_OMITTED" ),null));
- }
- }
- return status;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
-
- /*
- * Return the model that was created
- * @return Model the bean model that was created
- */
- public Model getModel()
- {
- return fModel;
- }
-
- /*
- * The proxy check insures there is a default constructor and
- * at Least one method
- * @param JavaClass javaClass is used to traverse the methods on the proxy
- */
- public boolean proxyCheck(JavaClass javaClass, Status status)
- {
- // first check for a method
- Iterator m=javaClass.getPublicMethods().iterator();
- if (!m.hasNext()){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_METHODS"),Status.ERROR);
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_METHODS" ),null));
- return false;
- }
- //now check for a default constructor
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT"),Status.ERROR);
- //getStatusMonitor().reportStatus( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_ERROR_JTS_PROXY_HAS_NO_DEFAULT" ),null));
- return false;
- }
- }
- }
- return true;
-
- }
-
- /**
- * Sets the status monitor that this action will use to report status that occres while executing the Action.
- */
- public void setStatusMonitor ( StatusMonitor monitor )
- {
- monitor_ = monitor;
- }
-
- /**
- * Returns the status monitor that this task is using to report status.
- */
- public StatusMonitor getStatusMonitor ()
- {
- if (monitor_ == null)
- {
- monitor_ = new NullStatusMonitor();
- }
- return monitor_;
- }
-
-
- /**
- * check if the action has finished sucsessfully
- */
- /*
- public boolean isSuccessful ()
- {
- return getStatusMonitor().canContinue();
- }
- */
- public void resetBeansCreated()
- {
- fBeansCreated = new Vector();
- }
-
- public void setEnvironment(Environment env)
- {
- env_ = env;
- }
-
- /*
- * The command that called this will get the results of the operation in the form
- * of a status.
- */
- public Vector getBeansCreated ()
- {
- if(fBeansCreated == null) fBeansCreated = new Vector();
- return fBeansCreated;
- }
-
- /*
- * The command that called this will get the results of the operation in the form
- * of a status.
- */
- public void setBeansCreated (Vector beansCreated)
- {
- fBeansCreated = beansCreated;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public boolean getReturnParam ()
- {
- return fReturnParam;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public void setReturnParam (boolean returnparam)
- {
- fReturnParam = returnparam;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public String getProject ()
- {
- return clientProject;
- }
-
- /*
- * This boolean tells wether we are dealing with a return param
- */
- public void setProject (String clientProject)
- {
- this.clientProject = clientProject;
- }
-
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
- /*
- * Sets the parent element the child then knows where to
- * add itself to the model
- * @param Element parent element
- */
- public void setParentElement(Element element)
- {
- fParentElement = element;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
deleted file mode 100644
index 634bc6f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofFieldVisitorAction.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.FieldElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a AttributeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofFieldVisitorAction extends JavaMofBeanVisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
-
- /*
- *Constructor
- **/
- public JavaMofFieldVisitorAction(Element parentElement, String project, Environment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaParameter the mof element to be used to create the attribute
- **/
-
-
- //bean info code
-
-
- public Status visit (Object field_)
- {
- Status status = new SimpleStatus("");
- Field field = (Field)field_;
-
- try{
- //if the type of this attribute is unsupported dont make an Attribute
- if(!(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)field.getJavaClass()))
- && (TypeFactory.isUnSupportedType((JavaHelpers)field.getJavaClass()))){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName(), Status.WARNING );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)field.getJavaClass()).getJavaName(),null));
- return status;
- }
-
-
- FieldElement fieldElement = (FieldElement)BeanModelElementsFactory.getBeanModelElement(field,fParentElement);
-
- if(fieldElement != null){
- //lets check and see if the getter takes input params
- //if so throw an error
- //now the inputs
-
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(fieldElement,clientProject, env_);
- typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setBeansCreated(getBeansCreated());
- typeVisitorAction.setReturnParam(getReturnParam());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(field,typeVisitorAction);
-
- }
- return status;
-
- }catch(Exception e)
- {
- env_.getLog().log(Log.WARNING, 5055, this, "visit", e);
- status = new SimpleStatus("JavaMofFieldVisitorAction", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.WARNING, e);
- try {
- env_.getStatusHandler().report(status);
- } catch (StatusException e1) {
- status = new SimpleStatus("JavaMofFieldVisitorAction", //$NON-NLS-1$
- msgUtils_.getMessage("MSG_ERROR_JTS_JSP_GEN"), Status.ERROR);
- }
- return status;
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
deleted file mode 100644
index 96fbe5f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofMethodVisitorAction.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Iterator;
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a BeanElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk the methods in the JavaClass
-* */
-public class JavaMofMethodVisitorAction extends JavaMofBeanVisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private MessageUtils msgUtils_;
- public String fUnsupportedParameterName;
-
- /*
- * Methods omitted from the proxy
- */
- protected Vector fMethodsOmitted;
-
- /*
- * Methods processed from proxy
- */
- protected Vector fMethodsProcessed;
-
-
- /*
- *Constructor
- **/
- public JavaMofMethodVisitorAction(Element parentElement,String project, Environment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- fMethodsOmitted = new Vector();
- fMethodsProcessed = new Vector();
-
- }
-
- /**
- * Create a method element from the method
- * @param Method the class to be used to create the method
- **/
- public Status visit (Object imethod)
- {
- Status status = new SimpleStatus("");
- Method method = (Method)imethod;
-
- if (methodCheck(method)){
- //this is to check immediate input and return parameters
- //if there is an unsupported type in these we can react immediately
- //we add it to the omitted methods an go to the next one
- if(!parameterCheck(method)){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS") + fUnsupportedParameterName, Status.WARNING );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_ARRAYS" ) + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
- }
- if(!nullConstructor(method)){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS") + fUnsupportedParameterName, Status.WARNING );
- //getStatusMonitor().reportStatus (new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- // WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_PARAMETERS_INPUTS" ) + fUnsupportedParameterName,null));
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- return status;
-
- }
-
- //carry on all parameters supported
- MethodElement methodElement = (MethodElement)BeanModelElementsFactory.getBeanModelElement(method,fParentElement);
- JavaMofParameterVisitorAction parameterVisitorAction = new JavaMofParameterVisitorAction(methodElement,clientProject,env_);
- parameterVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofParameterVisitor parameterVisitor = new JavaMofParameterVisitor(env_);
- status = parameterVisitor.run(method,parameterVisitorAction);
- //something may have gone wrong with an internal type
- if (status.getSeverity()!=Status.OK){
- //This method has to be omitted
- fMethodsOmitted.addElement(method.getMethodElementSignature());
- methodElement.setMethodOmmission(true);
- }
- else {
- fMethodsProcessed.addElement(method.getMethodElementSignature());
- }
- }
-
- return status;
- }
-
- /*
- * Tells wether any methods were processed
- * @return boolean true if any methods were processed
- */
- public boolean wereMethodsProcessed()
- {
- if(fMethodsProcessed.isEmpty()) return false;
- return true;
- }
-
- /*
- * Tells wether there were methods omitted because of unsupported types
- * @return boolean true if methods were omitted
- */
- public boolean wereMethodsOmitted()
- {
- if(fMethodsOmitted.isEmpty()) return false;
- return true;
- }
-
- /**
- * There may be methods that we dont support
- * and dont want in the model
- * @param boolean true if all parameters are fine
- **/
- public boolean methodCheck(Method method)
- {
- boolean ok = true;
- // if we have a constructor we return false
- if (method.isConstructor()) return false;
-
-
- return ok;
- }
-
- /**
- * There may be parameters of this method that have types
- * not yet supported return false if we find any
- * @param boolean true if all parameters are fine
- **/
- public boolean parameterCheck(Method method)
- {
-
- boolean ok = true;
-
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- boolean paramSupported = true;
- for (int i = 0;i<javaParameter.length;i++) {
- JavaParameter param=javaParameter[i];
- JavaHelpers javaHelper1 = param.getJavaType();
- if(TypeFactory.isUnSupportedType(javaHelper1)) {
- fUnsupportedParameterName = param.getName();
- return false;
- }
- }
- return ok;
- }
-
-
- /**
- * There may be parameters of this method that have types
- * not yet supported return false if we find any
- * @param boolean true if all parameters are fine
- **/
- public boolean nullConstructor(Method method)
- {
-
- boolean ok = true;
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- boolean paramSupported = true;
- for (int i = 0;i<javaParameter.length;i++) {
- JavaParameter param=javaParameter[i];
- JavaHelpers javaHelper1 = param.getJavaType();
- if(javaHelper1 instanceof JavaClass){
- JavaClass javaClass = (JavaClass)javaHelper1;
- if(TypeFactory.recognizedBean(javaClass.getJavaName()))return true;
- Iterator m=javaClass.getMethods().iterator();
- while (m.hasNext()) {
- Method method2=(Method)m.next();
- if (javaClass.getName().equals(method2.getName())){
- //now the inputs
- JavaParameter javaParam[] = method2.listParametersWithoutReturn();
- if (javaParam.length > 0){
- //then we have no default constructor
- fUnsupportedParameterName = param.getName();
- ok = false;
- }
- else return true;
- }
- }
- }
- }
- return ok;
- }
-
-
-
-
-
-
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
deleted file mode 100644
index d8926f3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofParameterVisitorAction.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofTypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a parameterElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk to its type
-* */
-public class JavaMofParameterVisitorAction extends JavaMofBeanVisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
- /*
- *Constructor
- **/
- public JavaMofParameterVisitorAction(Element parentElement,String project, Environment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Create a parameter element from the method
- * @param JavaParameter the mof element to be used to create the Parameter
- **/
- public Status visit (Object ijavaParameter)
- {
- Status status = new SimpleStatus("");
- Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
-
- ParameterElement parameterElement = (ParameterElement)BeanModelElementsFactory.getBeanModelElement(ijavaParameter,fParentElement);
- JavaMofTypeVisitorAction typeVisitorAction = new JavaMofTypeVisitorAction(parameterElement,clientProject, env_);
- //typeVisitorAction.setStatusMonitor(getStatusMonitor());
- typeVisitorAction.setReturnParam(parameterElement.isReturn());
- JavaMofTypeVisitor typeVisitor = new JavaMofTypeVisitor(env_);
- typeVisitor.setClientProject(getProject());
- status = typeVisitor.run(ijavaParameter,typeVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
deleted file mode 100644
index 83e77a6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/JavaMofTypeVisitorAction.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanModelElementsFactory;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-
-
-/**
-* Objects of this class represent a JavaMofBeanVisitorAction.
-* This VisitorAction will create a TypeElement using the
-* JavaClass and the BeanModelElementsFactory
-* It will also automatically walk a complex type
-* */
-public class JavaMofTypeVisitorAction extends JavaMofBeanVisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
-
- /*
- *Constructor
- **/
- public JavaMofTypeVisitorAction(Element parentElement,String project, Environment env)
- {
- super(parentElement,project, env);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- /**
- * Create a type element from the JavaHelper
- * @param JavaHelper the mof element to be used to create the Type
- **/
- public Status visit (Object typeNavigator)
- {
- Status status = new SimpleStatus("");
- Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
-
- //if bean
- JavaClass javaClass = null;
- if(typeNavigator instanceof JavaClass){
- javaClass = (JavaClass)typeNavigator;
- }
-
-
- /* If we are dealing with a return parameter then we need to treat this differently then if it is an input
- * parameter.
- * We need to first see if it is a special case for return types if not we treat it the same as everything
- * else.
- */
- if(getReturnParam() && TypeFactory.isRecognizedReturnType((JavaHelpers)typeNavigator)){
- TypeElement typeElement = (TypeElement)BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- }
- else{
- if(TypeFactory.isUnSupportedType((JavaHelpers)typeNavigator)){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_WARN_JTS_UNSUPPORTED_TYPE") + ((JavaHelpers)typeNavigator).getJavaName(), Status.WARNING );
- //getStatusMonitor().reportStatus( new Status(IStatus.WARNING,WebServiceConsumptionPlugin.ID,0,
- //WebServiceConsumptionPlugin.getMessage( "%MSG_WARN_JTS_UNSUPPORTED_TYPE" ) + ((JavaHelpers)typeNavigator).getJavaName(),null));
- return status;
- }
-
- //if javaclass is null then we have a simple type
- if((javaClass == null) || TypeFactory.recognizedBean(javaClass.getJavaName())){
- TypeElement typeElement = (TypeElement)BeanModelElementsFactory.getBeanModelElement(typeNavigator,fParentElement);
- }
- else{
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(fParentElement,clientProject, env_);
- beanVisitorAction.setStatusMonitor(getStatusMonitor());
- beanVisitorAction.setBeansCreated(getBeansCreated());
- beanVisitorAction.setReturnParam(getReturnParam());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- }
- }
-
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
deleted file mode 100644
index 12e00d3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitoractions/VisitorActionImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions;
-
-import java.util.Vector;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-
-
-
-/**
-* Objects of this class represent a VisitorAction.
-* It will automatically walk the methods in the JavaClass
-* */
-public abstract class VisitorActionImpl implements VisitorAction
-{
-
- private Visitor fVisitor = null;
- private Vector beansVisited = null;
- private Vector messages = null;
- private MessageUtils msgUtils_;
-
- public VisitorActionImpl( Vector messages, Vector beansVisited)
- {
- this.messages = messages;
- this.beansVisited = beansVisited;
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
- /**
- * Returns the vector of all messages found
- */
- public Vector getMessages ()
- {
- if (messages == null)
- messages = new Vector();
- return messages;
- }
-
- public Vector getBeansVisited()
- {
- if ( beansVisited == null)
- beansVisited = new Vector();
- return beansVisited;
- }
-
- public void addVisitedBean( JavaClass bean)
- {
- if ( beansVisited == null)
- beansVisited = new Vector();
- beansVisited.add(bean);
- }
-
- public boolean isBeanVisited (JavaClass bean)
- {
- return (beansVisited != null && beansVisited.contains(bean));
- }
-
- /**
- * sets the visitor that calls the visit
- * @parameter Visitor
- */
-
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
- protected void addMessage ( String key )
- {
- getMessages().add(msgUtils_.getMessage(key));
- }
-
- protected void addMessage ( String key, Object[] args )
- {
- getMessages().add(msgUtils_.getMessage(key,args));
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
deleted file mode 100644
index 1f0ca5c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofAttributeVisitor.java
+++ /dev/null
@@ -1,241 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Iterator;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofAttributeVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String clientProject;
- private boolean returnParameter;
- private Environment env;
-
-
- public void setEnvironment(Environment env)
- {
- this.env = env;
- }
-
- /*
- * Use this to reflect
- */
- public void setProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getProject()
- {
- return clientProject;
- }
-
- public void setReturnParameter(boolean returnParameter)
- {
- this.returnParameter = returnParameter;
- }
-
-
- /*
- * Get the attribute belonging to this complex type
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public Status run ( Object javaclass, VisitorAction vAction)
- {
- Status status = new SimpleStatus("");
- JavaClass javaClass = (JavaClass)javaclass;
-
- Hashtable spdMap = new Hashtable();
- for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
- Method method=(Method)m.next();
- if (((method.getMethodElementSignature().startsWith("get")
- || method.getMethodElementSignature().startsWith("is"))
- && method.listParametersWithoutReturn().length == 0 )
- || (method.getMethodElementSignature().startsWith("set")
- && method.listParametersWithoutReturn().length > 0)) {
- int sub = 3;
- if(method.getMethodElementSignature().startsWith("is"))
- sub = 2;
- String propertyName = method.getMethodElementSignature().substring(sub);
- String lower = propertyName.substring(0,1).toLowerCase();
- String remainder = propertyName.substring(1);
- propertyName = lower + remainder;
- int index = propertyName.lastIndexOf("(");
- String temp = propertyName;
- propertyName = temp.substring(0,index);
-
- //find the propertydescriptor
- SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdMap.get(propertyName);
- if(spd == null){
- spd = new SamplePropertyDescriptor(propertyName);
- spdMap.put(propertyName,spd);
- }
- if(method.getMethodElementSignature().startsWith("set"))
- spd.setWriteMethod(method);
- else
- spd.setReadMethod(method);
-
- FieldImpl field = (FieldImpl)javaClass.getFieldNamed(propertyName);
- JavaHelpers propertyType = null;
- if(field != null){
- propertyType = field.getJavaType();
- spd.setfStatic(field.isStatic());
- }
- else{
- if(method.getMethodElementSignature().startsWith("get") || method.getMethodElementSignature().startsWith("is"))
- propertyType = method.getReturnType();
- else{
- JavaParameter params[] = method.listParametersWithoutReturn();
- propertyType = params[0].getJavaType();
- }
- }
-
- spd.setPropertyType(propertyType);
-
- }
- }
- Enumeration spdEnum = spdMap.elements();
- while(spdEnum.hasMoreElements()){
- SamplePropertyDescriptor spd = (SamplePropertyDescriptor)spdEnum.nextElement();
- if(spdCheck(spd))
- status = vAction.visit(spd);
- }
-
- return status;
-
- }
-
- private boolean spdCheck(SamplePropertyDescriptor spd)
- {
- //check for indexed properties
- Method writeMethod = spd.getWriteMethod();
- if(writeMethod != null)
- if(writeMethod.listParametersWithoutReturn().length > 1) return false;
-
- if(spd.getPropertyType() == null) return false;
- if(spd.getPropertyType().isPrimitive()) return true;
- if(returnParameter && TypeFactory.isRecognizedReturnType(spd.getPropertyType())) return true;
- if(!returnParameter && TypeFactory.isUnSupportedType(spd.getPropertyType())) return true;
- if(!checkPolarity(spd)) return false;
-
- // so its a bean make sure it has a default constructor
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(getProject());
- javaMofRef.setProxyBean(((JavaHelpers)spd.getPropertyType()).getQualifiedName());
- javaMofRef.execute(env);
- if(javaMofRef.getJavaClass() instanceof JavaClass){
- if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
- return defaultCheck((JavaClass)javaMofRef.getJavaClass());
-
- }
- return true;
-
- }
-
- private boolean checkPolarity(SamplePropertyDescriptor spd){
-
- Method readMethod = spd.getReadMethod();
- Method writeMethod = spd.getWriteMethod();
- if((readMethod == null && writeMethod != null) || (readMethod != null && writeMethod == null))
- return true;
- if(readMethod == null && writeMethod == null)
- return false;
-
- JavaParameter javaParameter[] = writeMethod.listParametersWithoutReturn();
- for(int i = 0;i< javaParameter.length;i++){
- JavaParameter jp = javaParameter[i];
- String name1 = jp.getJavaType().getJavaName();
- String name = readMethod.getReturnType().getJavaName();
- if(jp.getJavaType().getJavaName().equals(readMethod.getReturnType().getJavaName()))
- return true;
- }
- return false;
- }
-
- private boolean defaultCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- }
- }
- }
-
- return defaultConst;
- }
-
- private boolean polarityCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- }
- }
- }
-
- return defaultConst;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
deleted file mode 100644
index 1359603..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofBeanVisitor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofBeanVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /*
- *Constructor
- **/
- public JavaMofBeanVisitor()
- {
- }
-
- public Status run ( Object javaClass, VisitorAction vAction)
- {
- return vAction.visit((JavaClass)javaClass);
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
deleted file mode 100644
index e5351e1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofFieldVisitor.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-import java.util.ListIterator;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofFieldVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String clientProject;
-
- /*
- * Constructor
- **/
- public JavaMofFieldVisitor()
- {
- }
-
- /*
- * Use this to reflect
- */
- public void setProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getProject()
- {
- return clientProject;
- }
-
- /*
- * Get the attribute belonging to this complex type
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public Status run ( Object javaclass, VisitorAction vAction)
- {
- Status status = new SimpleStatus("");
- JavaClass javaClass = (JavaClass)javaclass;
-
- boolean holderClass = false;
- EList implemented = javaClass.getImplementsInterfaces();
- for (int i = 0; i < implemented.size(); i++) {
- JavaClass anInterface = (JavaClass) implemented.get(i);
- if (anInterface.getQualifiedName().equals("javax.xml.rpc.holders.Holder"))
- holderClass = true;
- }
-
- //beaninfo code
- if(holderClass){
- EList e = javaClass.getFields();
- ListIterator list = e.listIterator();
- while(list.hasNext()){
- Field field = (Field)list.next();
- if(field.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC && !field.isFinal() && !field.isStatic()){
- if(fieldCheck((FieldImpl)field))
- status = vAction.visit(field);
- }
- }
- }
-
- return status;
- }
- private boolean fieldCheck(FieldImpl field)
- {
- // so its a bean make sure it has a default constructor
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setProxyBean(field.getJavaType().getQualifiedName());
- javaMofRef.setClientProject(getProject());
- javaMofRef.execute(null);
- if(javaMofRef.getJavaClass() instanceof JavaClass){
- if(TypeFactory.recognizedBean(javaMofRef.getJavaClass().getJavaName())) return true;
- return defaultCheck((JavaClass)javaMofRef.getJavaClass());
- }
- return true;
- }
-
- private boolean defaultCheck(JavaClass javaClass){
-
- Iterator m=javaClass.getMethods().iterator();
- //now check for a default constructor
- boolean defaultConst = true;
- while (m.hasNext()) {
- Method method=(Method)m.next();
- if (javaClass.getName().equals(method.getName())){
- //now the inputs
- JavaParameter javaParameter[] = method.listParametersWithoutReturn();
- if (javaParameter.length > 0){
- //then we have no default constructor
- defaultConst = false;
- }
- else if(javaParameter.length == 0){
- if (method.getJavaVisibility().getValue() == 0)
- return true;
- else if(method.getJavaVisibility().getValue() == 1)
- defaultConst = false;
- }
- }
- }
-
- return defaultConst;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
deleted file mode 100644
index b2917ab..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofMethodVisitor.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.Iterator;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofMethodVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public String SET_ENDPOINT = "setEndPoint";
- public String GET_ENDPOINT = "getEndPoint";
- private BooleanSelection[] fMethodsSelected;
-
-
- /*
- * Constructor
- **/
- public JavaMofMethodVisitor()
- {
- }
-
- public String UNDER_SCORE = "_";
-
- /*
- * Run through all the methods in this bean
- * @param JavaClass javaclass that holds the methods
- * @param VisitorAction Action to be performed on each method
- **/
- public Status run ( Object javaclass, VisitorAction vAction)
- {
- Status status = new SimpleStatus("");
- JavaClass javaClass = (JavaClass)javaclass;
- for (Iterator m=javaClass.getPublicMethods().iterator(); m.hasNext(); ) {
- Method method=(Method)m.next();
- if(fMethodsSelected != null) {
- boolean methodSelected = false;
- for(int i =0;i < fMethodsSelected.length;i++){
- if(fMethodsSelected[i] == null) continue;
- if ( fMethodsSelected[i].getValue().equals(method.getMethodElementSignature()))
- methodSelected = (boolean) fMethodsSelected[i].isSelected();
- }
- String methodName = method.getName();
- if(methodSelected)
- status = vAction.visit(method);
-
- }
- else {
- status = vAction.visit(method);
- }
-
- }
- return status;
- }
-
- public void setMethodSelection(BooleanSelection[] methodSelected)
- {
- fMethodsSelected = methodSelected;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
deleted file mode 100644
index ac910d0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofParameterVisitor.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import java.util.List;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofParameterVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private MessageUtils msgUtils_;
- private Environment env_;
-
- /*
- * Constructor
- **/
- public JavaMofParameterVisitor(Environment env)
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- env_ = env;
- }
-
- /*
- * Run through all the parameters in this method
- * @param JavaClass javaclass that holds the parameters
- * @param VisitorAction Action to be performed on each method
- **/
- public Status run ( Object imethod, VisitorAction vAction)
- {
- Status status = new SimpleStatus("");
- Choice OKChoice = new Choice('O', msgUtils_.getMessage("LABEL_OK"), msgUtils_.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils_.getMessage("LABEL_CANCEL"), msgUtils_.getMessage("DESCRIPTION_CANCEL"));
- Method method = (Method)imethod;
-
- JavaHelpers javaReturnParameter = method.getReturnType();
- //pgm This visitor used to take a JavaParameter type and now it is being called
- // with a JavaHelpers type. Gil, please ensure that this is Ok.
- status = vAction.visit(javaReturnParameter);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
-
- //now the inputs
- List parameters = method.getParameters();
-
- for (int index = 0; index < parameters.size(); index++)
- {
- JavaParameter param=(JavaParameter)parameters.get(index);
- status = vAction.visit(param);
- //
- severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env_.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- }
-
- return status;
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
deleted file mode 100644
index 4d4ff28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/codegen/javamofvisitors/JavaMofTypeVisitor.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.impl.FieldImpl;
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-/**
-* Objects of this class represent a visitor.
-* */
-public class JavaMofTypeVisitor implements Visitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private Environment env_;
-
- private String clientProject;
-
- /*
- * Constructor
- **/
- public JavaMofTypeVisitor(Environment env)
- {
- env_ = env;
- }
-
- /*
- * Use this to reflect
- */
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- /*
- * Use this to reflect
- */
- public String getClientProject()
- {
- return clientProject;
- }
-
- /*
- * Get the type belonging to the parameter
- * @param JavaParameter javaParameter that owns the type
- * @param VisitorAction Action to be performed on each method
- **/
- public Status run ( Object typeNavigator, VisitorAction vAction)
- {
- Status status = new SimpleStatus("");
- if (typeNavigator instanceof JavaParameter){
-
- JavaParameter javaParameter = (JavaParameter)typeNavigator;
- JavaHelpers javaHelpers = javaParameter.getJavaType();
- status = vAction.visit(javaHelpers);
- }
- else if (typeNavigator instanceof JavaHelpers){
- status = vAction.visit(typeNavigator);
- }
- else if (typeNavigator instanceof SamplePropertyDescriptor){
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)typeNavigator;
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(clientProject);
- javaMofRef.setProxyBean(((JavaHelpers)pd.getPropertyType()).getQualifiedName());
- status = javaMofRef.execute(env_);
- if (status.getSeverity()==Status.ERROR)
- return status;
-
- status = vAction.visit(javaMofRef.getJavaClass());
- }
- else if (typeNavigator instanceof Field){
- FieldImpl field = (FieldImpl)typeNavigator;
- JavaMofReflectionCommand javaMofRef = new JavaMofReflectionCommand();
- javaMofRef.setClientProject(clientProject);
- javaMofRef.setProxyBean(field.getJavaType().getQualifiedName());
-
- status = javaMofRef.execute(env_);
- if (status.getSeverity()==Status.ERROR)
- return status;
-
- status = vAction.visit(javaMofRef.getJavaClass());
- }
-
- return status;
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
deleted file mode 100644
index b3816c0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public abstract class AbstractStartServer {
-
-private IProject project = null;
-protected IProgressMonitor monitor;
-private Log log_;
-private MessageUtils msgUtils_;
-
-public AbstractStartServer()
-{
- log_ = new EclipseLog();
- msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-}
-
-/**
- * Execute the command
- */
-public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException
-{
- this.project = project;
- this.monitor = monitor;
-
- try
- {
-
-// IJavaServer javaServer = (IJavaServer) server.getDelegate();
-// addJarsToClassPath(javaServer);
- validateRemoteServerPath(server);
-
- if (server.getServerState() != IServer.STATE_STOPPED) // The Server is running
- {
- if (server.getServerRestartState())
- {
-
- server.synchronousStop(false);
- log_.log(Log.INFO, 5050, this, "StartServer", "project="+project+", Stop command completed, restart needed");
- publishProject(server);
- startProject(server);
- }
- else
- {
-
- if (restart) // WEB-INF\lib need to be reloaded
- {
- publishProject(server);
- restartProject(project, server);
- }
- }
- }
- else {
-
- publishProject(server);
- startProject(server);
- }
-}
-
- catch (CoreException ce) {
- throw ce;
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
- }
-}
-
-protected void publishProject(IServer server) throws CoreException
-{
- monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_PUBLISHING_SERVER" ) );
- IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor);
- if (status.getSeverity() != IStatus.OK)
- throw new CoreException(status);
- log_.log(Log.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed");
- }
-
-protected void startProject(IServer server) throws CoreException
-{
- try
- {
- monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_STARTING_SERVER" ) );
- server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
- log_.log(Log.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed");
-
- }
- catch (Exception e) {
- throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
- }
-}
-
-protected void restartProject(IProject project, IServer server) throws CoreException
-{
- try
- {
-
- monitor.subTask( msgUtils_.getMessage( "PROGRESS_INFO_STARTING_SERVER" ) );
- EARNatureRuntime[] ears = J2EEUtils.getEARProjects(project);
- for (int i = 0; i < ears.length; i++)
- {
- IProject earProject = ears[i].getProject();
- if (earProject != null && ServerUtil.containsModule(server,ResourceUtils.getModule(earProject), monitor))
- {
- // TODO: restart project?
- log_.log(Log.INFO, 5053, this, "restartProject", "earProject="+earProject+", Restart project command completed");
-
- }
- }
- }
- catch (Exception e) {
- throw new CoreException( new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,msgUtils_.getMessage("MSG_ERROR_SERVER"),e));
- }
-}
-
-public void runPreServerConfig(IServer server, IProject EARProject){
-
- return;
-
-}
-
-public void runPostServerConfig(IServer server, IProject EARProject){
-
- return;
-}
-
-
-protected abstract void addJarsToClassPath(IServer server) throws CoreException;
-protected abstract void validateRemoteServerPath(IServer server) throws CoreException;
-
-public void stopServer(IServer server) throws CoreException {
-
- if (server != null) {
-
- if (server.getServerState() != IServer.STATE_STOPPED) {
- server.synchronousStop(false);
- }
- }
-
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
deleted file mode 100644
index 82dfb5a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class AddModuleToServerCommand extends SimpleCommand
-{
- private java.lang.String DESCRIPTION = "(Re)Start and publish the server";
- private java.lang.String LABEL = "StartServerCommand";
- private MessageUtils msgUtils_;
-
- private String serverInstanceId;
- private String project;
- private String module;
-
- public AddModuleToServerCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
-
- IServer server = ServerCore.findServer(serverInstanceId);
- if (server == null)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IServerWorkingCopy serverwc = null;
-
- try
- {
- //Ensure the module is not a Java utility
- IProject iproject = ProjectUtilities.getProject(project);
- if (!J2EEUtils.isJavaComponent(iproject, module))
- {
- IModule imodule = ServerUtils.getModule(iproject, module);
- if (!ServerUtil.containsModule(server, imodule, null))
- {
- IModule[] imodules = new IModule[]{imodule};
- serverwc = server.createWorkingCopy();
- ServerUtil.modifyModules(serverwc, imodules, null, null);
- }
-
- }
- } catch (CoreException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_ADD_MODULE", new String[]{module}), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- } finally
- {
- try
- {
- if (serverwc != null)
- {
- serverwc.save(true, null);
- }
- } catch (CoreException ce)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_ADD_MODULE", new String[] { module }), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- return status;
-
-
- }
-
- public void setModule(String module)
- {
- this.module = module;
- }
-
- public void setProject(String project)
- {
- this.project = project;
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
deleted file mode 100644
index 2b673f2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class AssociateModuleWithEARCommand extends SimpleCommand
-{
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
- private MessageUtils msgUtils_;
-
- public AssociateModuleWithEARCommand(){
- msgUtils_ = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
- IProject moduleProject = null;
- IProject earProject = null;
-
- // get projects
- if (project_!=null)
- moduleProject = ProjectUtilities.getProject(project_);
- if (earProject_!=null)
- earProject = ProjectUtilities.getProject(earProject_);
-
- // associate modules if not already associated
- if (moduleProject!=null && earProject!=null) {
- if (!J2EEUtils.isComponentAssociated(earProject, ear_, moduleProject, module_))
- J2EEUtils.associateComponentToEAR(moduleProject, module_, earProject, ear_);
- }
-
- // ensure modules are associated otherwise report error
- if (!J2EEUtils.isComponentAssociated(earProject, ear_, moduleProject, module_)){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_UNABLE_TO_ASSOCIATE", new String[]{module_, ear_}), Status.ERROR);
- if (env!=null)
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEARProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
deleted file mode 100644
index 048f79b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class BuildProjectCommand extends SimpleCommand
-{
- private ValidationManager validationManager;
- private IProject project_;
- private boolean forceBuild_;
- // rm private Model model;
-
- /**
- * Default CTOR;
- */
- public BuildProjectCommand()
- {
- super( WebServiceConsumptionPlugin.getMessage("%TASK_LABEL_WEBSERVICE_BUILD_PROJECT"),
- WebServiceConsumptionPlugin.getMessage("%TASK_DESC_WEBSERVICE_BUILD_PROJECT") );
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env)
- {
- try
- {
- if (forceBuild_)
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- else if (validationManager == null)
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- else if (validationManager.getWorkspaceAutoBuildPreference())
- project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor());
- }
- catch (Exception e)
- {
- }
-
- try
- {
- Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
- }
- catch (InterruptedException ie)
- {
- // continue execution
- }
- catch (OperationCanceledException oce)
- {
- // continue execution
- }
-
- return new SimpleStatus("");
- }
- /**
- * @param forceBuild The forceBuild to set.
- */
- public void setForceBuild(boolean forceBuild) {
- this.forceBuild_ = forceBuild;
- }
-
- /**
- * @param project The project to set.
- */
- public void setProject(IProject project) {
- this.project_ = project;
- }
-
- /**
- * @param validationManager The validationManager to set.
- */
- public void setValidationManager(ValidationManager validationManager) {
- this.validationManager = validationManager;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
deleted file mode 100644
index fbf408f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CheckProjectOKCommand extends SimpleCommand {
-
- private String serviceServerTypeId_;
-
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public CheckProjectOKCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- }
-
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
-
- String typeid = serviceServerTypeId_;
- IServer[] servers = ServerCore.getServers();
-// Iterator iterator = servers.iterator();
- boolean viewOpen = false;
- String serverName = null;
-
- for (int i=0;i<servers.length;i++) {
- IServer server = (IServer) servers[i];
-
- // If the configuration editor is open for the server that we are
- // deploying
- // to we will prompt the user to close it.
- if (server != null && server.getServerType().getId().equals(typeid)) {
- viewOpen = true;
- serverName = server.getName();
- break;
- }
- }
-
- if (viewOpen) {
- String errorMessage = msgUtils_.getMessage("MSG_ERROR_SERVER_VIEW_OPEN", new String[] { serverName});
- return new SimpleStatus("", errorMessage, Status.ERROR, null);
-
- }
-
- return status;
- }
-
- /**
- * @param serviceServerId
- * The serviceServer factory Id to set.
- */
- public void setServiceServerTypeID(String serviceServerId) {
- this.serviceServerTypeId_ = serviceServerId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ClientServerDeployableConfigCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ClientServerDeployableConfigCommand.java
deleted file mode 100644
index 7a948eb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ClientServerDeployableConfigCommand.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ClientServerDeployableConfigCommand extends SimpleCommand {
-
- private String LABEL = "ClientServerDeployableConfigCommand";
- private String DESCRIPTION = "Ensure Deployable is added to Server Configuration for client projects";
- private MessageUtils msgUtils_;
- private Boolean creationScenario_ = Boolean.TRUE;
- private TypeRuntimeServer clientIds_;
- private IProject sampleProject_;
- private String serviceServerTypeID_;
- private String sampleServerTypeID_;
- private IServer serviceExistingServer_;
- private IServer sampleExistingServer_;
- private String serviceProjectURL_;
- private String sampleProjectURL_;
-
- //addedProjectToServer_ is set to true if
- //- the project exists AND
- //- the server exists (i.e. this command did not create it) AND
- //- this command added the project to the server
- private boolean addedProjectToServer_ = false;
- /**
- * Default CTOR
- */
- public ClientServerDeployableConfigCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- /**
- * Default CTOR
- */
- public ClientServerDeployableConfigCommand(boolean creationScenario) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- creationScenario_ = new Boolean(creationScenario);
- }
-
- /**
- * execute
- */
- public Status execute(Environment env) {
-
- Status status = new SimpleStatus("");
- try {
-
- // determine client or service project
- IProject project = sampleProject_;
- if (project == null)
- return status;
-
- // get sample server factory Id and instanceId
- String serverFactoryId = clientIds_.getServerId();
- String existingServerInstId = clientIds_.getServerInstanceId();
- IServer server = null;
- if (existingServerInstId ==null) {
- server= sampleExistingServer_;
- }
- else {
- // get an IServer object; either existing or create one
- server = ServerCore.findServer(existingServerInstId);
- }
-
- if (server != null) {
- // find exact server for given project
- IServer[] servers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- boolean foundServer = false;
- for (int i = 0; i < servers.length; i++) {
- if (servers[i].equals(server))
- foundServer = true;
- }
- if (!foundServer) {
- Status modStatus = ServerUtils.getInstance().modifyModules(env ,server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
- if (modStatus.getSeverity()==Status.ERROR)
- return modStatus;
-
- addedProjectToServer_ = true;
- }
- }
- else {
- if (ResourceUtils.isTrueJavaProject(project))
- {
- //Don't attempt to add a Java project to a server, therefore passing in null for the module.
- server = ServerUtils.getInstance().createServer(env, null, serverFactoryId, EnvironmentUtils.getIProgressMonitor(env));
- }
- else
- {
- server = ServerUtils.getInstance().createServer(env, ResourceUtils.getModule(project), serverFactoryId, EnvironmentUtils.getIProgressMonitor(env));
- }
- if (server == null) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IModule[] parentModules = server.getRootModules(ResourceUtils.getModule(project),null);
- if (parentModules!=null && parentModules.length!=0) {
- if (!ServerUtil.containsModule(server, ResourceUtils.getModule(project), null)) {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- }
-
- }
-
- //
- String projectURL = ResourceUtils.getWebProjectURL(project, serverFactoryId, server);
- if (creationScenario_.booleanValue()) {
- serviceExistingServer_ = server;
- serviceProjectURL_ = projectURL;
- }
- else {
- sampleExistingServer_ = server;
- sampleProjectURL_ = projectURL;
- }
-
- return status;
- }
- catch (Exception e) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_SERVER_CONFIG"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
-
- public void setSampleProject(IProject sampleProject) {
- sampleProject_ = sampleProject;
- }
-
- public void setServiceServerTypeID(String serviceServerTypeID) {
- serviceServerTypeID_ = serviceServerTypeID;
- }
-
- public void setSampleServerTypeID(String sampleServerTypeID) {
- sampleServerTypeID_ = sampleServerTypeID;
- }
-
- public void setServiceExistingServer(IServer serviceExistingServer) {
- serviceExistingServer_ = serviceExistingServer;
- }
-
- public IServer getServiceExistingServer() {
- return serviceExistingServer_;
- }
-
- public String getServiceExistingServerInstId() {
- String id = null;
- IServerWorkingCopy wc = null;
- if (serviceExistingServer_!=null){
- wc = serviceExistingServer_.createWorkingCopy();
- id = (wc!=null ? wc.getId() : null);
- }
- return id;
- }
-
- public void setSampleExistingServer(IServer sampleExistingServer) {
- sampleExistingServer_ = sampleExistingServer;
- }
-
- public IServer getSampleExistingServer() {
- return sampleExistingServer_;
- }
-
- public String getSampleExistingServerInstId() {
- String id = null;
- IServerWorkingCopy wc = null;
- if (sampleExistingServer_!=null){
- wc = sampleExistingServer_.createWorkingCopy();
- id = (wc!=null ? wc.getId() : null);
- }
- return id;
- }
-
- public String getServiceProjectURL() {
- return serviceProjectURL_;
- }
-
- public String getSampleProjectURL() {
- return sampleProjectURL_;
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer trs){
- this.clientIds_ = trs;
- }
-
- /**
- * @return Returns the addedProjectToServer_.
- */
- public boolean getAddedProjectToServer() {
- return addedProjectToServer_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
deleted file mode 100644
index 323af44..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class ComputeEndpointCommand extends SimpleCommand
-{
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private Boolean monitorService;
- private Integer monitoredPort;
-
- public ComputeEndpointCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand", "org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand");
- }
-
- /**
- * @param monitoredPort The monitoredPort to set.
- */
- public void setMonitoredPort(Integer monitoredPort)
- {
- this.monitoredPort = monitoredPort;
- }
- /**
- * @param monitorService The monitorService to set.
- */
- public void setMonitorService(Boolean monitorService)
- {
- this.monitorService = monitorService;
- }
- /**
- * @param webServicesParser The webServicesParser to set.
- */
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
- /**
- * @param wsdlURI The wsdlURI to set.
- */
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public String getEndpoint()
- {
- if (monitorService != null && monitorService.booleanValue() && monitoredPort != null)
- {
- Definition def = webServicesParser.getWSDLDefinition(wsdlURI);
- if (def != null)
- {
- for (Iterator it = def.getServices().values().iterator(); it.hasNext();)
- {
- Service service = (Service)it.next();
- for (Iterator it2 = service.getPorts().values().iterator(); it2.hasNext();)
- {
- Port port = (Port)it2.next();
- for (Iterator it3 = port.getExtensibilityElements().iterator(); it3.hasNext();)
- {
- ExtensibilityElement ext = (ExtensibilityElement)it3.next();
- if (ext instanceof SOAPAddress)
- {
- String location = ((SOAPAddress)ext).getLocationURI();
- try
- {
- URL url = new URL(location);
- url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile());
- return url.toString();
- }
- catch (MalformedURLException murle)
- {
- int protocolIndex = location.indexOf("://");
- if (protocolIndex != -1)
- {
- String protocol = location.substring(0, protocolIndex+3);
- int hostPortIndex = location.indexOf('/', protocolIndex+3);
- String file;
- if (hostPortIndex == -1)
- {
- hostPortIndex = location.length();
- file = "";
- }
- else
- file = location.substring(hostPortIndex, location.length());
- String hostPort = location.substring(protocolIndex+3, hostPortIndex);
- int hostIndex = hostPort.indexOf(':');
- String host;
- if (hostIndex != -1)
- host = hostPort.substring(0, hostIndex+1);
- else
- host = hostPort + ':';
- String newPort = String.valueOf(monitoredPort.intValue());
- StringBuffer endpoint = new StringBuffer(protocol);
- endpoint.append(host);
- endpoint.append(newPort);
- endpoint.append(file);
- return endpoint.toString();
- }
- }
- }
- }
- }
- }
- }
- }
- return null;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
deleted file mode 100644
index d4c5d5d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java
+++ /dev/null
@@ -1,300 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.Types;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.UnknownExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLWriter;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.uri.URIException;
-import org.eclipse.wst.ws.internal.parser.discovery.NetUtils;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl;
-import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl;
-import org.eclipse.xsd.XSDSchema;
-import org.eclipse.xsd.XSDSchemaDirective;
-import org.eclipse.xsd.impl.XSDSchemaImpl;
-import org.eclipse.xsd.util.XSDParser;
-import org.w3c.dom.Element;
-
-public class CopyWSDLCommand extends SimpleCommand
-{
- private String wsdlURI;
- private WebServicesParser webServicesParser;
- private String destinationURI;
- private Definition def;
- private Vector ignoreList;
-
- public CopyWSDLCommand()
- {
- super(WebServiceConsumptionPlugin.getMessage("COMMAND_LABEL_COPY_WSDL"), WebServiceConsumptionPlugin.getMessage("COMMAND_DESC_COPY_WSDL"));
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env)
- {
- try
- {
- ignoreList = new Vector();
- if (def == null)
- def = webServicesParser.getWSDLDefinition(wsdlURI);
- copyWSDL(env, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def);
- return new SimpleStatus("");
- }
- catch (Throwable t)
- {
- t.printStackTrace();
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("MSG_ERROR_COPY_WSDL", new String[]{wsdlURI, destinationURI}), Status.ERROR, t);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private void copyWSDL(Environment env, String uri, String destURI, String destLocalname) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
- {
- Definition definition;
-
- try {
- definition = webServicesParser.getWSDLDefinitionVerbose(uri);
- copyWSDL(env, uri, destURI, destLocalname, definition);
- } catch (WSDLException e) {
- copyXMLSchema(env, uri, destURI);
- }
- }
-
- private void copyWSDL(Environment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException
- {
- if (ignoreList.contains(uri))
- return;
- ignoreList.add(uri);
- int index = wsdlURI.lastIndexOf('/');
- String baseURI = getBaseURI(wsdlURI);
- if (destLocalname == null || destLocalname.length() <= 0)
- destLocalname = getLocalname(wsdlURI);
- // copy WSDL
- StringBuffer destinationFileURI = new StringBuffer(addTrailingSeparator(destURI));
- destinationFileURI.append(destLocalname);
- WSDLFactory wsdlFactory = new WSDLFactoryImpl();
- WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter();
- OutputStream os = env.getURIFactory().newURI(destinationFileURI.toString()).getOutputStream();
- wsdlWriter.writeWSDL(definition, os);
- os.close();
- // copy <wsdl:import>s
- Map imports = definition.getImports();
- for (Iterator it = imports.values().iterator(); it.hasNext();)
- {
- List list = (List)it.next();
- for (Iterator listIt = list.iterator(); listIt.hasNext();)
- {
- Import wsdlImport = (Import)listIt.next();
- String wsdlImportURI = wsdlImport.getLocationURI();
- if (isRelative(wsdlImportURI))
- {
- String importBaseURI = (new StringBuffer(baseURI)).append(wsdlImportURI).toString();
- String wsdlImportBaseURI = getBaseURI(wsdlImportURI);
- StringBuffer importDestURI = new StringBuffer(destURI);
- if (wsdlImportBaseURI != null)
- importDestURI.append(wsdlImportBaseURI);
- copyWSDL(env, importBaseURI, importDestURI.toString(), getLocalname(wsdlImportURI));
- }
- }
- }
- Types types = definition.getTypes();
- if (types != null)
- {
- List schemas = types.getExtensibilityElements();
- for (Iterator it = schemas.iterator(); it.hasNext();)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)it.next();
- if (extElement instanceof UnknownExtensibilityElement)
- {
- UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- else if (extElement instanceof XSDSchemaExtensibilityElementImpl)
- {
- XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)extElement;
- XSDSchema xsdSchema = null;
- try
- {
- xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement());
- }
- catch (Throwable t)
- {
- // ignore any extensibility elements that cannot be parsed into a
- // XSDSchema instance
- }
- copyXMLSchema(env, xsdSchema, baseURI, destURI);
- }
- }
- }
- }
-
- private String getBaseURI(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(0, index + 1);
- else
- return null;
- }
-
- private String getLocalname(String uri)
- {
- int index = uri.lastIndexOf('/');
- if (index == -1)
- index = uri.lastIndexOf('\\');
- if (index != -1)
- return uri.substring(index + 1);
- else
- return uri;
- }
-
- private String addTrailingSeparator(String s)
- {
- if (!(s.endsWith("/") || s.endsWith("\\")))
- {
- StringBuffer sb = new StringBuffer(s);
- sb.append('/');
- return sb.toString();
- }
- else
- return s;
- }
-
- private boolean isRelative(String uri)
- {
- return (uri.indexOf(':') == -1);
- }
-
- private void copyXMLSchema(Environment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
- {
- if (ignoreList.contains(uri))
- return;
- ignoreList.add(uri);
- // load as a cached schema
- XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(uri);
- // if schema is not cached, parse it
- if (xsdSchema == null)
- {
- XSDParser p = new XSDParser();
- InputStream is = NetUtils.getURLInputStream(uri);
- if (is != null)
- {
- p.parse(is);
- xsdSchema = p.getSchema();
- }
- }
- if (xsdSchema != null)
- {
- // copy schema
- Element e = xsdSchema.getElement();
- DOMSource domSource = new DOMSource(e);
- Transformer serializer = TransformerFactory.newInstance().newTransformer();
- serializer.setOutputProperty(OutputKeys.INDENT, "yes");
- serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8");
- serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
- OutputStream os = env.getURIFactory().newURI((new StringBuffer(destURI)).append(getLocalname(uri)).toString()).getOutputStream();
- serializer.transform(domSource, new StreamResult(os));
- os.close();
- // copy <xsd:import>s and <xsd:include>s
- copyXMLSchema(env, xsdSchema, getBaseURI(uri), destURI);
- }
- }
-
- private void copyXMLSchema(Environment env, XSDSchema xsdSchema, String baseURI, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException
- {
- if (xsdSchema != null)
- {
- // copy <xsd:import>s and <xsd:include>s
- EList xsdSchemaContents = xsdSchema.getContents();
- for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();)
- {
- Object content = it.next();
- if (content instanceof XSDSchemaDirective)
- {
- XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content;
- String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation();
- if (xsdSchemaDirectiveLocation != null && isRelative(xsdSchemaDirectiveLocation))
- {
- String directiveURI = (new StringBuffer(baseURI)).append(xsdSchemaDirectiveLocation).toString();
- String directiveBaseURI = getBaseURI(xsdSchemaDirectiveLocation);
- StringBuffer directiveDestURI = new StringBuffer(destURI);
- if (directiveBaseURI != null)
- directiveDestURI.append(directiveBaseURI);
- copyXMLSchema(env, directiveURI, directiveDestURI.toString());
- }
- }
- }
- }
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setDestinationURI(String destinationURI)
- {
- this.destinationURI = destinationURI;
- }
-
- public void setDefinition(Definition def)
- {
- this.def = def;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java
deleted file mode 100644
index 95e998b..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateAppClientProjectCommand.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-public class CreateAppClientProjectCommand extends SimpleCommand
-{
- private String appClientProjectName_;
- private String earProjectName_;
- private String serverFactoryId_;
- private String j2eeVersion_;
-
-
- /**
- * Constructor
- */
- public CreateAppClientProjectCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.CreateAppClientProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateAppClientProjectCommand");
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Status execute(Environment env)
- {
- MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-
- try
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = root.getProject(earProjectName_);
- if (earProject != null && !earProject.exists())
- {
- CreateEARProjectCommand c = new CreateEARProjectCommand();
- c.setEarProjectName(earProjectName_);
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- c.execute(env);
- earProject = root.getProject(earProjectName_);
- }
- IProject appClientProject = root.getProject(appClientProjectName_);
- if (appClientProject != null && !appClientProject.exists())
- {
- IDataModel info = DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider());
- info.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_NAME, appClientProjectName_);
- info.setProperty(IAppClientComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earProjectName_);
- info.setProperty(IAppClientComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.TRUE);
-
- //Set the J2EE version
- String finalJ2EEVersion = null;
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- info.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
- finalJ2EEVersion = j2eeVersion_;
- }
- else
- {
- if (earProject != null && earProject.exists())
- {
- EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
- int earVersion = ear.getJ2EEVersion();
- info.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(earVersion));
- finalJ2EEVersion = String.valueOf(earVersion);
- }
- else
- {
- info.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- }
- }
-
- //Set the server target
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
- //TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-
-// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.APP_CLIENT_TYPE, finalJ2EEVersion);
-// info.setProperty(AppClientComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-// info.setProperty(AppClientComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
-
- //Create the AppClient project
- IDataModelOperation operation = info.getDefaultOperation();
- operation.execute(new NullProgressMonitor(), null);
- }
- }
- catch (ExecutionException ite)
- {
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_APP_CLIENT_PROJECT", new String[] {appClientProjectName_}), Status.ERROR, ite);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- public void setAppClientProjectName(String appClientProjectName)
- {
- appClientProjectName_ = appClientProjectName;
- }
-
- public void setEarProjectName(String earProjectName)
- {
- earProjectName_ = earProjectName;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateClientProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateClientProjectCommand.java
deleted file mode 100644
index 1e570e3..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateClientProjectCommand.java
+++ /dev/null
@@ -1,268 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateClientProjectCommand extends SimpleCommand
-{
- private String ID_WEB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
- private String ID_EJB = "org.eclipse.jst.ws.consumption.ui.clientProjectType.EJB";
- private String ID_APP_CLIENT = "org.eclipse.jst.ws.consumption.ui.clientProjectType.AppClient";
- private String ID_JAVA = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Containerless";
-
- private boolean proxyCodegenEnabled = true;
- private String clientProjectTypeId;
- private IProject proxyProject;
- private IProject proxyProjectEAR;
- private String existingServerId_;
- private String serverFactoryId_;
- private String j2eeVersion_;
- private boolean needEAR_;
- private boolean addedProjectToServer_ = false;
-
- private IServer fExistingServer = null;
- private MessageUtils msgUtils_;
- private String moduleName_;
-
- /**
- * Default CTOR
- */
- public CreateClientProjectCommand( String moduleName )
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand");
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
-
- moduleName_ = moduleName;
- }
-
- public boolean isUndoable(){
- return true;
- }
-
- public Status undo(Environment env){
- Status stat = new SimpleStatus("");
- try {
-
- // check existingServer
- if (fExistingServer!=null) {
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
- if (proxyProjectEAR!=null) {
- startServerCommand.runPostServerConfig(fExistingServer, proxyProjectEAR);
- }
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(stat);
- return stat;
- }
-
- return stat;
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
- //Get the existing server
-
- IServer[] servers = ServerCore.getServers();
- IServer existingServer = null;
- fExistingServer = null;
- for (int i=0; i<servers.length; i++)
- {
- IServer thisServer = (IServer)servers[i];
- IServerWorkingCopy wc = null;
- String thisServerId = null;
- if (thisServer!=null) {
- wc = thisServer.createWorkingCopy();
- thisServerId = (wc!=null ? wc.getId() : null);
- }
- if (thisServerId.equals(existingServerId_)){
- existingServer = thisServer;
- fExistingServer = existingServer;
- }
- }
-
- //Create the project
- if (proxyCodegenEnabled)
- {
- if (clientProjectTypeId == null || clientProjectTypeId.length() <= 0)
- clientProjectTypeId = (WebServicePlugin.getInstance().getProjectTopologyContext().getClientTypes())[0];
- if (ID_WEB.equals(clientProjectTypeId))
- {
- CreateWebProjectCommand c = new CreateWebProjectCommand();
- c.setProjectName(proxyProject.getName());
-
- if (proxyProjectEAR != null)
- c.setEarProjectName(proxyProjectEAR.getName());
- else
- c.setEarProjectName("");
-
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- c.setExistingServer(existingServer);
- c.setNeedEAR(needEAR_);
- c.setAddedProjectToServer(addedProjectToServer_);
-
- status = c.execute(env);
- if (status.getSeverity()==Status.ERROR){
- return status;
- }
-
- Status startServerStatus = startServer(env, proxyProject);
- if (startServerStatus.getSeverity()==Status.ERROR)
- return startServerStatus;
-
- }
- else if (ID_EJB.equals(clientProjectTypeId))
- {
- CreateEJBProjectCommand c = new CreateEJBProjectCommand();
- c.setEjbProjectName(proxyProject.getName());
- c.setEarProjectName(proxyProjectEAR.getName());
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- status = c.execute(env);
- }
- else if (ID_APP_CLIENT.equals(clientProjectTypeId))
- {
- CreateAppClientProjectCommand c = new CreateAppClientProjectCommand();
- c.setAppClientProjectName(proxyProject.getName());
- c.setEarProjectName(proxyProjectEAR.getName());
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- status = c.execute(env);
- }
- else if (ID_JAVA.equals(clientProjectTypeId))
- {
- CreateJavaProjectCommand c = new CreateJavaProjectCommand();
- c.setProjectName(proxyProject.getName());
- status = c.execute(env);
- }
-
- }
-
- try {
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
- if (proxyProjectEAR!=null && existingServer!=null) {
- startServerCommand.runPreServerConfig(existingServer, proxyProjectEAR);
- fExistingServer = existingServer;
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- return status;
-
- }
-
- private Status startServer(Environment env, IProject webProject){
- try{
- // start server(Bug 4377)
- if (needEAR_ && fExistingServer != null){
- StartProjectCommand spc = new StartProjectCommand( moduleName_ );
- spc.setSampleProject(webProject);
- spc.setSampleExistingServer(fExistingServer);
- spc.setCreationScenario(new Boolean("false"));
- return spc.execute(env);
-
- }
- }
- catch(Exception ce){
- env.getLog().log(Log.ERROR, 5046, this, "execute", ce);
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
-
- public void setProxyCodegenEnabled(boolean proxyCodegenEnabled)
- {
- this.proxyCodegenEnabled = proxyCodegenEnabled;
- }
-
- /**
- * @param proxyProjectEAR The proxyProjectEAR to set.
- */
- public void setProxyProjectEAR(IProject proxyProjectEAR)
- {
- this.proxyProjectEAR = proxyProjectEAR;
- }
-
- /**
- * @param proxyProject The proxyProject to set.
- */
- public void setProxyProject(IProject proxyProject)
- {
- this.proxyProject = proxyProject;
- }
-
- /**
- * @param clientProjectTypeId The clientProjectTypeId to set.
- */
- public void setClientProjectTypeId(String clientProjectTypeId)
- {
- this.clientProjectTypeId = clientProjectTypeId;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-
- public void setNeedEAR(boolean needEAR)
- {
- needEAR_ = needEAR;
- }
-
- public void setExistingServerId(String existingServerId)
- {
- existingServerId_ = existingServerId;
- }
-
- public void setAddedProjectToServer(boolean addedProjectToServer)
- {
- addedProjectToServer_ = addedProjectToServer;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
deleted file mode 100644
index 610d8ef..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-
-
-public class CreateEARProjectCommand extends SimpleCommand
-{
- private String earProjectName_;
- private String serverFactoryId_;
- private String j2eeVersion_;
-
- /**
- * Constructor
- */
- public CreateEARProjectCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.CreateEARProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateEARProjectCommand");
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Status execute(Environment env)
- {
- MessageUtils msgUtils_ = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", this );
-
- try
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_);
- if (project != null && !project.exists())
- {
- IDataModel info = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- info.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, project.getName());
-
- //Set the J2EE version
- String finalJ2EEVersion = null;
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
- finalJ2EEVersion = j2eeVersion_;
- }
- else
- {
- info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- }
-
- //Set the server target
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
-// TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EAR_TYPE, finalJ2EEVersion);
-// info.setProperty(EARComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-// info.setProperty(EARComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
-
- //Create the EAR
- IDataModelOperation operation = info.getDefaultOperation();
- operation.execute(new NullProgressMonitor(), null);
- }
- }
- catch (ExecutionException ite)
- {
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_CANNOT_CREATE_EAR_PROJECT", new String[] {earProjectName_}), Status.ERROR, ite);
- env.getStatusHandler().reportError(status);
- return status;
- }
- return new SimpleStatus("");
- }
- /**
- * @param earProjectName_ The earProjectName_ to set.
- */
- public void setEarProjectName(String earProjectName)
- {
- this.earProjectName_ = earProjectName;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java
deleted file mode 100644
index 0429872..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEJBProjectCommand.java
+++ /dev/null
@@ -1,411 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-
-public class CreateEJBProjectCommand extends SimpleCommand
-{
- private static String LABEL = "%TASK_LABEL_CREATE_EJB_PROJECT";
- private static String DESCRIPTION = "%TASK_DESC_CREATE_EJB_PROJECT";
- private boolean isEJBProjectRequired_ = true;
- private String ejbProjectName_ = null;
- private String earProjectName_ = null;
-
- private IProject serviceProject;
- private IServer serviceExistingServer;
- private String serverFactoryId_;
- private String j2eeVersion_;
-
-
- public CreateEJBProjectCommand()
- {
- super(LABEL, DESCRIPTION);
- }
-
- /**
- * Constructor for CreateEJBProjectTask.
- * @param arg0
- * @param arg1
- */
- public CreateEJBProjectCommand(String label, String desc)
- {
- super(label, desc);
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Status execute(Environment env)
- {
- try
- {
- if (ejbProjectName_ != null && ejbProjectName_.length() > 0 && earProjectName_ != null && earProjectName_.length() > 0)
- {
- Status status = createEJBProject(ejbProjectName_, earProjectName_, env);
- if (status.getSeverity() == Status.ERROR)
- env.getStatusHandler().reportError(status);
- return status;
-
- }
-
- // Get web project and form ejbProjectName
- if (!isEJBProjectRequired_)
- return new SimpleStatus("");
-
- if (ejbProjectName_ == null)
- return new SimpleStatus("");
-
- // EJB Project already exists
- IContainer container = J2EEPlugin.getWorkspace().getRoot().getProject(ejbProjectName_);
- if (container.exists())
- {
- return new SimpleStatus("");
- }
-
- // Create EJBProjectInfo
- IDataModel projectInfo = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.PROJECT_NAME, ejbProjectName_ );
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.CREATE_DEFAULT_SESSION_BEAN,Boolean.TRUE);
-
- Status status;
- if (earProjectName_ != null)
- status = addEARToProject(earProjectName_, projectInfo);
- else
- {
- status = addEARToProject(serviceProject, projectInfo, env);
- }
- if (status.getSeverity() == Status.ERROR)
- env.getStatusHandler().reportError(status);
- return status;
- }
- catch (Exception e) {
- }
- return new SimpleStatus("");
- }
-
- private Status addEARToProject(String earProjectName, IDataModel projectInfo)
- {
- IProject earProject = null;
- // IProject earProject = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName);
- // if (!earProject.exists())
- {
- EARNatureRuntime ear = null;
- if (j2eeVersion_!=null && j2eeVersion_.length()>0)
- {
- ear = J2EEUtils.getEAR(Integer.parseInt(j2eeVersion_));
- }
- else
- {
- ear = J2EEUtils.get13EAR();
- if (ear != null)
- earProject = ear.getProject();
- else
- {
- ear = J2EEUtils.get12EAR();
- if (ear != null)
- earProject = ear.getProject();
- }
- }
- }
-
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earProject.getName());
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.TRUE);
-
- //Set the J2EE version
- String finalJ2EEVersion = null;
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
- finalJ2EEVersion = j2eeVersion_;
- }
- else
- {
- if (earProject != null && earProject.exists())
- {
- EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
- int earVersion = ear.getJ2EEVersion();
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(earVersion));
- finalJ2EEVersion = String.valueOf(earVersion);
- }
- else
- {
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- }
- }
-
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
- // TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EJB_TYPE, j2eeVersion_);
-// projectInfo.setProperty(EjbComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-// projectInfo.setProperty(EjbComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
-
- IDataModelOperation ejbProjectCreationOperation = projectInfo.getDefaultOperation();
-
- try
- {
- ejbProjectCreationOperation.execute(new NullProgressMonitor(), null);
-
- }
- catch (ExecutionException e)
- {
- return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, e);
- }
- return new SimpleStatus("");
- }
-
- private Status addEARToProject(IProject serviceProject, IDataModel projectInfo, Environment env)
- {
- EARNatureRuntime ear = null;
- IProject earProject = null;
- boolean addServiceEARToServer = false;
- boolean addDiscoveredEARToServer = false;
- IServer discoveredEARsServer = null;
- EARNatureRuntime[] ears = J2EEUtils.getEARProjects(serviceProject);
- try {
-
- if (ears!=null && ears.length >= 1) {
- ear = ears[0];
- earProject = ear.getProject();
- if (serviceExistingServer != null)
- {
- if (serviceExistingServer.getServerState() != IServer.STATE_STOPPED)
- serviceExistingServer.synchronousStop(false);
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, serviceExistingServer, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- addServiceEARToServer = true;
- }
-
- }
- else {
- //Check to see if any eligible EARs exist in the workspace.
- ear = J2EEUtils.get12EAR();
- if (ear!=null)
- {
- earProject = ear.getProject();
-
- // Add default server
- IServer defaultServer = ServerUtils.getDefaultExistingServer(earProject);
- if (defaultServer!=null)
- {
- if (defaultServer.getServerState() != IServer.STATE_STOPPED) {
- defaultServer.synchronousStop(false);
- }
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, defaultServer, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- addDiscoveredEARToServer = true;
- discoveredEARsServer = defaultServer;
- }
- }
- }
-
- }
- catch (Exception e)
- {
- return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, e);
- }
-
- IProject ejbProject = null;
- //Add the project back to the Server config
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earProject.getName());
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.TRUE);
- IDataModelOperation ejbProjectCreationOperation = projectInfo.getDefaultOperation();
-
- try {
- ejbProjectCreationOperation.execute(new NullProgressMonitor(), null);
- }
- catch (ExecutionException e)
- {
- return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, e);
- }
- //ejbProject = projectInfo.primGetProject();
-
- //Add the project back to the Server config
- if (addServiceEARToServer)
- {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, serviceExistingServer, ResourceUtils.getModule(earProject), true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- if (addDiscoveredEARToServer)
- {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, discoveredEARsServer, ResourceUtils.getModule(earProject), true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- return new SimpleStatus("");
- }
-
- private Status createEJBProject(String ejbProjectName, String earProjectName, Environment env)
- {
- try
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = root.getProject(earProjectName);
- if (earProject != null && !earProject.exists())
- {
- CreateEARProjectCommand c = new CreateEARProjectCommand();
- c.setEarProjectName(earProjectName);
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- c.execute(env);
- earProject = root.getProject(earProjectName);
- }
- IProject ejbProject = root.getProject(ejbProjectName);
- if (ejbProject != null && !ejbProject.exists())
- {
- IDataModel info = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
- info.setProperty(IEjbComponentCreationDataModelProperties.PROJECT_NAME, ejbProjectName);
- info.setProperty(IEjbComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earProjectName);
- info.setProperty(IEjbComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.TRUE);
-
- info.setProperty(IEjbComponentCreationDataModelProperties.CREATE_DEFAULT_SESSION_BEAN,Boolean.TRUE);
-
- //Set the J2EE version
- String finalJ2EEVersion = null;
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- info.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
- finalJ2EEVersion = j2eeVersion_;
- }
- else
- {
- if (earProject != null && earProject.exists())
- {
- EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
- int earVersion = ear.getJ2EEVersion();
- info.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(earVersion));
- finalJ2EEVersion = String.valueOf(earVersion);
- }
- else
- {
- info.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- }
- }
-
- //Set the server target
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
-// TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_,IServerTargetConstants.EJB_TYPE, finalJ2EEVersion);
-// info.setProperty(EjbComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-// info.setProperty(EjbComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
-
- //Create the EJB Project
- IDataModelOperation operation = info.getDefaultOperation();
- operation.execute(new NullProgressMonitor(), null);
- }
-
- // add EAR to Server
- if (serviceExistingServer!=null){
- boolean earAddedToServer = ServerUtil.containsModule(serviceExistingServer,ResourceUtils.getModule(earProject), new NullProgressMonitor());
-
- if (!earAddedToServer) {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, serviceExistingServer, ResourceUtils.getModule(earProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- }
-
-
- }
- catch (ExecutionException ite)
- {
- return new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_EJB_PROJECT"), Status.ERROR, ite);
- }
- return new SimpleStatus("");
- }
-
- /**
- * @param earProjectName The earProjectName to set.
- */
- public void setEarProjectName(String earProjectName)
- {
- this.earProjectName_ = earProjectName;
- }
-
- /**
- * @param ejbProjectName The ejbProjectName to set.
- */
- public void setEjbProjectName(String ejbProjectName)
- {
- this.ejbProjectName_ = ejbProjectName;
- }
-
- /**
- * @param isEJBProjectRequired The isEJBProjectRequired to set.
- */
- public void setEJBProjectRequired(boolean isEJBProjectRequired)
- {
- this.isEJBProjectRequired_ = isEJBProjectRequired;
- }
-
- /**
- * @param ejbProjectName The ejbProjectName to set.
- */
- public void setEJBProjectName(String ejbProjectName) {
- this.ejbProjectName_ = ejbProjectName;
- }
-
- /**
- * @param serviceExistingServer The serviceExistingServer to set.
- */
- public void setServiceExistingServer(IServer serviceExistingServer) {
- this.serviceExistingServer = serviceExistingServer;
- }
-
- /**
- * @param serviceProject The serviceProject to set.
- */
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject = serviceProject;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
deleted file mode 100644
index e46d304..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.ICommand;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-
-public class CreateJavaProjectCommand extends SimpleCommand
-{
- private String projectName_;
-
- /**
- * Default CTOR
- */
- public CreateJavaProjectCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.CreateJavaProjectCommand", "org.eclipse.jst.ws.internal.consumption.command.common.CreateJavaProjectCommand");
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Status execute(Environment env)
- {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_);
- if (project != null && !project.exists())
- {
- try
- {
- NullProgressMonitor monitor = new NullProgressMonitor();
- project.create(ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()), monitor);
- project.open(monitor);
- IProjectDescription desc = project.getDescription();
- desc.setNatureIds(new String[] {JavaCore.NATURE_ID});
- ICommand cmd = desc.newCommand();
- cmd.setBuilderName(JavaCore.BUILDER_ID);
- desc.setBuildSpec(new ICommand[] {cmd});
- project.setDescription(desc, monitor);
- IJavaProject javaProject = JavaCore.create(project);
- Path projectRoot = new Path(Path.ROOT.append(new Path(project.getName())).toString());
- javaProject.setRawClasspath(new IClasspathEntry[] {JavaCore.newSourceEntry(projectRoot), JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER))}, monitor);
- javaProject.setOutputLocation(projectRoot, monitor);
- }
- catch (CoreException ce)
- {
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("%MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT", new String[] {projectName_}), Status.ERROR, ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- return new SimpleStatus("");
- }
-
- public void setProjectName(String projectName)
- {
- projectName_ = projectName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
deleted file mode 100644
index b85f633..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java
+++ /dev/null
@@ -1,326 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties;
-import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateModuleCommand extends SimpleCommand
-{
-
- public final static int WEB = J2EEUtils.WEB;
- public final static int EJB = J2EEUtils.EJB;
- public final static int APPCLIENT = J2EEUtils.APPCLIENT;
- public final static int EAR = J2EEUtils.EAR;
-
- private String projectName;
- private String moduleName; // may be null for non-flexible project
- private int moduleType;;
- private String j2eeLevel;
- private String serverFactoryId;
- private String serverInstanceId_;
- private Environment env;
-
- private MessageUtils msgUtils;
-
- public CreateModuleCommand(){
- msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- }
-
- public Status execute(Environment environment)
- {
- this.env = environment;
- Status status = new SimpleStatus("");
-
- // check if data ready
- status = checkDataReady();
- if (status.getSeverity()==Status.ERROR){
- return status;
- }
-
- // check if flexible project exists
- IProject project = ProjectUtilities.getProject(projectName);
- if (project==null || !project.exists()){
- status = createFlexibleJavaProject();
- if (status.getSeverity()==Status.ERROR){
- return status;
- }
- }
-
- // check if project and/or component exists
- if (projectName!=null) {
- if (moduleName==null){
- if (project.exists())
- return status;
- }
- else {
- if (J2EEUtils.exists(projectName, moduleName))
- return status;
- }
- }
- else {
- return new SimpleStatus("",msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{projectName, moduleName}),Status.ERROR, null);
- }
-
- // create the component according to the component type specified
- int type = getModuleType();
- switch (type) {
- case WEB:
- status = createWebComponent();
- break;
- case EJB:
- status = createEJBComponent();
- break;
- case APPCLIENT:
- status = createAppClientComponent();
- break;
- case EAR:
- status = createEARComponent();
- break;
-
- default:
- return new SimpleStatus("",msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{moduleName}),Status.ERROR,null);
- }
-
-
- return status;
- }
-
- private Status checkDataReady(){
-
- if (projectName==null || serverFactoryId==null){
- return new SimpleStatus("",msgUtils.getMessage("MSG_ERROR_COMPONENT_CREATION", new String[]{projectName, moduleName}),Status.ERROR,null);
- }
-
- return new SimpleStatus("");
- }
-
-
- /**
- * Create a Web component
- * @return
- */
- public Status createWebComponent(){
- Status status = new SimpleStatus("");
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider());
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-
- // get the Web servlet level
- Integer servletLevel = J2EEUtils.getServletVersionForJ2EEVersion(j2eeLevel);
-
- if (j2eeLevel!=null)
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, servletLevel);
- IDataModelOperation op = projectInfo.getDefaultOperation();
- if (env!=null)
- op.execute(EnvironmentUtils.getIProgressMonitor(env), null);
- else
- op.execute(new NullProgressMonitor(), null);
- }
- catch (Exception e)
- {
- status = new SimpleStatus("",e.getMessage(),Status.ERROR,e);
- }
- return status;
- }
-
- /**
- * Create an EAR component
- * @return
- */
- public Status createEARComponent(){
- Status status = new SimpleStatus("");
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider());
- projectInfo.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
- if (j2eeLevel!=null)
- projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
- IDataModelOperation op =projectInfo.getDefaultOperation();
- if (env!=null)
- op.execute(EnvironmentUtils.getIProgressMonitor(env), null);
- else
- op.execute(new NullProgressMonitor(), null);
- }
- catch (Exception e)
- {
- status = new SimpleStatus("",e.getMessage(),Status.ERROR,e);
- }
- return status;
- }
-
- /**
- * Create an EJB Component
- * @return
- */
- public Status createEJBComponent(){
- Status status = new SimpleStatus("");
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider());
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
-
- // get the EJB spec level
- Integer ejbLevel = J2EEUtils.getEJBVersionForJ2EEVersion(j2eeLevel);
-
- if (j2eeLevel!=null)
- projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, ejbLevel);
- IDataModelOperation op = projectInfo.getDefaultOperation();
- if (env!=null)
- op.execute(EnvironmentUtils.getIProgressMonitor(env), null);
- else
- op.execute(new NullProgressMonitor(), null);
- }
- catch (Exception e)
- {
- status = new SimpleStatus("",msgUtils.getMessage("MSG_ERROR_CREATE_EJB_COMPONENT", new String[]{projectName}),Status.ERROR,e);
- }
- return status;
- }
-
- /**
- * Create an Application Client component
- * @return
- */
- public Status createAppClientComponent(){
- Status status = new SimpleStatus("");
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider());
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.PROJECT_NAME,projectName);
- if (moduleName!=null)
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_NAME, moduleName);
- if (j2eeLevel!=null)
- projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel));
- IDataModelOperation op = projectInfo.getDefaultOperation();
-
- if (env!=null)
- op.execute(EnvironmentUtils.getIProgressMonitor(env), null);
- else
- op.execute(new NullProgressMonitor(), null);
- }
- catch (Exception e)
- {
- status = new SimpleStatus("",msgUtils.getMessage("MSG_ERROR_CREATE_APPCIENT_PROJET", new String[]{projectName}),Status.ERROR,e);
- }
- return status;
- }
-
- /**
- * Creates Flexible Java Project structure
- * This project is required if it doesn't already exist in order to create the component
- * @return
- *
- * Note: This call may not be necessary once J2EE implements creating a flex project automatically
- * with the creation of components.
- */
- public Status createFlexibleJavaProject(){
- Status status = new SimpleStatus("");
- try
- {
- IDataModel projectInfo = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider());
- projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.PROJECT_NAME,projectName);
-
- String runtimeTargetId = null;
-
- if( serverInstanceId_ == null )
- {
- // We don't have a server instance so we will get the first runtimeTarget from the factory ID.
- runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId, ServerUtils.getServerTargetModuleType(moduleType), j2eeLevel);
- }
- else
- {
- // We have a server instance so we will just get it's runtimeTargetId.
- IServer server = ServerCore.findServer( serverInstanceId_ );
- runtimeTargetId = server.getRuntime().getId();
- }
-
- projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID,runtimeTargetId);
- projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.ADD_SERVER_TARGET,Boolean.TRUE);
- IDataModelOperation op = projectInfo.getDefaultOperation();
- if (env!=null)
- op.execute(EnvironmentUtils.getIProgressMonitor(env), null);
- else
- op.execute(new NullProgressMonitor(), null);
-
- }
- catch (Exception e)
- {
- status = new SimpleStatus("",msgUtils.getMessage("MSG_ERROR_CREATE_FLEX_PROJET", new String[]{projectName}),Status.ERROR,e);
- }
- return status;
- }
-
- public void setModuleName(String moduleName)
- {
- this.moduleName = moduleName;
- }
-
- public int getModuleType()
- {
- return moduleType;
- }
-
- public void setModuleType(int moduleType)
- {
- this.moduleType = moduleType;
- }
-
- public void setProjectName(String projectName)
- {
- this.projectName = projectName;
- }
-
- /**
- * Expecting 12,13,14 etc.
- * @param level
- */
- public void setJ2eeLevel(String level)
- {
- if (level !=null && level.indexOf(".")!=-1)
- j2eeLevel = J2EEUtils.getJ2EEIntVersionAsString(level);
- else
- j2eeLevel = level;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public void setServerInstanceId( String serverInstanceId )
- {
- serverInstanceId_ = serverInstanceId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
deleted file mode 100644
index 744081e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerPort;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.internal.IMonitoredServerPort;
-import org.eclipse.wst.server.core.internal.ServerMonitorManager;
-import org.eclipse.wst.server.core.internal.IServerMonitorManager;
-
-public class CreateMonitorCommand extends SimpleCommand {
-
- private static final String WEB_SERVICES = "Web services";
-
- private Boolean monitorService;
-
- private String serviceServerInstanceId;
-
- private Integer monitoredPort;
-
- public CreateMonitorCommand() {
- super("org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand",
- "org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand");
- }
-
- public Status execute(Environment env) {
- if (monitorService != null && monitorService.booleanValue()) {
- IServer server = ServerCore.findServer(serviceServerInstanceId);
- if (server != null) {
-
- // IMonitorableServer monitorableServer = (IMonitorableServer)
- // serverDelegate;
- ServerPort[] ports = server.getServerPorts(null);
- ServerPort port = null;
- for (int it = 0; it < ports.length; it++) {
- ServerPort p = ports[it];
- String protocol = p.getProtocol();
- if (protocol != null && protocol.trim().toLowerCase().equals("http")) {
- port = p;
- break;
- }
- }
- if (port != null) {
- IServerMonitorManager serverMonitorManager = ServerMonitorManager.getInstance();
- IMonitoredServerPort[] monitoredPorts = serverMonitorManager.getMonitoredPorts(server);
- for (int it2 = 0; it2 < monitoredPorts.length; it2++) {
- IMonitoredServerPort imsPort = monitoredPorts[it2];
- if (port.getPort() == imsPort.getServerPort().getPort() && hasContentWebServices(imsPort)) // port
- // already
- // being
- // monitored
- {
- if (!imsPort.isStarted()) {
- try {
- serverMonitorManager.startMonitor(imsPort);
- }
- catch (CoreException ce) {
- MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- Status error = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR",
- new Object[] { String.valueOf(port.getPort()), server.getName()}), Status.ERROR, ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
- monitoredPort = new Integer(imsPort.getMonitorPort());
- return new SimpleStatus("");
- }
- }
- try {
- IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES});
- serverMonitorManager.startMonitor(imsPort);
- monitoredPort = new Integer(imsPort.getMonitorPort());
- return new SimpleStatus("");
- }
- catch (CoreException ce) {
- MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- Status error = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[] {
- String.valueOf(port.getPort()), server.getName()}), Status.ERROR, ce);
- env.getStatusHandler().reportError(error);
- return error;
- }
- }
-
- else {
- MessageUtils msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
- Status info = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils.getMessage("MSG_INFO_MONITORING_NOT_SUPPORTED",
- new Object[] { server.getName()}), Status.INFO);
- env.getStatusHandler().reportInfo(info);
- return info;
- }
- }
- }
- return new SimpleStatus("");
- }
-
- private boolean hasContentWebServices(IMonitoredServerPort imsPort) {
- String[] contents = imsPort.getContentTypes();
- for (int i = 0; i < contents.length; i++)
- if (WEB_SERVICES.equals(contents[i])) return true;
- return false;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) {
- this.serviceServerInstanceId = typeRuntimeServer.getServerInstanceId();
- }
-
- public void setServiceServerInstanceId(String serviceServerInstanceId) {
- this.serviceServerInstanceId = serviceServerInstanceId;
- }
-
- public Integer getMonitoredPort() {
- return monitoredPort;
- }
-
- public void setMonitorService(Boolean value) {
- monitorService = value;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
deleted file mode 100644
index f407b73..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class CreateServerCommand extends SimpleCommand
-{
- private String serverFactoryId;
- private String serverInstanceId;
-
- private MessageUtils msgUtils;
-
- /**
- * Creates a server of the factory id
- * Note1: Checking for server instance == null is done in the PreService/ClientInstallCommands
- * Note2: Reporting of errors is done in PreService/ClientInstallCommands; simply return the status.
- */
- public CreateServerCommand(){
- msgUtils = new MessageUtils(WebServiceConsumptionPlugin.ID + ".plugin", this);
-
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
-
- if (serverFactoryId==null){
- status = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR, null);
- return status;
- }
-
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType!=null) {
- if (env!=null)
- serverWC = serverType.createServer(null, null, EnvironmentUtils.getIProgressMonitor(env));
- else
- serverWC = serverType.createServer(null, null, null);
-
- if (serverWC != null) {
- if (env!=null)
- server = serverWC.saveAll(true, EnvironmentUtils.getIProgressMonitor(env));
- else
- server = serverWC.saveAll(true, null);
- }
- }
- } catch (CoreException ce) {
- status = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR, ce);
- return status;
- }
-
- // set serverInstanceId
- if (server!=null)
- serverInstanceId = server.getId();
- else {
- status = new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR, null);
- }
-
- return status;
- }
-
- public void setServerFactoryid(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
-
- public String getServerInstanceId()
- {
- return serverInstanceId;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServiceProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServiceProjectCommand.java
deleted file mode 100644
index 3254e62..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServiceProjectCommand.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- *
- *
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class CreateServiceProjectCommand extends SimpleCommand {
-
- private boolean requiresEJB = false; // future implementation perhaps
- private boolean requiresWeb = false;
- private String projectName;
- private String earProjectName;
- private String existingServerId;
- private String serverFactoryId_;
- private String j2eeVersion_;
- private boolean needEAR_;
- private boolean isServiceProjectEJB_= false;
- private boolean addedProjectToServer_ = false;
-
- private IServer fExistingServer = null;
- /**
- * Default CTOR
- */
- public CreateServiceProjectCommand() {
-
- super("org.eclipse.jst.ws.internal.consumption.command.common.CreateServiceProjectCommand",
- "org.eclipse.jst.ws.internal.consumption.command.common.CreateServiceProjectCommand");
- }
-
- public boolean isUndoable(){
- return true;
- }
-
- public Status undo(Environment env){
- Status stat = new SimpleStatus("");
- try {
-
- // check existingServer
- if (fExistingServer!=null) {
-
- // get EAR project
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = null;
- if (earProjectName!=null && earProjectName.length()>0) {
- earProject = root.getProject(earProjectName);
- }
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(fExistingServer.getServerType().getId());
- if (earProject!=null) {
- startServerCommand.runPostServerConfig(fExistingServer, earProject);
- }
- }
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- stat = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(stat);
- return stat;
- }
-
- return stat;
- }
-
- public Status execute(Environment env) {
-
- if (projectName == null) {
- return new SimpleStatus("");
- }
-
- Status status = new SimpleStatus("");
- IServer[] servers = ServerCore.getServers();
- IServer existingServer = null;
- fExistingServer = null;
- for (int i=0; i<servers.length; i++)
- {
- IServer thisServer = (IServer)servers[i];
- IServerWorkingCopy wc = null;
- String thisServerId = null;
-
- if (thisServer!=null) {
- wc = thisServer.createWorkingCopy();
- thisServerId = (wc!=null ? wc.getId() : null);
- }
- if (thisServerId.equals(existingServerId)) {
- existingServer = thisServer;
- }
- }
- if (isServiceProjectEJB_)
- {
- CreateEJBProjectCommand c = new CreateEJBProjectCommand();
- c.setEjbProjectName(projectName);
- c.setEarProjectName(earProjectName);
- c.setServiceExistingServer(existingServer);
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- status = c.execute(env);
- }
- else
- {
- CreateWebProjectCommand c = new CreateWebProjectCommand();
- c.setProjectName(projectName);
- c.setEarProjectName(earProjectName);
- c.setExistingServer(existingServer);
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- c.setNeedEAR(needEAR_);
- c.setAddedProjectToServer(addedProjectToServer_);
- status = c.execute(env);
- }
-
- try {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = null;
- if (earProjectName!=null && earProjectName.length()>0)
- {
- earProject = root.getProject(earProjectName);
- }
-
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer.getServerType().getId());
- startServerCommand.runPreServerConfig(existingServer, earProject);
- fExistingServer = existingServer;
- }
- catch (CoreException ce ) {
- IStatus embeddedStatus = ce.getStatus();
- status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // Start server if req'd
-// IServerWorkingCopy wc = fExistingServer.createWorkingCopy();
-// if (wc!=null){
-// try {
-// Object x = fExistingServer.getAdapter(IRunningActionServer.class);
-// if (x!=null && x instanceof IRunningActionServer) {
-// int state = fExistingServer.getServerState();
-// if (state == IServer.STATE_STOPPED || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// fExistingServer.synchronousStart(mode, EnvironmentUtils.getIProgressMonitor(env));
-// }
-// }
-// }
-// catch (CoreException cex) {
-// IStatus embeddedStatus = cex.getStatus();
-// status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
-// env.getStatusHandler().reportError(status);
-// return status;
-// }
-// }
-
-
-
- return status;
-
- }
-
- /**
- * @param earProjectName The earProjectName to set.
- * @todo Generated comment
- */
- public void setEarProjectName(String earProjectName) {
-
- this.earProjectName = earProjectName;
- }
-
- public void setExistingServerId(String existingServerId)
- {
- this.existingServerId = existingServerId;
- }
- /**
- * @param projectName The projectName to set.
- * @todo Generated comment
- */
- public void setProjectName(String projectName) {
-
- this.projectName = projectName;
- }
- /**
- * @param requiresEJB The requiresEJB to set.
- * @todo Generated comment
- */
- public void setRequiresEJB(boolean requiresEJB) {
-
- this.requiresEJB = requiresEJB;
- }
- /**
- * @param requiresWeb The requiresWeb to set.
- * @todo Generated comment
- */
- public void setRequiresWeb(boolean requiresWeb) {
-
- this.requiresWeb = requiresWeb;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-
- public void setNeedEAR(boolean needEAR)
- {
- needEAR_ = needEAR;
- }
-
- public void setIsServiceProjectEJB(boolean isServiceProjectEJB)
- {
- this.isServiceProjectEJB_ = isServiceProjectEJB;
- }
-
-
- public void setAddedProjectToServer(boolean addedProjectToServer)
- {
- addedProjectToServer_ = addedProjectToServer;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java
deleted file mode 100644
index f06a87e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateWebProjectCommand.java
+++ /dev/null
@@ -1,530 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class CreateWebProjectCommand extends SimpleCommand {
-
- private final static String DESCRIPTION = "TASK_DESC_CREATE_WEB_PROJECT";
- private final static String LABEL = "TASK_LABEL_CREATE_WEB_PROJECT";
- private final String DEFAULT_EAR_NAME = "WebServiceEAR";
- private String projectName_ = null;
- private String earProjectName_ = null;
- private boolean proxyCodegenEnabled = true;
- private String serverFactoryId_;
- private String j2eeVersion_;
- private IServer existingServer_;
- private boolean needEAR_;
- private boolean weAddedProjectToServer_ = false;
- private MessageUtils msgUtils_;
-
- /**
- * Default CTOR
- */
- public CreateWebProjectCommand() {
-
- super(LABEL, DESCRIPTION);
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils( pluginId + ".plugin", this );
- //setRunInWorkspaceModifyOperation(false);
- }
-
- /**
- * Create service Web Project using the parameter Project name Note: to be
- * deprecated
- */
- public CreateWebProjectCommand(String serviceProjectName) {
-
- super(LABEL, DESCRIPTION);
- projectName_ = serviceProjectName;
- //setRunInWorkspaceModifyOperation(false);
- }
-
- public Status execute(Environment env) {
-
- if (projectName_ == null || projectName_.length() == 0) {
- env.getLog().log(Log.ERROR, 5044, this, "execute", "Web project name not set");
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- if (existingServer_ == null)
- {
- env.getLog().log(Log.ERROR, 5044, this, "execute", "Server is null");
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, null);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject webProject = root.getProject(projectName_);
- IProject earProject = null;
- if (earProjectName_!=null && earProjectName_.length()>0)
- {
- earProject = root.getProject(earProjectName_);
- }
-
- boolean projectExists = webProject != null && webProject.exists();
- boolean addedToServer = false;
- if (projectExists)
- {
- addedToServer = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(webProject), new NullProgressMonitor());
- }
-
- boolean earExists = earProject!=null && earProject.exists();
- boolean earAddedToServer = true;
- if (earExists)
- {
- earAddedToServer = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(earProject), new NullProgressMonitor());
- }
-
- boolean areAssociated = false;
- if (projectExists && earExists)
- {
- areAssociated = J2EEUtils.isEARAssociated(webProject, earProject);
- }
-
- boolean serverRequiresEARRemoval = true;
- try
- {
- // check the Registry to see if the server requires EAR removal
- if (serverFactoryId_!=null)
- {
- WebServiceStartServerRegistry wssReg = WebServiceStartServerRegistry.getInstance();
- serverRequiresEARRemoval = wssReg.isRemoveEARRequired(serverFactoryId_);
- }
- } catch (CoreException ce)
- {
- env.getLog().log(Log.ERROR, 5046, this, "execute", ce);
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, ce);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- if (!needEAR_ && projectExists && addedToServer && !weAddedProjectToServer_)
- {
- return new SimpleStatus("");
- }
-
- // existing project, ear and server configuration
- if (needEAR_ && projectExists && earExists && earAddedToServer && areAssociated && !weAddedProjectToServer_){
- return new SimpleStatus("");
- }
-
- //Always stop the server
- Status stoppingStatus = stopServer(env);
- if(stoppingStatus.getSeverity() == Status.ERROR)
- return stoppingStatus;
-
- if (!needEAR_ && projectExists && addedToServer)
- {
- return new SimpleStatus("");
- }
- else if (!needEAR_ && projectExists && !addedToServer)
- {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- else if (!needEAR_ && !projectExists)
- {
- Status status = createWebProject(env);
- if(status.getSeverity() == Status.ERROR)
- return status;
- webProject = root.getProject(projectName_);
-
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- else if (projectExists && earExists && areAssociated && addedToServer)
- {
- return new SimpleStatus("");
- }
- else if (projectExists && earExists && areAssociated && !addedToServer)
- {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- else if (projectExists && !earExists)
- {
- //Create the EAR project
- Status status = createEARProject(env);
- if (status.getSeverity() == Status.ERROR)
- return status;
- earProject = root.getProject(earProjectName_);
-
- //Associate the Web project and the EAR project
- J2EEUtils.associateWebProject(webProject, earProject);
-
- //Add to server
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- else if (!projectExists && !earExists)
- {
- //Create EAR
- Status status = createEARProject(env);
- if (status.getSeverity() == Status.ERROR)
- return status;
- earProject = root.getProject(earProjectName_);
-
- //Create project
- status = createWebProject(env);
- if(status.getSeverity() == Status.ERROR)
- return status;
- webProject = root.getProject(projectName_);
-
- //Add to server
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- else if (!projectExists && earExists)
- {
- //Remove the ear from the server if necessary
- if (earAddedToServer && serverRequiresEARRemoval)
- {
- // Stopping server and removing EAR from Server
- if (existingServer_.getServerState() != IServer.STATE_STOPPED)
- {
- existingServer_.synchronousStop(false);
- }
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
-
- //Create the Web project
- Status status = createWebProject(env);
- if(status.getSeverity() == Status.ERROR)
- return status;
- webProject = root.getProject(projectName_);
-
- boolean earAddedToServerFinal = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(earProject), new NullProgressMonitor());
- if (!earAddedToServerFinal)
- {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
-
- }
- else if (projectExists && earExists && !areAssociated)
- {
- //Remove the ear from the server if necessary
- if (earAddedToServer && serverRequiresEARRemoval)
- {
- // Stopping server and removing EAR from Server
- if (existingServer_.getServerState() != IServer.STATE_STOPPED)
- {
- existingServer_.synchronousStop(false);
- }
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(earProject), false, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
-
- //Associate the Web project and the EAR project
- J2EEUtils.associateWebProject(webProject, earProject);
-
- boolean earAddedToServerFinal = ServerUtil.containsModule(existingServer_,ResourceUtils.getModule(earProject), new NullProgressMonitor());
- if (!earAddedToServerFinal)
- {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, existingServer_, ResourceUtils.getModule(webProject) , true, new NullProgressMonitor());
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
-
- }
-
- return new SimpleStatus("");
- }
-
- private Status createWebProject(Environment env)
- {
- try
- {
-
- IDataModel projectInfo = DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider());
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.PROJECT_NAME, projectName_);
- String finalJ2EEVersion = null;
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_));
- finalJ2EEVersion = j2eeVersion_;
- }
- else
- {
- if (earProjectName_ !=null && earProjectName_.length()>0)
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = root.getProject(earProjectName_);
- if (earProject != null && earProject.exists())
- {
- EARNatureRuntime ear = EARNatureRuntime.getRuntime(earProject);
- int earVersion = ear.getJ2EEVersion();
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(earVersion));
- finalJ2EEVersion = String.valueOf(earVersion);
- }
- else
- {
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- }
- }
- else
- {
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID));
- finalJ2EEVersion = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- }
-
- }
- String runtimeTargetId = null;
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
-// TODO - Add this logic to FlexibleProjectCreationDataModel, and op....
-// runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_,IServerTargetConstants.WEB_TYPE, finalJ2EEVersion);
-// projectInfo.setProperty(WebComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
-// projectInfo.setProperty(WebComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
-
- if (earProjectName_ !=null && earProjectName_.length()>0)
- {
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.EAR_COMPONENT_NAME, earProjectName_);
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.TRUE);
- }
- else
- {
- projectInfo.setProperty(IWebComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE);
- }
-
-
-
- //Create and run the operation
- IDataModelOperation op = projectInfo.getDefaultOperation();
- op.execute(new NullProgressMonitor(), null);
- return new SimpleStatus("");
- } catch (Exception e)
- {
- env.getLog().log(Log.ERROR, 5046, this, "createWebProject", e);
- Status status = new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- private Status createEARProject(Environment env)
- {
- CreateEARProjectCommand t = new CreateEARProjectCommand();
- t.setEarProjectName(earProjectName_);
- t.setServerFactoryId(serverFactoryId_);
- t.setJ2EEVersion(j2eeVersion_);
- Status status = t.execute(env);
- return status;
- }
-
- private Status stopServer(Environment env)
- {
-
- try
- {
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- AbstractStartServer startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(existingServer_.getServerType().getId());
- startServerCommand.stopServer(existingServer_);
- return new SimpleStatus("");
- }
- catch (CoreException ce )
- {
- IStatus embeddedStatus = ce.getStatus();
- Status status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-
- }
-
- // To be deprecated
- /*
- private Status createWebProject(String webProjectName, String earProjectName, Environment env) {
-
- try {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- IProject earProject = root.getProject(earProjectName);
- if (earProject != null && !earProject.exists()) {
- CreateEARProjectCommand c = new CreateEARProjectCommand();
- c.setEarProjectName(earProjectName);
- c.setServerFactoryId(serverFactoryId_);
- c.setJ2EEVersion(j2eeVersion_);
- c.execute(env);
- earProject = root.getProject(earProjectName);
- }
- IProject webProject = root.getProject(webProjectName);
- if (webProject != null && !webProject.exists()) {
- WebComponentCreationDataModel info = new WebComponentCreationDataModel();
- info.setProperty(WebComponentCreationDataModel.PROJECT_NAME, webProjectName);
- info.setProperty(WebComponentCreationDataModel.EAR_PROJECT_NAME, earProjectName);
- //info.setProperty(WebComponentCreationDataModel.ADD_TO_EAR, Boolean.TRUE);
- info.setProperty(WebComponentCreationDataModel.ADD_TO_EAR, Boolean.FALSE);
- if (serverFactoryId_!=null && serverFactoryId_.length()>0)
- {
- String runtimeTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serverFactoryId_);
- info.setProperty(WebComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId );
- info.setProperty(WebComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE);
- }
- if (j2eeVersion_ != null && j2eeVersion_.length()>0)
- {
- info.setProperty(WebComponentCreationDataModel.J2EE_VERSION, new Integer(j2eeVersion_));
- }
-
- WebProjectCreationOperation operation = new WebProjectCreationOperation(info);
- operation.run(new NullProgressMonitor());
- }
- }
- catch (java.lang.reflect.InvocationTargetException ite) {
- return new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR,
- ite);
- }
- catch (InterruptedException ie) {
- return new SimpleStatus(WebServiceConsumptionPlugin.ID, msgUtils_.getMessage("MSG_ERROR_WEB_PROJECT_CREATE"), Status.ERROR,
- ie);
- }
- return new SimpleStatus("");
- }
- */
-
- private String getNewEARName() {
-
- String newEARName = DEFAULT_EAR_NAME;
- //Check to see if it exists
- IProject project = ResourceUtils.getWorkspace().getRoot().getProject(newEARName);
- return newEARName;
- }
-
-
- private IProject getDefaultEARProject(IProject project) {
-
- try {
- EARNatureRuntime[] ears = null;
- EARNatureRuntime ear = null;
- ears = J2EEProjectUtilities.getReferencingEARProjects(project);
- if (ears[0] != null && ears.length >= 1) {
- // found an EAR containing the web project
- return ears[0].getProject();
- }
-
- if (j2eeVersion_!=null && j2eeVersion_.length()>0)
- {
- ear = J2EEUtils.getEAR(Integer.parseInt(j2eeVersion_));
- }
- else
- {
- ear = J2EEUtils.get12EAR();
- if (ear == null)
- ear = J2EEUtils.get13EAR();
- if (ear == null)
- ear = J2EEUtils.getEAR(J2EEVersionConstants.J2EE_1_4_ID);
- }
-
- if (ear != null)
- return ear.getProject();
- else {
- String earName = getNewEARName();
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- return root.getProject(earName);
- }
- }
- catch (Exception e) {
- return null;
- }
-
- }
-
- /**
- * @param earProjectName
- * The earProjectName to set.
- */
- public void setEarProjectName(String earProjectName) {
-
- this.earProjectName_ = earProjectName;
- }
-
- /**
- * @param projectName
- * The projectName to set.
- */
- public void setProjectName(String projectName) {
-
- this.projectName_ = projectName;
- }
-
- /**
- * @param existingServer
- * The existingServer to set.
- */
- public void setExistingServer(IServer existingServer) {
-
- this.existingServer_ = existingServer;
- }
-
- public void setServerFactoryId(String serverFactoryId)
- {
- serverFactoryId_ = serverFactoryId;
- }
-
- public void setJ2EEVersion(String j2eeVersion)
- {
- j2eeVersion_ = j2eeVersion;
- }
-
- public void setNeedEAR(boolean needEAR)
- {
- needEAR_ = needEAR;
- }
-
- public void setAddedProjectToServer(boolean addedProjectToServer)
- {
- weAddedProjectToServer_ = addedProjectToServer;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
deleted file mode 100644
index e9c4059..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class DisableBuildCommand extends SimpleCommand
-{
- private MessageUtils msgUtils_;
- private Model model_;
- private ValidationManager manager_;
- private String LABEL = "TASK_LABEL_WEBSERVICE_DISABLE_BUILD";
- private String DESCRIPTION = "TASK_DESC_WEBSERVICE_DISABLE_BUILD";
- /**
- * CTOR;
- */
- public DisableBuildCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- setName(msgUtils_.getMessage(LABEL));
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
-
- env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_DISABLE_BUILD"));
-
- if (manager_!=null) {
- manager_.disableAutoBuild();
- }
- return status;
- }
-
- /**
- * Set the model
- *
- * @param model
- */
- public void setModel(Model model) {
- this.model_ = model;
- }
-
-
- /**
- * @param manager_ The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
deleted file mode 100644
index 26da64c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class DisableValidationCommand extends SimpleCommand {
-
- private MessageUtils msgUtils_;
- private ValidationManager manager_;
- private IProject serviceProject_;
- private String LABEL = "TASK_LABEL_WEBSERVICE_DISABLE_VALIDATION";
- private String DESCRIPTION = "TASK_DESC_WEBSERVICE_DISABLE_VALIDATION";
-
- /**
- * CTOR;
- */
- public DisableValidationCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- setName(msgUtils_.getMessage(LABEL));
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env) {
- Status status = new SimpleStatus("");
-
- env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_DISABLE_VALIDATION"));
-
- IProject project = serviceProject_;
- if (project != null) manager_.disableValidationForProject(project);
-
- return status;
- }
-
- /**
- * @param manager_
- * The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-
- public void setServiceProject(IProject serviceProject){
- this.serviceProject_ = serviceProject;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
deleted file mode 100644
index e9ed0b4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-// TODO: Get rid of this. A replacement is in org.eclipse.wst.ws.
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy;
-import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore;
-import org.eclipse.wst.server.core.util.SocketUtil;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-public class GetMonitorCommand extends SimpleCommand
-{
- private boolean monitorService;
- private boolean create;
- private WebServicesParser webServicesParser;
- private String wsdlURI;
- private List endpoints;
-
- public GetMonitorCommand()
- {
- super("org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand", "org.eclipse.jst.ws.internal.consumption.command.common.GetMonitorCommand");
- monitorService = true;
- create = true;
- }
-
- public Status execute(Environment env)
- {
- endpoints = new Vector();
- if (monitorService && webServicesParser != null && wsdlURI != null && wsdlURI.length() > 0)
- {
- Definition definition = webServicesParser.getWSDLDefinition(wsdlURI);
- if (definition != null)
- {
- Map services = definition.getServices();
- for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();)
- {
- Service service = (Service)servicesIt.next();
- Map ports = service.getPorts();
- for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();)
- {
- Port wsdlPort = (Port)portsIt.next();
- List extElements = wsdlPort.getExtensibilityElements();
- for (Iterator extElementsIt = extElements.iterator(); extElementsIt.hasNext();)
- {
- ExtensibilityElement extElement = (ExtensibilityElement)extElementsIt.next();
- String endpoint = null;
- URL endpointURL = null;
- if (extElement instanceof SOAPAddress)
- endpoint = ((SOAPAddress)extElement).getLocationURI();
- else if (extElement instanceof HTTPAddress)
- endpoint = ((HTTPAddress)extElement).getLocationURI();
- if (endpoint != null)
- {
- try
- {
- endpointURL = new URL(endpoint);
- }
- catch (MalformedURLException murle)
- {
- }
- }
- if (endpointURL != null)
- {
- String protocol = endpointURL.getProtocol();
- String host = endpointURL.getHost();
- int port = endpointURL.getPort();
- if (port == -1)
- {
- if ("http".equalsIgnoreCase(protocol))
- port = 80;
- else if ("https".equalsIgnoreCase(protocol))
- port = 443;
- }
- if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1)
- {
- IMonitor m = null;
- IMonitor[] monitors = MonitorCore.getMonitors();
- for (int i=0; i<monitors.length; i++)
- {
- if (host.equalsIgnoreCase(monitors[i].getRemoteHost()) && port == monitors[i].getRemotePort())
- {
- m = monitors[i];
- break;
- }
- }
- if (m == null && create)
- {
- int monitoredPort = SocketUtil.findUnusedPort(5000, 15000);
- IMonitorWorkingCopy monitorWorkingCopy = MonitorCore.createMonitor();
- monitorWorkingCopy.setLocalPort(monitoredPort);
- monitorWorkingCopy.setRemoteHost(host);
- monitorWorkingCopy.setRemotePort(port);
- monitorWorkingCopy.setProtocol("HTTP");
- try
- {
- m = monitorWorkingCopy.save();
- }
- catch (Throwable t)
- {
- Status warning = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[]{String.valueOf(port), endpoint}), Status.WARNING, t);
- try
- {
- if (env != null)
- env.getStatusHandler().report(warning);
- }
- catch (StatusException se)
- {
- }
- }
- }
- if (m != null)
- {
- try
- {
- if (!m.isRunning())
- m.start();
- StringBuffer sb = new StringBuffer(endpointURL.getProtocol());
- sb.append("://localhost:");
- sb.append(String.valueOf(m.getLocalPort()));
- sb.append(endpointURL.getFile());
- endpoints.add(sb.toString());
- }
- catch (Throwable t)
- {
- Status warning = new SimpleStatus(WebServiceConsumptionPlugin.ID, WebServiceConsumptionPlugin.getMessage("MSG_ERROR_UNABLE_TO_START_MONITOR", new Object[]{String.valueOf(port), endpoint}), Status.WARNING, t);
- try
- {
- if (env != null)
- env.getStatusHandler().report(warning);
- }
- catch (StatusException se)
- {
- }
- }
- }
- }
- }
- }
- }
- }
- }
- }
- return new SimpleStatus("");
- }
-
- public void setMonitorService(boolean monitorService)
- {
- this.monitorService = monitorService;
- }
-
- public void setDefinition(Definition definition)
- {
- }
-
- public void setWebServicesParser(WebServicesParser webServicesParser)
- {
- this.webServicesParser = webServicesParser;
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setCreate(boolean create)
- {
- this.create = create;
- }
-
- public List getEndpoints()
- {
- return endpoints;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
deleted file mode 100644
index 9e86fed..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-
-//core stuff
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* This class is to be used to Build the data model
-* first we get the java class and then build the model
-*/
-public class JavaMofReflectionCommand extends SimpleCommand
-{
-
- public static String LABEL = "JavaMofReflectionCommand";
- public static String DESCRIPTION = "reflection for a given class";
- public static String OK_MESSAGE = "The model has been built ";
- private static String JAVA_EXTENSION = ".java";
- private static String CLASS_EXTENSION = ".class";
- private MessageUtils msgUtils_;
-
- private String clientProject;
- private ResourceSet resourceSet;
- private JavaHelpers javaClass;
- private String qname;
- private String proxyBean;
- private IProject clientIProject;
-
- /**
- * Constructs a new JavaMofReflectionCommand with the given label and description
- *
- */
- public JavaMofReflectionCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- // setters for this command
-
-
- /**
- * The end result of this whole process is to get the Java Class
- */
- public JavaHelpers getJavaClass()
- {
- return javaClass;
- }
-
-
- private void processQName()
- {
- qname = proxyBean;
- if (qname.toLowerCase().endsWith(JAVA_EXTENSION)) {
- qname = qname.substring(0,(qname.length() -5));
- }
- if (qname.toLowerCase().endsWith(CLASS_EXTENSION)) {
- qname = qname.substring(0,(qname.length() -6));
- }
- }
-
- /**
- * Get the java model from the resource then
- * build the model from the mof
- */
- public Status execute(Environment env)
- {
- //just make sure the project and qname are there
- //they are essential for this operation
- Status status = new SimpleStatus("");
- IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject);
- processQName();
- if(clientProject == null || qname == null)
- return new SimpleStatus(WebServiceConsumptionPlugin.ID,WebServiceConsumptionPlugin.getMessage("%MSG_WARN_UNABLE_TO_FIND_PROXY"),Status.WARNING);
-
- JavaEMFNature nature = (JavaEMFNature)JavaEMFNature.getRuntime(clientIProject);
- if(nature == null){
- try{
- nature = (JavaEMFNature)JavaEMFNature.createRuntime(clientIProject);
- }catch(CoreException exc){}
- }
- resourceSet = nature.getResourceSet();
- javaClass = (JavaHelpers)JavaClassImpl.reflect(qname, resourceSet);
-
- return status;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
deleted file mode 100644
index 702f617..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-/**
- * @author sengpl
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class ManageServerStartUpCommand extends SimpleCommand {
-
- private java.lang.String DESCRIPTION = "Start Web Project";
- private java.lang.String LABEL = "ServerStartUpManager";
- private MessageUtils msgUtils_;
-
- private Boolean isStartServiceEnabled_;
- private Boolean isTestServiceEnabled_;
-
- private IProject serviceProject_;
- private String serviceServerTypeId_;
- private IServer serviceExistingServer_;
-
- private IProject sampleProject_;
- private String sampleServerTypeId_;
- private IServer sampleExistingServer_;
-
- private boolean isWebProjectStartupRequested_;
- private String moduleName_;
-
- /**
- * Default CTOR;
- */
- public ManageServerStartUpCommand( String moduleName ) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- moduleName_ = moduleName;
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus( "" );
- env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_START_WEB_PROJECT"));
-
- if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){
- //System.out.println("Calling service server start: "+serviceProject_+" "+serviceServerTypeId_);
- StartProjectCommand spc = new StartProjectCommand( moduleName_ );
- spc.setServiceProject(serviceProject_);
- spc.setServiceServerTypeID(serviceServerTypeId_);
- spc.setServiceExistingServer(serviceExistingServer_);
- spc.setIsWebProjectStartupRequested(isWebProjectStartupRequested_);
- spc.execute(env);
- }
-
- if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){
- //System.out.println("Calling client server start: "+sampleProject_+" "+sampleExistingServer__);
- StartProjectCommand spc = new StartProjectCommand( moduleName_ );
- spc.setSampleProject(sampleProject_);
- spc.setSampleServerTypeID(sampleServerTypeId_);
- spc.setSampleExistingServer(sampleExistingServer_);
- spc.setCreationScenario(new Boolean("false"));
- spc.execute(env);
- }
-
- return status;
- }
-
- /**
- * @param isStartServiceEnabled The isStartServiceEnabled to set.
- */
- public void setStartService(Boolean isStartServiceEnabled) {
- this.isStartServiceEnabled_ = isStartServiceEnabled;
- }
- /**
- * @param isTestServiceEnabled The isTestServiceEnabled to set.
- */
- public void setTestService(Boolean isTestServiceEnabled) {
- this.isTestServiceEnabled_ = isTestServiceEnabled;
- }
- /**
- * @param serviceExistingServer The serviceExistingServer to set.
- */
- public void setServiceExistingServer(IServer serviceExistingServer) {
- this.serviceExistingServer_ = serviceExistingServer;
- }
-
- /**
- * @param serviceServerTypeId The serviceServerTypeId to set.
- */
- public void setServiceServerTypeId(String serviceServerTypeId) {
- this.serviceServerTypeId_ = serviceServerTypeId;
- }
- /**
- * @param serviceProject The serviceProject to set.
- */
- public void setServiceProject(IProject serviceProject) {
- this.serviceProject_ = serviceProject;
- }
-
- /**
- * @param sampleExistingServer The sampleExistingServer to set.
- */
- public void setSampleExistingServer(IServer sampleExistingServer) {
- this.sampleExistingServer_ = sampleExistingServer;
- }
- /**
- * @param sampleProject The sampleProject to set.
- */
- public void setSampleProject(IProject sampleProject) {
- this.sampleProject_ = sampleProject;
- }
- /**
- * @param sampleServerTypeId The sampleServerTypeId to set.
- */
- public void setSampleServerTypeId(String sampleServerTypeId) {
- this.sampleServerTypeId_ = sampleServerTypeId;
- }
-
- /**
- * @param isRestartProjectNeeded The isRestartProjectNeeded to set.
- */
- public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) {
- this.isWebProjectStartupRequested_ = isRestartProjectNeeded;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
deleted file mode 100644
index 8a8c14f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class PublishProjectCommand extends SimpleCommand {
-
-private java.lang.String DESCRIPTION = "Publish Web Project";
-private java.lang.String LABEL = "PublishProjectCommand";
-private MessageUtils msgUtils_;
-
-private String project;
-private String serverTypeID;
-private IServer existingServer;
-
-
-/**
- * Default CTOR;
- */
-public PublishProjectCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- //TODO setRunInWorkspaceModifyOperation(false);
-}
-
-/**
- * Execute the command
- */
-public Status execute(Environment env)
-{
-
- Status status = new SimpleStatus("");
- try
- {
- env.getProgressMonitor().report( msgUtils_.getMessage( "PROGRESS_INFO_PUBLISH_WEB_PROJECT" ) );
-
- if (project == null){
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IProject iProject = (IProject)ResourceUtils.findResource(project);
- IServer instance = ServerUtils.getServerForModule(ResourceUtils.getModule(iProject), serverTypeID, existingServer, true, EnvironmentUtils.getIProgressMonitor(env));
- if (instance == null)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- IStatus returnedStatus = instance.publish(IServer.PUBLISH_INCREMENTAL, EnvironmentUtils.getIProgressMonitor(env));
- status = EnvironmentUtils.convertIStatusToStatus(returnedStatus);
-
- //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor()));
- env.getLog().log(Log.OK, 5026, this, "execute", new String("project="+project+" successfully published"));
- //Log.write(PublishProjectCommand.class,"execute",Log.OK,"project="+project+" successfully published");
- return status;
- }
- catch (Exception e) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_PUBLISH"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
-
- }
-}
-
-
-public void setProject(String project)
-{
- this.project = project;
-}
-
-public void setServerTypeID(String serverTypeID)
-{
- this.serverTypeID = serverTypeID;
-}
-
-public void setExistingServer(IServer existingServer)
-{
- this.existingServer = existingServer;
-}
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
deleted file mode 100644
index 1582613..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class RestoreBuildStateCommand extends SimpleCommand
-{
-
- private MessageUtils msgUtils_;
- private ValidationManager manager_;
-
- private String LABEL = "TASK_LABEL_WEBSERVICE_RESTORE_BUILD";
- private String DESCRIPTION = "TASK_DESC_WEBSERVICE_RESTORE_BUILD";
- /**
- * Default CTOR;
- */
- public RestoreBuildStateCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- setName(msgUtils_.getMessage(LABEL));
- setDescription(msgUtils_.getMessage(DESCRIPTION));
-
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env)
- {
- env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_RESTORE_BUILD"));
-
- manager_.restoreAutoBuild();
-
- return new SimpleStatus("");
- }
-
- /**
- * @param manager_ The manager_ to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
deleted file mode 100644
index 04f54fa..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-
-import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class RestoreValidationStateCommand extends SimpleCommand
-{
- private MessageUtils msgUtils_;
- private ValidationManager manager_;
-
- private String LABEL = "TASK_LABEL_WEBSERVICE_RESTORE_VALIDATION";
- private String DESCRIPTION = "TASK_DESC_WEBSERVICE_RESTORE_VALIDATION";
-
- private boolean runValidation_;
-
- /**
- * Default CTOR;
- */
- public RestoreValidationStateCommand( boolean runValidation )
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
-
- setName(msgUtils_.getMessage(LABEL));
- setDescription(msgUtils_.getMessage(DESCRIPTION));
- runValidation_ = runValidation;
- }
-
- /**
- * Execute the command
- */
- public Status execute(Environment env)
- {
- env.getProgressMonitor().report(msgUtils_.getMessage("TASK_DESC_WEBSERVICE_RESTORE_VALIDATION"));
-
- manager_.restoreValidationForProjects( runValidation_ );
-
- return new SimpleStatus("");
- }
-
- /**
- * @param manager The validation manager to set.
- */
- public void setValidationManager(ValidationManager manager) {
- this.manager_ = manager;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerDeployableConfigurationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerDeployableConfigurationCommand.java
deleted file mode 100644
index 31779ce..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ServerDeployableConfigurationCommand.java
+++ /dev/null
@@ -1,233 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerUtil;
-
-public class ServerDeployableConfigurationCommand extends SimpleCommand {
-
- private String LABEL = "ServerDeployableConfigurationCommand";
- private String DESCRIPTION = "Ensure Deployable is added to Server Configuration";
- private MessageUtils msgUtils_;
- private Boolean creationScenario_ = Boolean.TRUE;
- private TypeRuntimeServer clientIds_;
- private IProject serviceProject_;
- private IProject sampleProject_;
- private String serviceServerTypeID_;
- private String sampleServerTypeID_;
- private IServer serviceExistingServer_;
- private IServer sampleExistingServer_;
- private String serviceProjectURL_;
- private String sampleProjectURL_;
-
- //addedProjectToServer_ is set to true if
- //- the project exists AND
- //- the server exists (i.e. this command did not create it) AND
- //- this command added the project to the server
- private boolean addedProjectToServer_ = false;
-
- /**
- * Default CTOR
- */
- public ServerDeployableConfigurationCommand() {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
- /**
- * Default CTOR
- */
- public ServerDeployableConfigurationCommand(boolean creationScenario) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- creationScenario_ = new Boolean(creationScenario);
- }
-
- /**
- * execute
- */
- public Status execute(Environment env) {
-
- System.out.println("ServerDeployableConfigurationCommand");
- Status status = new SimpleStatus("");
- try {
-
- if (!(creationScenario_.booleanValue()) )
- return status;
-
- // determine client or service project
- IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
- if (project == null)
- return status;
-
- sampleServerTypeID_ = clientIds_.getServerId();
-
- // determine service or sample server factory Id
- String serverFactoryId = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
-
- // get an IServer object; either existing or create one
- IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);
- if (server != null) {
- // find exact server for given project
- IServer[] servers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- boolean foundServer = false;
- for (int i = 0; i < servers.length; i++) {
- if (servers[i].equals(server))
- foundServer = true;
- }
- if (!foundServer) {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- addedProjectToServer_ = true;
- }
- }
- else {
- if (!(creationScenario_.booleanValue()) && serviceServerTypeID_ == sampleServerTypeID_) //Client
- {
- server = serviceExistingServer_;
- }
- else {
- server = ServerUtils.getInstance().createServer(env, ResourceUtils.getModule(project), serverFactoryId, EnvironmentUtils.getIProgressMonitor(env));
- }
- if (server == null) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_CREATE_SERVER"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- // check if module is already associated
- IModule[] parentModules = server.getRootModules(ResourceUtils.getModule(project), null);
- if (parentModules!=null && parentModules.length!=0) {
- if (!ServerUtil.containsModule(server, ResourceUtils.getModule(project), null)) {
- Status mmStatus = ServerUtils.getInstance().modifyModules(env, server, ResourceUtils.getModule(project), true, EnvironmentUtils.getIProgressMonitor(env));
- if (mmStatus.getSeverity()==Status.ERROR)
- return mmStatus;
- }
- }
-
- }
-
- //
- String projectURL = ResourceUtils.getWebProjectURL(project, serverFactoryId, server);
- if (creationScenario_.booleanValue()) {
- serviceExistingServer_ = server;
- serviceProjectURL_ = projectURL;
- if (serviceServerTypeID_.equals(sampleServerTypeID_) && clientIds_.getServerInstanceId()==null){
- sampleExistingServer_ = serviceExistingServer_;
- }
- }
- else {
- sampleExistingServer_ = server;
- sampleProjectURL_ = projectURL;
- }
- return status;
- }
- catch (Exception e) {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_BAD_SERVER_CONFIG"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
-
- public void setServiceProject(IProject serviceProject) {
- serviceProject_ = serviceProject;
- }
-
- public void setSampleProject(IProject sampleProject) {
- sampleProject_ = sampleProject;
- }
-
- public void setServiceServerTypeID(String serviceServerTypeID) {
- serviceServerTypeID_ = serviceServerTypeID;
- }
-
- public void setSampleServerTypeID(String sampleServerTypeID) {
- sampleServerTypeID_ = sampleServerTypeID;
- }
-
- public void setServiceExistingServer(IServer serviceExistingServer) {
- serviceExistingServer_ = serviceExistingServer;
- }
-
- public IServer getServiceExistingServer() {
- return serviceExistingServer_;
- }
-
- public String getServiceExistingServerInstId() {
- String id = null;
- IServerWorkingCopy wc = null;
-
- if (serviceExistingServer_!=null){
- wc = serviceExistingServer_.createWorkingCopy();
- id = (wc!=null ? wc.getId() : null);
- }
-
- return id;
- }
-
- public String getSampleExistingServerInstId(){
- String id = null;
- IServerWorkingCopy wc = null;
- if (sampleExistingServer_!=null){
- wc = sampleExistingServer_.createWorkingCopy();
- id = (wc!=null ? wc.getId() : null);
- }
-
- return id;
-
- }
-
- public void setSampleExistingServer(IServer sampleExistingServer) {
- sampleExistingServer_ = sampleExistingServer;
- }
-
- public IServer getSampleExistingServer() {
- return sampleExistingServer_;
- }
-
- public String getServiceProjectURL() {
- return serviceProjectURL_;
- }
-
- public String getSampleProjectURL() {
- return sampleProjectURL_;
- }
-
- public void setClientTypeRuntimeServer(TypeRuntimeServer clientId){
- this.clientIds_ = clientId;
- }
-
- /**
- * @return Returns the addedProjectToServer_.
- */
- public boolean getAddedProjectToServer() {
- return addedProjectToServer_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
deleted file mode 100644
index c2d06c1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartProjectCommand extends SimpleCommand {
-
-private java.lang.String DESCRIPTION = "Start Web Project";
-private java.lang.String LABEL = "StartProjectCommand";
-private MessageUtils msgUtils_;
-
-private Boolean creationScenario_ = Boolean.TRUE;
-
-private boolean isWebProjectStartupRequested_;
-private IProject serviceProject_;
-private IProject sampleProject_;
-private String serviceServerTypeID_;
-private String sampleServerTypeID_;
-private IServer serviceExistingServer_;
-private IServer sampleExistingServer_;
-private String moduleName_;
-
-// rm private Model model_;
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand( String moduleName ) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- //TODO setRunInWorkspaceModifyOperation(false);
-
- moduleName_ = moduleName;
-}
-
-/**
- * Default CTOR;
- */
-public StartProjectCommand(boolean creationScenario ) {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
-
- //TODO setRunInWorkspaceModifyOperation(false);
- creationScenario_ = new Boolean(creationScenario);
-}
-
-/**
- * Execute the command
- */
-public Status execute(Environment env)
-{
-
-
- Status status = new SimpleStatus( "" );
- env.getProgressMonitor().report(msgUtils_.getMessage("PROGRESS_INFO_START_WEB_PROJECT"));
-
-
- IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_);
- String serverTypeID = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_);
- IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_);
- if (serverTypeID == null && server!=null) {
- serverTypeID = server.getServerType().getId();
- }
- if (project == null)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_PROJECT_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
- IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project, moduleName_), serverTypeID, server, true, EnvironmentUtils.getIProgressMonitor(env));
- if (instance == null)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- try
- {
- AbstractStartServer startServerCommand = null;
- WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance();
- startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(instance.getServerType().getId());
- startServerCommand.StartServer(project, instance, EnvironmentUtils.getIProgressMonitor(env), isWebProjectStartupRequested_);
- return status;
- }
- catch (CoreException ce )
- {
- IStatus embeddedStatus = ce.getStatus();
- status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- env.getStatusHandler().reportError(status);
- return status;
- }
- catch (Exception e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
-}
-
-public void setCreationScenario(Boolean creationScenario)
-{
- creationScenario_ = creationScenario;
-}
-
-public void setServiceProject(IProject serviceProject)
-{
- serviceProject_ = serviceProject;
-}
-
-public void setSampleProject(IProject sampleProject)
-{
- sampleProject_ = sampleProject;
-}
-
-public void setServiceServerTypeID(String serviceServerTypeID)
-{
- serviceServerTypeID_ = serviceServerTypeID;
-}
-
-public void setSampleServerTypeID(String sampleServerTypeID)
-{
- sampleServerTypeID_ = sampleServerTypeID;
-}
-
-public void setServiceExistingServer(IServer serviceExistingServer)
-{
- serviceExistingServer_ = serviceExistingServer;
- if (serviceExistingServer_ != null)
- setServiceServerTypeID(serviceExistingServer_.getServerType().getId());
-}
-
-public void setSampleExistingServer(IServer sampleExistingServer)
-{
- sampleExistingServer_ = sampleExistingServer;
- if (sampleExistingServer_ != null)
- setSampleServerTypeID(sampleExistingServer_.getServerType().getId());
-}
-
-public void setIsWebProjectStartupRequested(boolean webProjectStartupRequested)
-{
- isWebProjectStartupRequested_ = webProjectStartupRequested;
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
deleted file mode 100644
index f8137f5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartServerCommand.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-/**
- * (Re)Starts and publishes the server specifed by the serverInstanceId attribute.
- *
- *
- */
-public class StartServerCommand extends SimpleCommand
-{
- private java.lang.String DESCRIPTION = "(Re)Start and publish the server";
- private java.lang.String LABEL = "StartServerCommand";
- private MessageUtils msgUtils_;
- private IProgressMonitor monitor;
- private Log log;
-
- private String serverInstanceId;
-
-
- public StartServerCommand()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- log = new EclipseLog();
- }
-
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
-
- IServer server = ServerCore.findServer(serverInstanceId);
- if (server == null)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_INSTANCE_NOT_FOUND"), Status.ERROR);
- env.getStatusHandler().reportError(status);
- return status;
- }
-
- monitor = EnvironmentUtils.getIProgressMonitor(env);
- int serverState = server.getServerState();
- int publishState = server.getServerPublishState();
-
- //Publish if required
- switch (publishState)
- {
- case IServer.PUBLISH_STATE_INCREMENTAL:
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_INCREMENTAL);
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
- case IServer.PUBLISH_STATE_FULL:
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_FULL);
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
-
- case IServer.PUBLISH_STATE_UNKNOWN:
- if (server.canPublish().getSeverity() == IStatus.OK)
- {
- status = publish(server, IServer.PUBLISH_CLEAN);
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
-
- default:
- }
-
-
- switch (serverState)
- {
- case IServer.STATE_STOPPED:
- if (server.canStart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
- {
- status = start(server);
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- break;
- case IServer.STATE_STARTED:
- //Restart the server if needed
- if (publishState != IServer.PUBLISH_STATE_NONE && server.canRestart(ILaunchManager.RUN_MODE).getSeverity()==IStatus.OK)
- {
- status = restart(server);
- if (status.getSeverity() == Status.ERROR)
- {
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
-
- return status;
- }
-
- private Status publish(IServer server, int kind)
- {
- Status status = new SimpleStatus("");
- monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_PUBLISHING_SERVER"));
- IStatus istatus = server.publish(kind, monitor);
- if (istatus.getSeverity() != IStatus.OK)
- {
- status = EnvironmentUtils.convertIStatusToStatus(istatus);
- return status;
- }
- log.log(Log.INFO, 5051, this, "publishProject", "IServer=" + server + ", Publish command completed");
- return status;
- }
-
- private Status restart(IServer server)
- {
- Status status = new SimpleStatus("");
- try
- {
- monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_STARTING_SERVER"));
- server.synchronousRestart(ILaunchManager.RUN_MODE, monitor);
- log.log(Log.INFO, 5052, this, "execute", "IServer=" + server + ", Restart command completed");
- return status;
- } catch (CoreException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, e);
- return status;
- }
-
- }
-
- private Status start(IServer server)
- {
- Status status = new SimpleStatus("");
- try
- {
- monitor.subTask(msgUtils_.getMessage("PROGRESS_INFO_STARTING_SERVER"));
- server.synchronousStart(ILaunchManager.RUN_MODE, monitor);
- log.log(Log.INFO, 5053, this, "execute", "IServer=" + server + ", Start command completed");
- return status;
- } catch (CoreException e)
- {
- status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_SERVER"), Status.ERROR, e);
- return status;
- }
- }
-
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartTomcatServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartTomcatServer.java
deleted file mode 100644
index 508bc4d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartTomcatServer.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.command.common;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.wst.server.core.IServer;
-
-public class StartTomcatServer extends AbstractStartServer {
-
- protected void addJarsToClassPath(IServer tInstance) throws CoreException {
-
- }
-
- protected void validateRemoteServerPath(IServer server)
- throws CoreException {
- }
-
- public void stopServer(IServer server) throws CoreException {
-
- if (server != null) {
-
- if (server.getServerState() != IServer.STATE_STOPPED) {
- server.synchronousStop(false);
- }
- }
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
deleted file mode 100644
index 5c0328d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/FolderResourceFilter.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class FolderResourceFilter extends AnyFilter
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public FolderResourceFilter () { }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%FOLDER_FILTER_DESC");
- }
-
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FOLDER)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FOLDER",new Object[] {name}),
- null
- );
- }
- }
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
- private boolean acceptsName ( String name )
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
deleted file mode 100644
index fc1f1d9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/IServerDefaulter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-
-
-/**
- * Implement this interface to provide logic that can be plugged into
- * the server defaulting algorithm.
- * (See the org.eclipse.jst.ws.consumption.serverDefaulter extension point)
- */
-public interface IServerDefaulter
-{
-
- /**
- * @param project
- * @return ServerInfo.
- * If no existing server or server type is recommended, return null.
- * If a server type is recommended, return an instance of ServerInfo with a non-null
- * non-empty String for the serverFactoryId and null for the serverInstanceId.
- * If a server instance is recommended, return an instance of ServerInfo with a non-null
- * non-empty String for the serverFactoryId and the serverInstanceId.
- */
- public ServerInfo recommendDefaultServer(IProject project);
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
deleted file mode 100644
index fc44f91..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/JavaResourceFilter.java
+++ /dev/null
@@ -1,169 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class JavaResourceFilter extends AnyFilter
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept "<code>.java</code>", but not "<code>.class</code>", objects.
- */
- public static final byte JAVA_FILES = (byte)1;
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept "<code>.class</code>", but not "<code>.java</code>", objects.
- */
- public static final byte CLASS_FILES = (byte)2;
-
- /**
- * A <code>JavaResourceFilter</code> constructed with this value will
- * accept both "<code>.java</code>" and "<code>.class</code>" objects.
- */
- public static final byte ALL_FILES = (byte)255;
-
- private byte extensions_;
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public JavaResourceFilter ()
- {
- this(ALL_FILES);
- }
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" objects, "<code>.class</code>" objects,
- * or both if the value of <code>extensions</code> is
- * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}
- * respectively.
- * @param extensions One of
- * {@link #JAVA_FILES}, {@link #CLASS_FILES} or {@link #ALL_FILES}.
- */
- public JavaResourceFilter ( byte extensions )
- {
- extensions_ = extensions;
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_DESC");
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * See {@link Filter#statusOf} for general comments.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a Java resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!acceptsName(name))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%JAVA_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
- //
- // Checks if the given name is acceptable based upon its extension
- // and the value of the extensions_ bitmask.
- //
- private boolean acceptsName ( String name )
- {
- return (
- (name.endsWith(".java") && ((extensions_ & JAVA_FILES) != 0)) ||
- (name.endsWith(".class") && ((extensions_ & CLASS_FILES) != 0))
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
deleted file mode 100644
index 10650e5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/MappingUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-
-
-/**
-* This class contains useful methods for working with Server plugin functions
-*/
-public final class MappingUtils
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private static final String DEFAULT_SERVICE_EXT = "Service.wsdl";
- private static final String DEFAULT_BINDING_EXT = "Binding.wsdl";
- private static final String DEFAULT_V4_SERVICE_EXT = "-service.wsdl";
- private static final String DEFAULT_V4_BINDING_EXT = "-binding.wsdl";
- private static final String WSDL_EXTENSION = ".wsdl";
- private static final String WSDL_FOLDER = "wsdl";
- public static final String DEFAULT_SKELETON_PACKAGENAME = "service";
-
- /**
- * Returns the WSDL folder path
- * @param project the project
- */
- public static IPath getWSDLFolderPath (IProject project, String componentName)
- {
- IPath wsdlFolder=null;
-// IPath webModuleServerRoot = ResourceUtils.getWebModuleServerRoot( project ).getFullPath();
- IPath webModuleServerRoot = J2EEUtils.getWebContentPath(project, componentName);
- if (webModuleServerRoot != null )
- wsdlFolder = webModuleServerRoot.append(WSDL_FOLDER);
- return wsdlFolder;
- }
-
-
- /**
- * Returns the base name based on WSDL file name
- * @param wsdlName WSDL file name
- */
- public static String getBaseName (String wsdlLocation )
- {
- String wsdlName=wsdlLocation;
-
- int index = wsdlLocation.lastIndexOf('/');
- if (index!= -1) {
- wsdlName = wsdlLocation.substring(index+1,wsdlName.length());
- }
-
- String baseName=wsdlName;
- if ( wsdlName.endsWith(DEFAULT_SERVICE_EXT) ) {
- baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_SERVICE_EXT.length()));
- } else if ( wsdlName.toLowerCase().endsWith(DEFAULT_V4_SERVICE_EXT) ) {
- baseName = wsdlName.substring(0,(wsdlName.length() - DEFAULT_V4_SERVICE_EXT.length()));
- } else if (wsdlName.endsWith(DEFAULT_BINDING_EXT)) {
- baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_BINDING_EXT.length()));
- } else if (wsdlName.toLowerCase().endsWith(DEFAULT_V4_BINDING_EXT)) {
- baseName = wsdlName.substring(0,(wsdlName.length()-DEFAULT_V4_BINDING_EXT.length()));
- } else if (wsdlName.toLowerCase().endsWith(WSDL_EXTENSION)) {
- baseName = wsdlName.substring(0,(wsdlName.length() - WSDL_EXTENSION.length()));
- } else {
- // no recognizable suffix, just remove extension, if any
- int index4 = baseName.lastIndexOf('.');
- if (index4!=-1)
- baseName = baseName.substring(0, index4);
- }
- return baseName;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
deleted file mode 100644
index 146b2f1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/PropertiesResourceFilter.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a Java resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.java</code>" or "<code>.class</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class PropertiesResourceFilter extends AnyFilter
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructs a new <code>JavaResourceFilter</code> that filters
- * "<code>.java</code>" and "<code>.class</code>" objects.
- * Equivalent to <code>JavaResourceFilter(ALL_FILES)</code>.
- */
- public PropertiesResourceFilter ()
- {
-
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_DESC");
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * See {@link Filter#statusOf} for general comments.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a Java resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!name.endsWith(".properties"))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%PROPERTIES_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java
deleted file mode 100644
index 4691d2f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ScenarioCleanupCommand.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * This command is intended to clean up data after either the
- * client or service wizards. Currently is just resets the
- * parser factory.
- *
- */
-public class ScenarioCleanupCommand extends SimpleCommand
-{
-
- public Status execute(Environment environment)
- {
- WSDLParserFactory.killParser();
-
- return super.execute(environment);
- }
-
- public boolean isUndoable()
- {
- return true;
- }
-
-
- public Status undo(Environment environment)
- {
- // Even if the user cancels out of the wizard we want to
- // kill the parser.
- WSDLParserFactory.killParser();
-
- return super.undo(environment);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
deleted file mode 100644
index 0625cb2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/ServerInfo.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.consumption.common;
-
-/**
- *
- */
-public class ServerInfo
-{
- String serverFactoryId;
- String serverInstanceId;
- /**
- * @return Returns the serverFactoryId.
- */
- public String getServerFactoryId()
- {
- return serverFactoryId;
- }
- /**
- * @param serverFactoryId The serverFactoryId to set.
- */
- public void setServerFactoryId(String serverFactoryId)
- {
- this.serverFactoryId = serverFactoryId;
- }
- /**
- * @return Returns the serverInstanceId.
- */
- public String getServerInstanceId()
- {
- return serverInstanceId;
- }
- /**
- * @param serverInstanceId The serverInstanceId to set.
- */
- public void setServerInstanceId(String serverInstanceId)
- {
- this.serverInstanceId = serverInstanceId;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
deleted file mode 100644
index a6dd181..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLParserFactory.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser;
-
-/**
- *
- * The factory class can be used to get at a single instance of the
- * WSDL parser. Note: This class is temporary. We will probably come
- * up with a better method of handling passing around the parser.
- *
- */
-//TODO We need to find a better way to pass around the parser than
-// using this singleton factory. Hopefully, we can then delete
-// this class.
-public class WSDLParserFactory
-{
- private static WebServicesParserExt parser_;
-
- private WSDLParserFactory()
- {
- }
-
- public static WebServicesParser getWSDLParser()
- {
- if( parser_ == null )
- {
- parser_ = new WebServicesParserExt();
- }
-
- return parser_;
- }
-
- public static void killParser()
- {
- parser_ = null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
deleted file mode 100644
index 7872f6d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WSDLResourceFilter.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts only objects
-* which indicate a WSDL resource. In particular, any
-* {@link org.eclipse.core.resources.IResource} whose
-* pathname, or any object whose string representation as
-* returned by <code>toString()</code>, ends in
-* "<code>.wsdl</code>" will be accepted.
-* All other objects will be rejected.
-*/
-public class WSDLResourceFilter extends AnyFilter
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Constructs a new <code>WSDLResourceFilter</code>.
- */
- public WSDLResourceFilter ()
- {
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_DESC");
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * See {@link Filter#statusOf} for general comments.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * indicating whether or not if the given <code>object</code>
- * represents a WSDL resource.
- */
- public IStatus statusOf ( Object object )
- {
- if (object == null)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NULL_OBJECT"),
- null
- );
- }
-
- String name = null;
-
- if (object instanceof IResource)
- {
- IResource resource = (IResource)object;
- name = resource.getFullPath().toString();
- if (resource.getType() != IResource.FILE)
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%FILTER_MSG_ERROR_NOT_FILE",new Object[] {name}),
- null
- );
- }
- }
-
- if (name == null)
- {
- name = object.toString();
- }
-
- if (!name.endsWith(".wsdl"))
- {
- return new Status(
- IStatus.ERROR,
- WebServiceConsumptionPlugin.ID,
- 0,
- WebServiceConsumptionPlugin.getMessage("%WSDL_FILTER_MSG_ERROR_WRONG_EXTENSION",new Object[] {name}),
- null
- );
- }
-
- return new Status(IStatus.OK,WebServiceConsumptionPlugin.ID,0,"",null);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
deleted file mode 100644
index b03bf16..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/common/WebServiceStartServerRegistry.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.common;
-
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-
-
-/**
-* This is the registry of WebServiceStartServerType objects.
-*/
-public class WebServiceStartServerRegistry
-{
-
- private static WebServiceStartServerRegistry instance_;
- private Hashtable StartServerTypes;
-
- //
- // Loads WebServiceStartServerType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- StartServerTypes = new Hashtable();
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption",
- "webServiceStartServerType");
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- String factoryId_ = elem.getAttribute("factoryId");
- StartServerTypes.put(factoryId_, elem);
-
- }
- catch (Exception e)
- {
- EclipseLog log = new EclipseLog();
- log.log(Log.ERROR, 5047, this, "load", e);
- }
-
- }
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceStartServerRegistry object.
- */
- public static WebServiceStartServerRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new WebServiceStartServerRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- public Object getServerStartByTypeId (String typeID) throws CoreException
- {
- if (typeID==null)
- return null;
- return ((IConfigurationElement)StartServerTypes.get(typeID)).createExecutableExtension("class");
- }
-
- public boolean isRemoveEARRequired(String typeId) throws CoreException {
- if (typeId!=null) {
- IConfigurationElement elem = (IConfigurationElement)StartServerTypes.get(typeId);
- if (elem!=null){
- String value = elem.getAttribute("removeEAR");
- if (value!=null){
- return Boolean.valueOf(value).booleanValue();
- }
- }
- }
- return true;
- }
-}
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
deleted file mode 100644
index c07aa72..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayElement.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class ArrayElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static String ARRAY_NAME = "10101010array10101010";
- public static String REL_METHODS = "relmethods";
-
- /**
- * Constructor
- * @param projectElement The project this Bean belongs to.
- */
- public ArrayElement (String name)
- {
- this(name,new BasicModel("Project"),true);
- }
-
- /**
- * Constructor
- * @param parameterElement The parameter this Bean belongs to.
- */
- public ArrayElement (String name, Model model,boolean isRoot)
- {
- super(name,model,TypeElement.ARRAY);
- if(isRoot) model.setRootElement(this);
- fOwnerType = TypeElement.ROOT;
- }
-
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the bean element.
- */
- public ArrayElement ( ParameterElement parameterElement, String name)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public ArrayElement ( AttributeElement attributeElement, String name)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param FieldElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public ArrayElement ( FieldElement fieldElement, String name)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.ARRAY);
- fOwnerType = TypeElement.FIELD_OWNER;
- }
-
-
- /*
- * determine wether this is an object array or
- * primitive array
- */
- public String getTypeName()
- {
- return ARRAY_NAME + getName();
- }
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
deleted file mode 100644
index 3d8c7e4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ArrayType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class ArrayType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String fTypeName;
-
- /**
- *Constructor
- *
- */
- public ArrayType(String typeName)
- {
- this(TypeFactory.ARRAY_NAME,typeName);
- }
-
- public ArrayType(String name,String typeName)
- {
- super(name);
- fTypeName = typeName;
- }
-
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
-
- String nonBean = Generator.DOUBLE_TAB + "java.util.List list" + getUniqueName() + "= java.util.Arrays.asList(" + name + ");" +StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String temp"+ getUniqueName() +" = list" + getUniqueName() + ".toString();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
- return nonBean;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
deleted file mode 100644
index 720679f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElement.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class AttributeElement extends BasicElement implements AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_TYPE = "type";
- public static final String REL_OWNING_BEAN = "owningbean";
-
- private String fSetterMethod;
- private String fGetterMethod;
-
- /**
- * Constructor this takes the owning bean.
- * @param name The name of the attribute.
- * @param beanElement the bean that owns this attribute.
- */
- public AttributeElement ( BeanElement beanElement, String name)
- {
- super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_ATTRIBUTES);
- }
-
- public void setSetterMethod(String setterMethod)
- {
- fSetterMethod = setterMethod;
- }
-
- public String getSetterMethod()
- {
- return fSetterMethod;
- }
-
- public String getGetterMethod()
- {
- return fGetterMethod;
- }
-
- public void setGetterMethod(String getterMethod)
- {
- fGetterMethod = getterMethod;
- }
-
- public String getSetterSignature(String attribute)
- {
- int bracket = fSetterMethod.indexOf("(");
- bracket++;
- String setter = fSetterMethod.substring(0,bracket);
- String fullSetter = setter + attribute + ");";
-
- return fullSetter;
- }
-
- /**
- * Returns the Bean that owns this Attribute.
- * @return BeanElement The bean that owns this attribute.
- */
- public BeanElement getOwningBeanElement ()
- {
- Enumeration e = getElements(REL_OWNING_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns the type that is owned by this attributte.
- * @return TypeElement The Type that of this attribute.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
deleted file mode 100644
index 0b0b6fc..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/AttributeElementType.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public interface AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public void setSetterMethod(String setterMethod);
- public String getSetterMethod();
- public String getGetterMethod();
- public void setGetterMethod(String getterMethod);
- public BeanElement getOwningBeanElement ();
- public TypeElement getTypeElement ();
- /**
- * Return the signature with this value as the parmeter
- *
- */
- public String getSetterSignature(String attribute);
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
deleted file mode 100644
index 853da9c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanElement.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
-* Objects of this class represent a Java bean.
-* Nearest moral equivalents: java.lang.Class, java.beans.BeanDescriptor.
-*/
-public class BeanElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static String STATELESS_BEAN = "10101010statelessbean10101010";
- public static String REL_METHODS = "relmethods";
-
- /**
- * Constructor
- * @param projectElement The project this Bean belongs to.
- */
- public BeanElement (String name)
- {
- this(name,new BasicModel("Project"),true);
- }
-
- /**
- * Constructor
- * @param parameterElement The parameter this Bean belongs to.
- */
- public BeanElement (String name, Model model,boolean isRoot)
- {
- super(name,model,TypeElement.BEAN);
- if(isRoot) model.setRootElement(this);
- fOwnerType = TypeElement.ROOT;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the bean element.
- */
- public BeanElement ( ParameterElement parameterElement, String name)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public BeanElement ( AttributeElement attributeElement, String name)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
-
- }
-
- /**
- * Constructor for the case when this is not the root object
- * here it represents complex types
- * @param ParameterElement The Parameter that owns this bean type.
- * @param String Name of the ParameterElement.
- */
- public BeanElement ( FieldElement fieldElement, String name)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.BEAN);
- fOwnerType = TypeElement.FIELD_OWNER;
-
- }
-
- /**
- * Returns an enumeration of all Method objects of this Bean.
- * @return Enumeration All Method objects of this Bean.
- */
- public Enumeration getMethods ()
- {
- return getElements(REL_METHODS);
- }
-
- /**
- * Returns the number of Method objects of this Bean.
- * @return int The number of Method objects of this Bean.
- */
- public int getNumberOfMethodElements ()
- {
- return getNumberOfElements(REL_METHODS);
- }
-
- public String getTypeName()
- {
- if(isStateLess()) return STATELESS_BEAN + getName();
- return getName();
- }
-
- public boolean isStateLess()
- {
- Enumeration ea = getElements(TypeElement.REL_ATTRIBUTES);
- Enumeration ef = getElements(TypeElement.REL_FIELDS);
- if(ea.hasMoreElements() || ef.hasMoreElements()) return false;
- else return true;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
deleted file mode 100644
index 1ed7992..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BeanModelElementsFactory.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jst.ws.internal.consumption.sampleapp.common.SamplePropertyDescriptor;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class BeanModelElementsFactory
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- public static final String RETURN_PARAM_NAME="returnp";
-
- private BeanModelElementsFactory(){}
-
- public static Element getBeanModelElement(Object object)
- {
- return BeanModelElementsFactory.getBeanModelElement(object,null,null);
- }
-
- public static Element getBeanModelElement(Object object,Element parentElement)
- {
- return BeanModelElementsFactory.getBeanModelElement(object,parentElement,null);
- }
-
- /*
- * Take in an object and return an element depending on what
- * type we are dealing with from the javamof
- **/
- public static Element getBeanModelElement(Object object,Element parentElement, Model model)
- {
- Element returnElement = null;
-
- if (object instanceof JavaClass){
- JavaClass javaClass = (JavaClass)object;
- String javaName = javaClass.getJavaName();
- if (!javaClass.isArray()){
- if(parentElement == null && model ==null) returnElement = new BeanElement(javaName);
- else if(parentElement == null && model !=null) returnElement = new BeanElement(javaName,model,false);
- else{
- if(parentElement instanceof ParameterElement){
- ParameterElement tempElement = (ParameterElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof AttributeElement){
- AttributeElement tempElement = (AttributeElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof FieldElement){
- FieldElement tempElement = (FieldElement)parentElement;
- returnElement = new BeanElement(tempElement,javaName);
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
- }
- }
- else{
- if(parentElement == null && model ==null) returnElement = new ArrayElement(javaName);
- else if(parentElement == null && model !=null) returnElement = new ArrayElement(javaName,model,false);
- else{
- if(parentElement instanceof ParameterElement){
- ParameterElement tempElement = (ParameterElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof AttributeElement){
- AttributeElement tempElement = (AttributeElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof FieldElement){
- FieldElement tempElement = (FieldElement)parentElement;
- returnElement = new ArrayElement(tempElement,javaName);
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
-
- }
- }
-
- }
- else if(object instanceof SamplePropertyDescriptor){
- SamplePropertyDescriptor pd = (SamplePropertyDescriptor)object;
- returnElement = new AttributeElement((BeanElement)parentElement,pd.getName());
- }
- else if(object instanceof Field){
- Field field = (Field)object;
- returnElement = new FieldElement((BeanElement)parentElement,field.getName());
- }
- else if (object instanceof Method){
- Method method = (Method)object;
- returnElement = new MethodElement((BeanElement)parentElement,method.getName(), method.getMethodElementSignature());
- }
- //non beaninfo
- else if (object instanceof String){
- String name = (String)object;
- returnElement = new AttributeElement((BeanElement)parentElement,name);
- }
- else if (object instanceof JavaParameter){
- JavaParameter javaParameter = (JavaParameter)object;
-
-
- if (javaParameter.isReturn())
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- else{
- //a java parameter gives us the qualified name we dont want this
- String name = javaParameter.getQualifiedName();
- String shortName;
- int index = name.lastIndexOf(".");
- if (index != -1){
- index++;
- shortName = name.substring(index);
- }
- else shortName = name;
-
- returnElement = new ParameterElement((MethodElement)parentElement,shortName,MethodElement.REL_PARAMETERS,false);
-
- }
-
- }
- else if (object instanceof JavaHelpers){
- JavaHelpers javaHelper = (JavaHelpers)object;
- String javaName;
- if (javaHelper.isArray()) javaName = TypeFactory.ARRAY_NAME;
- else javaName = javaHelper.getJavaName();
- if (parentElement instanceof ParameterElement){
- returnElement = new SimpleElement((ParameterElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof AttributeElement){
- returnElement = new SimpleElement((AttributeElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof FieldElement){
- returnElement = new SimpleElement((FieldElement)parentElement,javaName,javaHelper.isPrimitive());
- }
- else if(parentElement instanceof MethodElement){
- returnElement = new ParameterElement((MethodElement)parentElement,RETURN_PARAM_NAME,MethodElement.REL_RETURN_PARAMETERS,true);
- }
- }
- return returnElement;
- }
-
-
-
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
deleted file mode 100644
index 24da0c1..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigDecimalType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class BigDecimalType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public BigDecimalType()
- {
- super(TypeFactory.BIG_DECIMAL_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "new java.math.BigDecimal(" + name + ");";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
deleted file mode 100644
index acf6033..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/BigIntegerType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class BigIntegerType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public BigIntegerType()
- {
- super(TypeFactory.BIG_INTEGER_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "new java.math.BigInteger(" + name + ");";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
deleted file mode 100644
index 4861a69..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DataType.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-* This class is used to simplify the codegen process
-* Because codegen may be processed differently depending on the type
-* we can handle how each type wants the code to look for a specific task
-* by creating a datatype and calling generic methods that are
-* to be specialized in subclasses
-*/
-public interface DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_TYPE = "type";
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName);
-
- /**
- * Often times in order to convert a type to string, string to type or just plain provide an input form
- * A temporary variable is used. If we run into a sitution where two of the same types are used in the
- * same method these temporary variables share the same name space. It isnt enough to use a name
- * because of we may have a nested scenario. Therefore any temporary variable that is used in a dataType
- * must use a unique name apeended to the end. This name must be passed in and it is up to the user of
- * DataType to insure it is unique.
- * @return Unique Name
- */
- public void setUniqueName(String name);
-
- /**
- * This is the name each temp variable will use
- *
- *
- */
- public String getUniqueName();
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id);
-
-
- /**
- * Input form returns the user input html
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name);
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name);
-
- /**
- * return the type
- * @return String the type(including package).
- */
- public String getType();
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
deleted file mode 100644
index 6a83989..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DateType.java
+++ /dev/null
@@ -1,125 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class DateType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public DateType()
- {
- super(TypeFactory.BIG_DECIMAL_NAME);
- }
-
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * This has been specialized to show an example
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "<%" + StringUtils.NEWLINE
- + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ " = new java.util.GregorianCalendar();" + StringUtils.NEWLINE
- + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE
- + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE
- + "%>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE
- + "<TR>" + StringUtils.NEWLINE
- + "<TD> </TD>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
-
-
-
- return inputForm;
- }
-
-
- /*
- * This function needs to be specialized
- * We must use the date function to help
- * us convert back and forth
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.Date " + nodeName + "= dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * this is needed for most case
- * but it is peripheral as the stringconversion needed
- * to be overridden
- */
- public String StringToType(String name)
- {
- return "";
- }
-
-
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(" + name +"));" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
-
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
deleted file mode 100644
index c0406ac..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/DomElementType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class DomElementType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public DomElementType()
- {
- fType = "org.w3c.dom.Element";
- fUniqueName = "";
- }
-
- /**
- * inputForm returns the user input html
- * The DomElement form is a text box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\""
- + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB
- + "org.w3c.dom.Element " + nodeName + "= org.eclipse.jst.ws.util.DomElementHelper.createDomElementFromXMLString(" + attributeName + ");"
- + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.DomElementHelper.domWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return typeToString;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
deleted file mode 100644
index b468fa9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/FieldElement.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class FieldElement extends BasicElement implements AttributeElementType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private String fSetterMethod;
- private String fGetterMethod;
-
-
- public static final String REL_TYPE = "type";
- public static final String REL_OWNING_BEAN = "owningbean";
-
- /**
- * Constructor this takes the owning bean.
- * @param name The name of the attribute.
- * @param beanElement the bean that owns this attribute.
- */
- public FieldElement ( BeanElement beanElement, String name)
- {
- super(name,beanElement,REL_OWNING_BEAN,BeanElement.REL_FIELDS);
- fSetterMethod = name;
- fGetterMethod = name;
- }
-
- public void setSetterMethod(String setterMethod)
- {
- fSetterMethod = setterMethod;
- }
-
- public String getSetterMethod()
- {
- return fSetterMethod;
- }
-
- public String getGetterMethod()
- {
- return fGetterMethod;
- }
-
- public void setGetterMethod(String getterMethod)
- {
- fGetterMethod = getterMethod;
- }
-
- public String getSetterSignature(String attribute)
- {
- return fSetterMethod + " = " + attribute + ";";
- }
-
- /**
- * Returns the Bean that owns this Attribute.
- * @return BeanElement The bean that owns this attribute.
- */
- public BeanElement getOwningBeanElement ()
- {
- Enumeration e = getElements(REL_OWNING_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns the type that is owned by this attributte.
- * @return TypeElement The Type that of this attribute.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
deleted file mode 100644
index d7cfbf9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/GregorianCalendarType.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class GregorianCalendarType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public GregorianCalendarType()
- {
- super(TypeFactory.GREGORIAN_CALENDAR_NAME);
- }
-
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * This has been specialized to show an example
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "<%" + StringUtils.NEWLINE
- + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + "java.util.GregorianCalendar gcExamp" + getUniqueName()+ " = new java.util.GregorianCalendar();" + StringUtils.NEWLINE
- + "java.util.Date date" + getUniqueName()+ " = gcExamp" + getUniqueName()+ ".getTime();" + StringUtils.NEWLINE
- + "String tempResult" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".format(date" + getUniqueName()+ ");" + StringUtils.NEWLINE
- + "%>" + StringUtils.NEWLINE
-
-
- + "<TD ALIGN=\"left\">" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE
- + "<TR>" + StringUtils.NEWLINE
- + "<TD> </TD>" + StringUtils.NEWLINE
- + "<TD ALIGN=\"left\"> eg. <%= tempResult" + getUniqueName()+ " %> </TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
-
-
-
- return inputForm;
- }
-
-
- /*
- * This function needs to be specialized
- * We must use the date function to help
- * us convert back and forth
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.Date dateTemp" + getUniqueName()+ " = dateFormat" + getUniqueName()+ ".parse(" + attributeName + ");"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + "java.util.GregorianCalendar" + Generator.SPACE + nodeName + " = " + "new java.util.GregorianCalendar();"
- + StringUtils.NEWLINE + Generator.DOUBLE_TAB + nodeName + ".setTime(dateTemp" + getUniqueName()+ ");"
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * this is needed for most case
- * but it is peripheral as the stringconversion needed
- * to be overridden
- */
- public String StringToType(String name)
- {
- return "";
- }
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "java.text.DateFormat dateFormat" + getUniqueName()+ " = java.text.DateFormat.getDateInstance();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "java.util.Date date" + getUniqueName()+ " = " + name + ".getTime();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(dateFormat" + getUniqueName()+ ".format(date" + getUniqueName() + "));" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
-
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
deleted file mode 100644
index a1ff2cf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/HashtableType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class HashtableType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public HashtableType()
- {
- super(TypeFactory.HASHTABLE_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
deleted file mode 100644
index 0035bfb..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MapType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class MapType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public MapType()
- {
- super(TypeFactory.MAP_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
deleted file mode 100644
index d2892ff..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/MethodElement.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method.
-* Nearest moral equivalents: java.lang.reflect.Method, java.beans.MethodDescriptor.
-*/
-public class MethodElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_BEAN = "bean";
- public static final String REL_PARAMETERS = "parameters";
- public static final String REL_RETURN_PARAMETERS = "returnparameters";
- private String fDisplayName;
- private String fName;
- private boolean fMethodOmitted;
-
- /**
- * Constructor.
- * @param bean The Bean that owns this method.
- * @param name The name of the method.
- * @param type The type of the method.
- */
- public MethodElement ( BeanElement beanElement, String name, String displayName)
- {
- super(name,beanElement,REL_BEAN,BeanElement.REL_METHODS);
- fDisplayName = displayName;
- fName = name;
- fMethodOmitted = false;
-
- }
-
- /*
- * In the event that there is an unsupported type
- * we will set the ommission boolean variable
- * @return boolean true if this method is to be ommited
- */
- public boolean getMethodOmmission()
- {
- return fMethodOmitted;
- }
-
- /*
- * In the event that there is an unsupported type
- * we will get the ommission boolean variable
- * @param boolean true if this method is to be ommited
- */
- public void setMethodOmmission(boolean bool)
- {
- fMethodOmitted = bool;
- }
-
-
- public String getName()
- {
- return fName;
- }
-
- public String getDisplayName()
- {
- return fDisplayName;
- }
-
- /**
- * Returns the Bean that owns this method.
- * @return Bean The Bean that owns this method.
- */
- public BeanElement getBeanElement ()
- {
- Enumeration e = getElements(REL_BEAN);
- return e.hasMoreElements() ? (BeanElement)e.nextElement() : null;
- }
-
- /**
- * Returns an enumeration of the return parameter of this method.
- * @return Enumeration holds the return parameter of this method.
- */
- public Enumeration getReturnParameterEnum ()
- {
- return getElements(REL_RETURN_PARAMETERS);
- }
-
- /**
- * Returns an enumeration of the return parameter of this method.
- * @return Enumeration holds the return parameter of this method.
- */
- public ParameterElement getReturnParameterElement ()
- {
- Enumeration e = getReturnParameterEnum();
- return e.hasMoreElements() ? (ParameterElement)e.nextElement() : null;
- }
-
- /**
- * Returns an enumeration of all Parameter objects of this method.
- * @return Enumeration All Parameter objects of this method.
- */
- public Enumeration getParameterElements ()
- {
- return getElements(REL_PARAMETERS);
- }
-
- /**
- * Returns the number of Parameter objects of this method.
- * @return int The number of Parameter objects of this method.
- */
- public int getNumberOfParameterElements ()
- {
- return getNumberOfElements(REL_PARAMETERS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
deleted file mode 100644
index 02b0678..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/ParameterElement.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-/**
-* Objects of this class represent a Java bean method parameter.
-* Nearest moral equivalents: java.beans.ParameterDescriptor.
-*/
-public class ParameterElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String REL_METHOD = "method";
- public static final String REL_TYPE = "type";
-
- public boolean fReturnParameter=false;
-
- /**
- * Constructor.
- * @param method The Method that owns this parameter.
- * @param name The name of the parameter.
- * @param type The type of the parameter.
- */
- public ParameterElement ( MethodElement methodElement, String name, String relType,boolean returnParameter )
- {
- this(name,methodElement,REL_METHOD,relType);
- fReturnParameter = returnParameter;
- }
-
- /**
- * Constructor.
- * @param method The Method that owns this parameter.
- * @param name The name of the parameter.
- * @param type The type of the parameter.
- */
- public ParameterElement (String name, MethodElement methodElement, String outRel,String inRel)
- {
- super(name,methodElement,outRel,inRel);
- }
-
- /**
- * Returns the Method that owns this parameter.
- * @return Method The Method that owns this parameter.
- */
- public MethodElement getMethodElement ()
- {
- Enumeration e = getElements(REL_METHOD);
- return e.hasMoreElements() ? (MethodElement)e.nextElement() : null;
- }
-
- /**
- * Returns the Method that owns this parameter.
- * @return Method The Method that owns this parameter.
- */
- public TypeElement getTypeElement ()
- {
- Enumeration e = getElements(REL_TYPE);
- return e.hasMoreElements() ? (TypeElement)e.nextElement() : null;
- }
-
- public boolean isReturn()
- {
- return fReturnParameter;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
deleted file mode 100644
index 3873061..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveArrayType.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class PrimitiveArrayType extends ArrayType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveArrayType(String typeName)
- {
- super(TypeFactory.PRIMITIVE_ARRAY_NAME, typeName);
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String trippleTab = Generator.DOUBLE_TAB + Generator.TAB;
-
- String nonBean = Generator.DOUBLE_TAB + "String temp" + getUniqueName() + " = \"[\";"
- + Generator.DOUBLE_TAB + "for(int i" + getUniqueName() + "=0;i" +getUniqueName() + "< " + name
- + ".length;i" + getUniqueName() + "++){" + StringUtils.NEWLINE
- + trippleTab + "temp"+ getUniqueName() +" = temp"+getUniqueName() + " + " + name + "[i" + getUniqueName()
- + "] + \",\";" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "int length" + getUniqueName() + " = temp" + getUniqueName() + ".length();"
- + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "temp" + getUniqueName() + " = temp"+getUniqueName()+".substring(0,(length"+getUniqueName()+" - 1)) + \"]\";"
- + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp"+ getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%"+ StringUtils.NEWLINE;
-
- return nonBean;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
deleted file mode 100644
index f58ad9d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveBooleanType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveBooleanType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveBooleanType()
- {
- super(TypeFactory.PRIM_BOOLEAN_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Boolean.valueOf(" + name + ").booleanValue();";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
deleted file mode 100644
index 5045d26..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveByteType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveByteType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveByteType()
- {
- super(TypeFactory.PRIM_BYTE_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Byte.parseByte(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
deleted file mode 100644
index d52f903..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveCharType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveCharType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveCharType()
- {
- super(TypeFactory.PRIM_CHAR_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "" + name + ".charAt(0);";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
deleted file mode 100644
index 7b362e7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveDoubleType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveDoubleType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveDoubleType()
- {
- super(TypeFactory.PRIM_DOUBLE_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Double.parseDouble(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
deleted file mode 100644
index 200f9d7..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveFloatType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveFloatType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveFloatType()
- {
- super(TypeFactory.PRIM_FLOAT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Float.parseFloat(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
deleted file mode 100644
index 2f33dd9..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveIntType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveIntType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveIntType()
- {
- super(TypeFactory.PRIM_INTEGER_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Integer.parseInt(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
deleted file mode 100644
index f715236..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveJavaTypes.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveJavaTypes extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveJavaTypes(String type)
- {
- super(type);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = fType + ".valueOf(" + name + ");";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
deleted file mode 100644
index ef0c826..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveLongType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveLongType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveLongType()
- {
- super(TypeFactory.PRIM_LONG_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Long.parseLong(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
deleted file mode 100644
index 8f91ce6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveShortType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class PrimitiveShortType extends PrimitiveType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveShortType()
- {
- super(TypeFactory.PRIM_SHORT_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type.
- */
- public String StringToType(String name)
- {
- String conversion = "Short.parseShort(" + name + ");";
- return conversion;
- }
-
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
deleted file mode 100644
index 4b51767..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/PrimitiveType.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public abstract class PrimitiveType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public PrimitiveType(String type)
- {
- super(type);
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
deleted file mode 100644
index fc721a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/RecognizedReturnType.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class RecognizedReturnType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public RecognizedReturnType(String type)
- {
- fType = type;
- fUniqueName = "";
- }
-
- /**
- * not relevant at this point
- */
- public String inputForm(String name)
- {
- return "";
- }
-
- /**
- * again not relevant
- */
- public String getRequestCode(String name, String id)
- {
- return "";
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- return "";
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String nonBean = Generator.DOUBLE_TAB + "if(" + name + "!= null){" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "String temp" + getUniqueName()+" = " + name + ".toString();" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%=temp" + getUniqueName() +"%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "}";
- return nonBean;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
deleted file mode 100644
index 289e009..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SOAPElementType.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class SOAPElementType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public SOAPElementType()
- {
- fType = "javax.xml.soap.SOAPElement";
- fUniqueName = "";
- }
-
- /**
- * inputForm returns the user input html
- * The DomElement form is a text box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><TEXTAREA Rows=7 Cols=45 NAME=\""
- + name + "\"></TEXTAREA></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB
- + "javax.xml.soap.SOAPElement " + nodeName + "= org.eclipse.jst.ws.util.SoapElementHelper.createSOAPElementFromXMLString(" + attributeName + ");"
- + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * This is basically the function that dictates how we want to display this type
- * upon receiving it as a return from a proxy method
- * @param String the name of the type
- * @return String The display string
- */
- public String TypeConversion(String name)
- {
- String typeToString = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.SoapElementHelper.soapElementWriter(" + name + ", new java.lang.StringBuffer()" + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return typeToString;
- }
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
deleted file mode 100644
index f478345..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleElement.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* 1 of three type elements represents primitives
-*/
-public class SimpleElement extends TypeElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor
- * @param ParameterElement The Parameter that owns this simple type.
- * @param String Name of the simple element.
- */
- public SimpleElement ( ParameterElement parameterElement, String name, boolean prim)
- {
- super(name,parameterElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.PARAMETER_OWNER;
- setPrimitive(prim);
- }
-
- /**
- * Constructor
- * @param ParameterElement The Attribute that owns this simple type.
- * @param String Name of the AttributeElement.
- */
- public SimpleElement ( AttributeElement attributeElement, String name, boolean prim)
- {
- super(name,attributeElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.ATTRIBUTE_OWNER;
- setPrimitive(prim);
- }
-
- /**
- * Constructor
- * @param ParameterElement The Attribute that owns this simple type.
- * @param String Name of the AttributeElement.
- */
- public SimpleElement ( FieldElement fieldElement, String name, boolean prim)
- {
- super(name,fieldElement,TypeElement.REL_OWNER,TypeElement.REL_TYPE,TypeElement.SIMPLE);
- fOwnerType = TypeElement.FIELD_OWNER;
- setPrimitive(prim);
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
deleted file mode 100644
index e819482..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/SimpleType.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public abstract class SimpleType implements DataType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fType;
- protected String fUniqueName;
-
- /**
- *Constructor
- *
- */
- public SimpleType(String type)
- {
- fType = type;
- }
-
- /**
- * inputForm returns the user input html
- * The simple form is just a text input box
- * @param String name The name of the input element
- * @return String The form used to collect the data
- */
- public String inputForm(String name)
- {
- String inputForm = "<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\""
- + name + "\" SIZE=20></TD>" + StringUtils.NEWLINE
- + "</TR>" + StringUtils.NEWLINE;
- return inputForm;
- }
-
- /**
- * This function dictates how you want to process the
- * incoming string from the input jsp. You may or may not use the markup
- * function depending on the type. The simple types use it. DomElement does not
- * @param String the name of the attribute
- * @return String the code to be generated
- */
- public String getRequestCode(String name, String id)
- {
- String requestCode = Generator.DOUBLE_TAB + "String" + Generator.SPACE
- + id + "= request.getParameter(\""
- + name +"\");" + StringUtils.NEWLINE;
- return requestCode;
- }
-
- /**
- * This function hands back the code required to go from the
- * string the user entered to the actual type of the element
- * it uses another function that all subclasses of SimpleType are required to implement
- * The StringToType function
- * @param String typeName this is the actual name of the type ie int,boolean
- * @param String nodeName The nodeName is just the attributename + Temp.
- * @param String the attributeName
- * @return String convert the string to type .
- */
- public String stringConversion(String typeName, String nodeName, String attributeName)
- {
- String conversion = Generator.DOUBLE_TAB + typeName + Generator.SPACE + nodeName
- + Generator.SPACE + " = " + StringToType(attributeName)
- + "" + StringUtils.NEWLINE;
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public abstract String StringToType(String name);
-
- /**
- * converts the type returned from the proxy
- * back to a string
- * @return String convert the type to string.
- */
- public String TypeConversion(String name)
- {
-
- String conversion = Generator.DOUBLE_TAB + "String tempResult" + getUniqueName()+ " = org.eclipse.jst.ws.util.JspUtils.markup(" + TypeToString(name) + ");" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%= tempResult" + getUniqueName()+ " %>" + StringUtils.NEWLINE
- + Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE;
-
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public abstract String TypeToString(String name);
-
- /**
- * return the name of this type
- * @return String the name(including package).
- */
- public String getType()
- {
- return fType;
- }
-
- public String getUniqueName()
- {
- return fUniqueName;
- }
-
- public void setUniqueName(String name)
- {
- fUniqueName = name;
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
deleted file mode 100644
index 16a98a8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StateLessBeanType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class StateLessBeanType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-
- private String fTypeName;
-
-
-
- /**
- *Constructor
- *
- */
-
- public StateLessBeanType(String name)
- {
- super(TypeFactory.STATELESS_BEAN);
- fTypeName = name;
-
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
deleted file mode 100644
index 1b99c74..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/StringType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class StringType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public StringType()
- {
- super(TypeFactory.STRING_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = name + ";";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
deleted file mode 100644
index a8f22cd..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeElement.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* TypeElement is the base class for Java bean features that have types.
-*/
-public abstract class TypeElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static int BEAN = 0;
- public static int SIMPLE = 1;
- public static int ARRAY = 2;
-
- private int fType;
- protected int fOwnerType;
- private boolean fPrimitive = false;
-
- /**
- * Constructor. Automatically adds this object to the given model.
- * @param name The name of the element
- * @param model The model to own this object.
- * @param type The type represented by this object, one of
- * <code>BEAN</code>, <code>SIMPLE</code> or <code>ARRAY</code>.
- */
- protected TypeElement ( String name, Model model, int type )
- {
- super(name,model);
- fType = type;
- }
-
- /**
- */
- protected TypeElement ( String name, Element element, String outboundRelName, String inboundRelName, int type )
- {
- super(name,element,outboundRelName,inboundRelName);
- fType = type;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- public boolean isBean()
- {
- if (fType == BEAN) return true;
- return false;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- public boolean isPrimitive()
- {
- return fPrimitive;
- }
-
- /*
- *This will tell you wether the type is a bean
- *@param Boolean returns true if this is bean
- **/
- protected void setPrimitive(boolean prim)
- {
- fPrimitive = prim;
- }
-
-
- /*
- * This is mainly needed for arrays as with all types the
- * names come out as java.util.type, but with an array it
- * isnt explicit in telling us its an array
- */
- public String getTypeName()
- {
- return getName();
- }
-
- /*
- *This will tell you wether the type is a simple
- *@param Boolean returns true if this is simple
- **/
- public boolean isSimple()
- {
- if (fType == SIMPLE) return true;
- return false;
- }
-
- /*
- *This will tell you wether the type is a array
- *@param Boolean returns true if this is array
- **/
- public boolean isArray()
- {
- if (fType == ARRAY) return true;
- return false;
- }
-
- public static String REL_ATTRIBUTES = "attributes";
- public static String REL_FIELDS = "fields";
- public static final String REL_TYPE = "type";
- public static final String REL_OWNER = "owner";
-
- public static int PARAMETER_OWNER = 0;
- public static int ATTRIBUTE_OWNER = 1;
- public static int FIELD_OWNER = 2;
- public static int ROOT = 3;
-
- /*
- * This could be The root test bean
- * @return boolean true if this is root bean
- */
- public boolean isRoot()
- {
- if(fOwnerType == ROOT) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by a parameter
- */
- public boolean isOwnerParameter()
- {
- if(fOwnerType == PARAMETER_OWNER) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by an attribute
- */
- public boolean isOwnerAttribute()
- {
- if(fOwnerType == ATTRIBUTE_OWNER) return true;
- return false;
- }
-
- /*
- * This Type could be owned by a Parameter or an attribute
- * @return boolean true if this is owned by an attribute
- */
- public boolean isOwnerField()
- {
- if(fOwnerType == FIELD_OWNER) return true;
- return false;
- }
-
- /**
- * This Type may be owned by a parameter or an attribute
- * Use this method in conjunction with isOwnerParamter, isOwner
- * @return BasicElement the element that owns this attribute.
- */
- public BasicElement getOwningElement ()
- {
- if (isOwnerParameter()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
- else if(isOwnerAttribute()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
- else if(isOwnerField()){
- Enumeration e = getElements(REL_OWNER);
- return e.hasMoreElements() ? (BasicElement)e.nextElement() : null;
- }
-
- return null;
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
deleted file mode 100644
index 4f9822a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/TypeFactory.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-import java.util.Hashtable;
-
-import org.eclipse.jem.java.JavaHelpers;
-/**
- * TypeFactory
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class TypeFactory
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final String URL_NAME = "java.net.URL";
- public static final String STRING_NAME = "java.lang.String";
- public static final String BIG_DECIMAL_NAME = "java.math.BigDecimal";
- public static final String BIG_INTEGER_NAME = "java.math.BigInteger";
- public static final String DATE_NAME = "java.util.Date";
- public static final String GREGORIAN_CALENDAR_NAME = "java.util.GregorianCalendar";
- public static final String CALENDAR_NAME = "java.util.Calendar";
- public static final String BOOLEAN_NAME = "java.lang.Boolean";
- public static final String BYTE_NAME = "java.lang.Byte";
- public static final String DOUBLE_NAME = "java.lang.Double";
- public static final String FLOAT_NAME = "java.lang.Float";
- public static final String INTEGER_NAME = "java.lang.Integer";
- public static final String LONG_NAME = "java.lang.Long";
- public static final String SHORT_NAME = "java.lang.Short";
- public static final String CHARACTER_NAME = "java.lang.Character";
- public static final String PRIM_BOOLEAN_NAME = "boolean";
- public static final String PRIM_BYTE_NAME = "byte";
- public static final String PRIM_DOUBLE_NAME = "double";
- public static final String PRIM_FLOAT_NAME = "float";
- public static final String PRIM_INTEGER_NAME = "int";
- public static final String PRIM_LONG_NAME = "long";
- public static final String PRIM_SHORT_NAME = "short";
- public static final String PRIM_CHAR_NAME = "char";
- public static final String VOID_NAME = "void";
-
- //some special complex
- public static final String DOM_ELEMENT_NAME = "org.w3c.dom.Element";
- public static final String SOAP_ELEMENT_NAME = "javax.xml.soap.SOAPElement";
- public static final String STATELESS_BEAN = BeanElement.STATELESS_BEAN;
-
-
-
- public static Hashtable javaTypes = new Hashtable();
-
- public TypeFactory(){}
-
- static{
- javaTypes.put(BOOLEAN_NAME,new PrimitiveJavaTypes(BOOLEAN_NAME));
- javaTypes.put(BYTE_NAME, new PrimitiveJavaTypes(BYTE_NAME));
- javaTypes.put(DOUBLE_NAME, new PrimitiveJavaTypes(DOUBLE_NAME));
- javaTypes.put(FLOAT_NAME, new PrimitiveJavaTypes(FLOAT_NAME));
- javaTypes.put(INTEGER_NAME,new PrimitiveJavaTypes(INTEGER_NAME));
- javaTypes.put(LONG_NAME, new PrimitiveJavaTypes(LONG_NAME));
- javaTypes.put(SHORT_NAME, new PrimitiveJavaTypes(SHORT_NAME));
- javaTypes.put(CHARACTER_NAME, new PrimitiveJavaTypes(CHARACTER_NAME));
- }
-
-
- /*
- * This function allows us to handle recognized beans
- * in displaying and generating code for them instead of
- * treating them as complex types
- */
- public static boolean recognizedBean(String type)
- {
-
- //
- //current recognized beans (mostly java.lang)
- if (type.equals(BOOLEAN_NAME) ||
- type.equals(BYTE_NAME) ||
- type.equals(DOUBLE_NAME) ||
- type.equals(FLOAT_NAME) ||
- type.equals(INTEGER_NAME) ||
- type.equals(LONG_NAME) ||
- type.equals(SHORT_NAME) ||
- type.equals(CHARACTER_NAME) ||
- type.equals(DOM_ELEMENT_NAME) ||
- type.equals(SOAP_ELEMENT_NAME) ||
- type.equals(BIG_DECIMAL_NAME) ||
- type.equals(BIG_INTEGER_NAME) ||
- type.equals(DATE_NAME) ||
- type.equals(GREGORIAN_CALENDAR_NAME) ||
- type.equals(CALENDAR_NAME) ||
- type.equals(URL_NAME) ||
- type.equals(STRING_NAME)) return true;
- return false;
-
- }
-
- /*
- * This function allows us to handle unsupported types
- * if we dont want to support a type and we want to omitt this
- * method from the samples
- * @param javaHelpers this is the type to be evaluated
- * @return boolean true if the type is not supported
- */
- public static boolean isUnSupportedType(JavaHelpers javaHelpers)
- {
- //we also dont support arrays
- if (javaHelpers.isArray()||
- javaHelpers.getJavaName().equals(MAP_NAME)||
- javaHelpers.getJavaName().equals(VECTOR_NAME)||
- javaHelpers.getJavaName().equals("java.lang.class") ) return true;
-
- return false;
- }
-
- public static String HASHTABLE_NAME = "java.util.Hashtable";
- public static String MAP_NAME = "java.util.Map";
- public static String VECTOR_NAME = "java.util.Vector";
- public static String ARRAY_NAME = ArrayElement.ARRAY_NAME;
- public static String PRIMITIVE_ARRAY_NAME = "primitivearray";
-
- public static boolean isRecognizedReturnType(JavaHelpers javaHelpers)
- {
- //arrays
- //Hashtable
- //Vectors
- if (javaHelpers.isArray()) return true;
- else if (javaHelpers.getJavaName().equals(HASHTABLE_NAME))return true;
- else if (javaHelpers.getJavaName().equals(VECTOR_NAME))return true;
- else if (javaHelpers.getJavaName().equals(MAP_NAME))return true;
- else return false;
- }
-
- public static boolean isRecognizedReturnType(String type)
- {
- //arrays
- //Hashtable
- //Vectors
- if (type.startsWith(ARRAY_NAME)) return true;
- else if (type.equals(HASHTABLE_NAME))return true;
- else if (type.equals(VECTOR_NAME))return true;
- else if (type.equals(MAP_NAME))return true;
- else return false;
- }
-
- public static boolean isStateLessBean(String type)
- {
- if(type.startsWith(STATELESS_BEAN)) return true;
- return false;
- }
-
-
- /**
- * Creates a type based on the JavaHelper then sets this type in the element
- * @params JavaHelpers this holds the type
- * @param TypeElement The element which will hold the type created
- * @param String Uniquename to be used when naming temp variables
- */
-
- public static DataType createType(String type, String UniqueName)
- {
- //this guy might be both stateless and one of the below elements
- //we would like to be as specific as we can, stateless is the worst case
- boolean stateless = false;
- if(type.startsWith(STATELESS_BEAN)) {
- stateless = true;
- type = type.substring(29);
- }
-
- DataType datatype = null;
- if (type.equals(PRIM_BOOLEAN_NAME)) datatype = new PrimitiveBooleanType();
- else if (type.equals(PRIM_BYTE_NAME)) datatype = new PrimitiveByteType();
- else if (type.equals(PRIM_DOUBLE_NAME)) datatype = new PrimitiveDoubleType();
- else if (type.equals(PRIM_FLOAT_NAME)) datatype = new PrimitiveFloatType();
- else if (type.equals(PRIM_LONG_NAME)) datatype = new PrimitiveLongType();
- else if (type.equals(PRIM_INTEGER_NAME)) datatype = new PrimitiveIntType();
- else if (type.equals(PRIM_CHAR_NAME)) datatype = new PrimitiveCharType();
- else if (type.equals(PRIM_SHORT_NAME)) datatype = new PrimitiveShortType();
-
-
- //see if this critter is a javatype
- else if (type.equals(BOOLEAN_NAME) ||
- type.equals(BYTE_NAME) ||
- type.equals(DOUBLE_NAME) ||
- type.equals(FLOAT_NAME) ||
- type.equals(INTEGER_NAME) ||
- type.equals(LONG_NAME) ||
- type.equals(CHARACTER_NAME) ||
- type.equals(SHORT_NAME)) datatype = (DataType)javaTypes.get(type);
-
- //see if its a case we handle
- else if (type.equals(STRING_NAME)) datatype = new StringType();
- else if (type.equals(VOID_NAME)) datatype = new VoidType();
- else if (type.equals(DOM_ELEMENT_NAME)) datatype = new DomElementType();
- else if (type.equals(SOAP_ELEMENT_NAME)) datatype = new SOAPElementType();
- else if (type.equals(BIG_DECIMAL_NAME)) datatype = new BigDecimalType();
- else if (type.equals(BIG_INTEGER_NAME)) datatype = new BigIntegerType();
- else if (type.equals(DATE_NAME)) datatype = new DateType();
- else if (type.equals(URL_NAME)) datatype = new URLType();
- else if (type.equals(GREGORIAN_CALENDAR_NAME)) datatype = new GregorianCalendarType();
- else if (type.equals(CALENDAR_NAME)) datatype = new GregorianCalendarType();
-
- //it could be a return type we support
- else if (type.equals(HASHTABLE_NAME)) datatype = new HashtableType();
- else if (type.equals(VECTOR_NAME)) datatype = new VectorType();
- else if (type.equals(MAP_NAME)) datatype = new MapType();
-
- // need to see if it is an object array
- //or a primitive
- else if (type.startsWith(ARRAY_NAME)){
- String name = type.substring(21);
- if(name.startsWith(PRIM_BOOLEAN_NAME) ||
- name.startsWith(PRIM_BYTE_NAME) ||
- name.startsWith(PRIM_DOUBLE_NAME) ||
- name.startsWith(PRIM_FLOAT_NAME) ||
- name.startsWith(PRIM_LONG_NAME) ||
- name.startsWith(PRIM_INTEGER_NAME) ||
- name.startsWith(PRIM_CHAR_NAME) ||
- name.startsWith(PRIM_SHORT_NAME))
- datatype = new PrimitiveArrayType(name);
- else
- datatype = new ArrayType(name);
-
- }
- else if (stateless){
- datatype = new StateLessBeanType(type);
-
- }
-
-
- datatype.setUniqueName(UniqueName);
- return datatype;
-
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
deleted file mode 100644
index 9c0fb28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/URLType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-/**
-* objects of this class represent a type
-*
-*/
-public class URLType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public URLType()
- {
- super(TypeFactory.URL_NAME);
- }
-
- /**
- * StringToType gets the string taken by the
- * user into proxy form
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- String conversion = "new java.net.URL(" + name + ");";
- return conversion;
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return name + ".toString()";
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
deleted file mode 100644
index 5a0718d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VectorType.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a recognized return type
-*
-*/
-public class VectorType extends RecognizedReturnType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public VectorType()
- {
- super(TypeFactory.VECTOR_NAME);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
deleted file mode 100644
index 5fde91e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/beanmodel/VoidType.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel;
-
-
-/**
-* objects of this class represent a type
-*
-*/
-public class VoidType extends SimpleType
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- *Constructor
- *
- */
- public VoidType()
- {
- super("void");
- }
-
- /**
- * for a void there is no need to return
- * @return String convert the string to type .
- */
- public String StringToType(String name)
- {
- return "";
- }
-
- /**
- * The stringConversion function nails out specific conversion methods used among simple types
- * This method is to be implemented by SimpleType subclasses
- * @param String the name of string after the request call
- * @return String the actual conversion string containing the name.
- */
- public String TypeToString(String name)
- {
- return "String.valueOf(" + name + ")";
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
deleted file mode 100644
index dba9769..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/validate/ValidationManager.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.validate;
-
-import java.util.HashSet;
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-
-/**
- * This class manages the validation state of projects that some tasks may want
- * to disable. The manager can then be used to restore the validation state.
-**/
-public class ValidationManager
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * This set contains a set of IProjects that need to be validated.
- **/
- private HashSet projects = null;
-
- /**
- * This object contains a reference to the j2ee validator.
- **/
- //pgm private ValidatorManager j2eeManager = null;
-
- /**
- * This boolean contains the auto build setting under preferrence
- **/
- private boolean isAutoBuild_;
- private boolean autoBuildDisabled_;
-
- public ValidationManager()
- {
- projects = new HashSet();
- //pgm j2eeManager = ValidatorManager.getManager();
- setAutoBuildPreference();
- autoBuildDisabled_ = false;
- }
-
- /**
- * Disables the validation for a project if required.
- **/
- public void disableValidationForProject( IProject project )
- {
- // We need to remember that this project needs have validation turned back on.
- projects.add( project );
-
- //pgm j2eeManager.suspendAllValidation( true );
- }
-
- /**
- * Restores the validation state for all needed projects.
- **/
- public void restoreValidationForProjects( boolean runValidation )
- {
- //pgm j2eeManager.suspendAllValidation( false );
-
- Iterator iterator = projects.iterator();
-
- while( iterator.hasNext() )
- {
- IProject project = (IProject)(iterator.next());
-
- // Now kick off validation for this project if this was requested.
- if( runValidation )
- {
- //pgm EnabledValidatorsOperation validOp = new EnabledValidatorsOperation( project, null );
- //pgm validOp.run( monitor );
- }
- }
- }
-
- public void modifyAutoBuild(boolean isAutoBuild) {
- try {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- IWorkspaceDescription workspaceDesc = workspace.getDescription();
- workspaceDesc.setAutoBuilding(isAutoBuild);
- workspace.setDescription(workspaceDesc);
- }
- catch (Exception e) {}
- }
-
- public void disableAutoBuild() {
- if (!autoBuildDisabled_) {
- setAutoBuildPreference();
- modifyAutoBuild(false);
- autoBuildDisabled_ = true;
- }
- }
-
- public void restoreAutoBuild() {
- if (autoBuildDisabled_) {
- modifyAutoBuild(getAutoBuildPreference());
- autoBuildDisabled_ = false;
- }
- }
-
- public boolean setAutoBuildPreference() {
- isAutoBuild_ = getWorkspaceAutoBuildPreference();
- return isAutoBuild_;
- }
-
- public boolean getAutoBuildPreference() {
- return isAutoBuild_;
- }
-
- public boolean getWorkspaceAutoBuildPreference() {
- IWorkspaceDescription workspaceDesc = ResourcesPlugin.getWorkspace().getDescription();
- return workspaceDesc.isAutoBuilding();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
deleted file mode 100644
index 684fb66..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/BindingElement.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class BindingElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_PORT = "port";
- public static String REL_OPERATIONS = "operations";
- public static String REL_PORT_TYPE = "porttype";
-
- public BindingElement (PortElement portElement,String name)
- {
- super(name,portElement,REL_PORT,PortElement.REL_BINDING);
- }
-
- public Enumeration getPort()
- {
- return getElements(REL_PORT);
- }
-
- public Enumeration getPortType()
- {
- return getElements(REL_PORT_TYPE);
- }
-
- public Enumeration getOperations()
- {
- return getElements(REL_OPERATIONS);
- }
-
- public int getNumberOfOperations()
- {
- return getNumberOfElements(REL_OPERATIONS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
deleted file mode 100644
index d581564..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/DefinitionElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class DefinitionElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_SERVICES = "services";
- public static String REL_WSDL = "wsdl";
-
- public DefinitionElement (WSDLElement wsdlElement,String name)
- {
- super(name,wsdlElement,REL_WSDL,WSDLElement.REL_DEFINITIONS);
- }
-
- public Enumeration getWSDL()
- {
- return getElements(REL_WSDL);
- }
-
- public Enumeration getServices()
- {
- return getElements(REL_SERVICES);
- }
-
- public int getNumberOfServices()
- {
- return getNumberOfElements(REL_SERVICES);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
deleted file mode 100644
index ed6bb13..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/MessageElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class MessageElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_OPERATION = "operation";
- public static String REL_PARTS = "parts";
-
- public MessageElement (OperationElement operationElement,String name)
- {
- super(name,operationElement,REL_OPERATION,OperationElement.REL_MESSAGES);
- }
-
- public Enumeration getOperation()
- {
- return getElements(REL_OPERATION);
- }
-
- public Enumeration getParts()
- {
- return getElements(REL_PARTS);
- }
-
- public int getNumberOfParts()
- {
- return getNumberOfElements(REL_PARTS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
deleted file mode 100644
index 890af47..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/OperationElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class OperationElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
- public static String REL_MESSAGES = "messages";
-
- public OperationElement (BindingElement bindingElement,String name)
- {
- super(name,bindingElement,REL_BINDING,BindingElement.REL_OPERATIONS);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
- public Enumeration getMessages()
- {
- return getElements(REL_MESSAGES);
- }
-
- public int getNumberOfMessages()
- {
- return getNumberOfElements(REL_MESSAGES);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
deleted file mode 100644
index 26df67a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PartElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PartElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_MESSAGE = "message";
-
- public PartElement (MessageElement messageElement,String name)
- {
- super(name,messageElement,REL_MESSAGE,MessageElement.REL_PARTS);
- }
-
- public Enumeration getMessage()
- {
- return getElements(REL_MESSAGE);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
deleted file mode 100644
index 4ea80e0..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortElement.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
- public static String REL_SERVICE = "service";
-
- public PortElement (ServiceElement serviceElement,String name)
- {
- super(name,serviceElement,REL_SERVICE,ServiceElement.REL_PORTS);
- }
-
- public Enumeration getService()
- {
- return getElements(REL_SERVICE);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
deleted file mode 100644
index fdacced..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/PortTypeElement.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class PortTypeElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_BINDING = "binding";
-
- public PortTypeElement (BindingElement bindingElement,String name)
- {
- super(name,bindingElement,REL_BINDING,BindingElement.REL_PORT_TYPE);
- }
-
- public Enumeration getBinding()
- {
- return getElements(REL_BINDING);
- }
-
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
deleted file mode 100644
index ece8634..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/ServiceElement.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-
-public class ServiceElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_PORTS = "ports";
- public static String REL_DEFINITION = "definition";
-
- public ServiceElement (DefinitionElement definitionElement,String name)
- {
- super(name,definitionElement,REL_DEFINITION,DefinitionElement.REL_SERVICES);
- }
-
- public Enumeration getDefinition()
- {
- return getElements(REL_DEFINITION);
- }
-
- public Enumeration getPorts()
- {
- return getElements(REL_PORTS);
- }
-
- public int getNumberOfPorts()
- {
- return getNumberOfElements(REL_PORTS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
deleted file mode 100644
index 695e228..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/StubbedWSDLModel.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-public class StubbedWSDLModel
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected Model fModel;
- public StubbedWSDLModel()
- {
- WSDLElement wsdlElement = new WSDLElement("WSDLFiles");
- fModel = wsdlElement.getModel();
- }
-
- public Model getWSDLModel()
- {
- return fModel;
- }
-
- public void buildModel()
- {
- DefinitionElement def1 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"StockQuote");
- ServiceElement ser1 = new ServiceElement(def1,"getQuote");
- ServiceElement ser2 = new ServiceElement(def1,"setQuote");
- PortElement port1 = new PortElement(ser1,"port1");
- PortElement port2 = new PortElement(ser1,"port2");
- PortElement port3 = new PortElement(ser2,"port1");
- PortElement port4 = new PortElement(ser2,"port2");
- BindingElement bind1 = new BindingElement(port1,"bind1");
- BindingElement bind2 = new BindingElement(port2,"bind1");
- BindingElement bind3 = new BindingElement(port3,"bind1");
- BindingElement bind4 = new BindingElement(port4,"bind1");
- OperationElement op1 = new OperationElement(bind1,"op1");
- OperationElement op2 = new OperationElement(bind2,"op1");
- OperationElement op3 = new OperationElement(bind3,"op1");
- OperationElement op4 = new OperationElement(bind4,"op1");
- MessageElement me1 = new MessageElement(op1,"me1");
- MessageElement me2 = new MessageElement(op1,"me2");
- PartElement pe1 = new PartElement(me1,"pe1");
- PartElement pe2 = new PartElement(me2,"pe2");
-
- DefinitionElement def2 = new DefinitionElement((WSDLElement)fModel.getRootElement(),"TempConversion");
- ServiceElement ser3 = new ServiceElement(def2,"getTemp");
- ServiceElement ser4 = new ServiceElement(def2,"setTemp");
- PortElement port5 = new PortElement(ser3,"port1");
- PortElement port6 = new PortElement(ser4,"port1");
- BindingElement bind5 = new BindingElement(port5,"bind1");
- BindingElement bind6 = new BindingElement(port6,"bind1");
- OperationElement op5 = new OperationElement(bind5,"op1");
- OperationElement op6 = new OperationElement(bind6,"op1");
-
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
deleted file mode 100644
index f1aa78a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/datamodel/wsdlmodel/WSDLElement.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.datamodel.wsdlmodel;
-
-import java.util.Enumeration;
-
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-import org.eclipse.wst.ws.internal.datamodel.BasicModel;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-public class WSDLElement extends BasicElement
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static String REL_DEFINITIONS = "definitions";
-
- /*
- *
- **/
- public WSDLElement (String name)
- {
- this(name,new BasicModel("WSDLModel"));
- }
-
- public WSDLElement (String name, Model model)
- {
- super(name,model);
- model.setRootElement(this);
- }
-
- public Enumeration getDefinitions()
- {
- return getElements(REL_DEFINITIONS);
- }
-
- public int getNumberOfDefinitions()
- {
- return getNumberOfElements(REL_DEFINITIONS);
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
deleted file mode 100644
index 65cab80..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
deleted file mode 100644
index 0b09cf2..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDeployFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
deleted file mode 100644
index 6a3f5cf..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreDevelopFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
deleted file mode 100644
index a3da3d8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ClientPreInstallFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ClientPreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
deleted file mode 100644
index 7cd1b4c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreAssemblyFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreAssemblyFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
deleted file mode 100644
index 5c1db73..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDeployFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDeployFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
deleted file mode 100644
index a0e9c21..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreDevelopFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreDevelopFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
deleted file mode 100644
index af8268a..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/fragments/ServicePreInstallFragment.java
+++ /dev/null
@@ -1,17 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.fragments;
-
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-
-public class ServicePreInstallFragment extends SequenceFragment
-{
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
deleted file mode 100644
index 1a9ca10..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/plugin/WebServiceConsumptionPlugin.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceConsumptionPlugin extends Plugin
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.consumption";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceConsumptionPlugin instance_;
-
- private Log log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceConsumptionPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceConsumptionPlugin)Platform.getPlugin("org.eclipse.jst.ws");
- * @return The WebServiceConsumptionPlugin singleton.
- */
- public static WebServiceConsumptionPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.consumption.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties. Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See the JDK's
- * {@link java.text.MessageFormat java.text.MessageFormat}
- * class for further details on substitution.
- * @return The String message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
deleted file mode 100644
index 4739f28..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileAttributeGenerator.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileAttributeGenerator extends InputFileTypeGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private boolean fStateLess;
-
- /**
- * Constructor.
- *
- */
- public InputFileAttributeGenerator (StringBuffer buffer, int currentLevel, int levelsDeep)
- {
- super(buffer,currentLevel,levelsDeep);
- }
-
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public Status visit (Object object)
- {
-
- AttributeElementType attributeElementType = (AttributeElementType)object;
- //if it is a bean is it stateless
- attributeElementType.getTypeElement();
-
- if(attributeElementType.getTypeElement().isBean()){
- BeanElement bean = (BeanElement)attributeElementType.getTypeElement();
- fStateLess = bean.isStateLess();
- }
-
- TypeVisitor typeVisitor = new TypeVisitor();
- InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,fCurrentLevel,fLevelsDeep);
- if(attributeElementType.getTypeElement().isBean() && !TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())
- && !(getReturnParam() && (TypeFactory.isRecognizedReturnType(attributeElementType.getTypeElement().getTypeName()) || fStateLess)))
-
- addParentGetter(attributeElementType.getGetterMethod(),attributeElementType.getTypeElement().getName());
- inputFileTypeGenerator.addParentGetter(returnParentGetter(),returnParentGetterType());
- inputFileTypeGenerator.setInstanceName(fInstanceName);
- inputFileTypeGenerator.setReturnParam(getReturnParam());
- typeVisitor.run(attributeElementType,inputFileTypeGenerator);
- fbuffer = inputFileTypeGenerator.getStringBuffer();
-
- return new SimpleStatus("");
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
deleted file mode 100644
index 593e43e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileGenerator.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class InputFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fResultName;
-
- /**
- * Constructor.
- * used directly
- */
- public InputFileGenerator (String result)
- {
- super();
- fResultName = result;
- }
-
- /**
- * Constructor.
- * called from subclasses
- */
- public InputFileGenerator (StringBuffer buffer, String result)
- {
- super(buffer);
- fResultName = result;
- }
-
- /**
- * Constructor.
- * called from subclasses
- */
- public InputFileGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- public void setFileNames(String results)
- {
- fResultName = results;
- }
-
- //takes in a bean node
- public Status visit (Object object)
- {
- Element beanElement = (Element)object;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>" + StringUtils.NEWLINE);
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Inputs</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("<H1>Inputs</H1>" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE + "String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
- fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
- fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("boolean valid = true;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE);
- fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-
- // go to the next generator
- MethodVisitor methodVisitor = new MethodVisitor();
- InputFileHelp1Generator inputFileHelp1Generator = new InputFileHelp1Generator(fbuffer,fResultName);
- methodVisitor.run(beanElement,inputFileHelp1Generator);
- fbuffer = inputFileHelp1Generator.getStringBuffer();
-
- fbuffer.append("case 1111111111:" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
- fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
- fbuffer.append("<TR>" + StringUtils.NEWLINE);
- fbuffer.append("<TD COLSPAN=\"1\" ALIGN=\"LEFT\">URLString:</TD>" + StringUtils.NEWLINE);
- fbuffer.append("<TD ALIGN=\"left\"><INPUT TYPE=\"TEXT\" NAME=\"url1111111111\" SIZE=20></TD>" + StringUtils.NEWLINE);
- fbuffer.append("</TR>" + StringUtils.NEWLINE);
- fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
- fbuffer.append("case 1111111112:" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
-
-
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("if (valid) {" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE + "Select a method to test." + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append(Generator.TAB + "return;" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>" + StringUtils.NEWLINE);
-
- return new SimpleStatus("");
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
deleted file mode 100644
index 3ac55fe..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp1Generator.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp1Generator.
-* */
-public class InputFileHelp1Generator extends InputFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final int INITIAL_STATE = 1;
- public static final int FINAL_STATE = 2;
-
- public int fstate;
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp1Generator (StringBuffer buffer)
- {
- super(buffer);
- fstate = INITIAL_STATE;
- }
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp1Generator (StringBuffer buffer,String resultName)
- {
- super(buffer,resultName);
- fstate = INITIAL_STATE;
- }
-
- /*
- * Takes in an element
- * @param Object Takes in an object to be acted upon
- */
- public Status visit (Object object)
- {
- Element methodElement = (Element)object;
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return new SimpleStatus("");
-
- ParameterVisitor parameterVisitor = new ParameterVisitor();
- fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
- fbuffer.append("valid = false;" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<FORM METHOD=\"POST\" ACTION=\"" + fResultName + "\" TARGET=\"result\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"HIDDEN\" NAME=\"method\" VALUE=\"<%=method%>\">" + StringUtils.NEWLINE);
-
- // go to the next generator
- InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
- parameterVisitor.run(methodElement,inputFileHelp2Generator);
- fbuffer = inputFileHelp2Generator.getStringBuffer();
-
- fbuffer.append("<BR>" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"SUBMIT\" VALUE=\"Invoke\">" + StringUtils.NEWLINE);
- fbuffer.append("<INPUT TYPE=\"RESET\" VALUE=\"Clear\">" + StringUtils.NEWLINE);
- fbuffer.append("</FORM>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
-
- return new SimpleStatus("");
-
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
deleted file mode 100644
index 703504c..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileHelp2Generator.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.RelVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a InputFileHelp2Generator.
-* */
-public class InputFileHelp2Generator extends InputFileHelp1Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /*
- * This is actually used by the result generator to show the
- * resultant Bean
- * The name is the name the resultant bean is using as its instance name
- */
- protected String fInstanceName;
- private boolean fReturnParam=false;
-
- /**
- * Constructor.
- *
- */
- public InputFileHelp2Generator (StringBuffer buffer)
- {
- super(buffer);
- fInstanceName="";
- }
-
- /**
- * This is state data to be used by the generators
- * @param String name The instance name of the parameters type bean
- */
- public void setInstanceName(String name)
- {
- fInstanceName = name;
- }
-
- /**
- * This is state data to be used by the generators
- * @return String name The instance name of the parameters type bean
- */
- public String getInstanceName()
- {
- return fInstanceName;
- }
-
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public Status visit (Object object)
- {
- Element parameterElement = (Element)object;
- RelVisitor visitor = (RelVisitor)getVisitor();
- ParameterElement parameter = (ParameterElement)parameterElement;
-
- fbuffer.append("<TABLE>" + StringUtils.NEWLINE);
-
- TypeVisitor typeVisitor = new TypeVisitor();
- InputFileTypeGenerator inputFileTypeGenerator = new InputFileTypeGenerator(fbuffer,0);
- inputFileTypeGenerator.setReturnParam(getReturnParam());
- inputFileTypeGenerator.setInstanceName(fInstanceName);
- typeVisitor.run(parameterElement,inputFileTypeGenerator);
- fbuffer = inputFileTypeGenerator.getStringBuffer();
-
- fbuffer.append("</TABLE>" + StringUtils.NEWLINE);
-
- return new SimpleStatus("");
-
- }
-
- public boolean getReturnParam()
- {
- return fReturnParam;
- }
-
- public void setReturnParam(boolean returnParam)
- {
- fReturnParam = returnParam;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
deleted file mode 100644
index d87844f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/InputFileTypeGenerator.java
+++ /dev/null
@@ -1,292 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.SimpleElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* Objects of this class represent a InputFileTypeGenerator.
-* */
-public class InputFileTypeGenerator extends InputFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- protected String fParentGetters;
- protected int fLevelsDeep;
- protected int fColspan;
- protected int fCurrentLevel;
- private boolean fIsSimple;
- private boolean fStateLessBean;
- private Vector fGetters;
- private Vector fTypes;
-
- /**
- * Constructor.
- *
- */
- public InputFileTypeGenerator (StringBuffer buffer, int currentLevel)
- {
- super(buffer);
- fCurrentLevel = currentLevel;
- fLevelsDeep = -1;
- fParentGetters = "";
- }
-
- /**
- * Constructor.
- *
- */
- public InputFileTypeGenerator (StringBuffer buffer, int currentLevel,int levelsDeep)
- {
- super(buffer);
- fCurrentLevel = currentLevel;
- fLevelsDeep = levelsDeep;
- fParentGetters = "";
- }
-
- public void setParentGetters(Vector getter,Vector type)
- {
- if(fGetters != null){
- fGetters.clear();
- fTypes.clear();
- }
- addParentGetter(getter,type);
- }
-
-
- /**
- * This function holds some state data that is important in getting the
- * Strings for display of resultant beans
- * @param String getter this is the getter of an attribute
- * The idea is that by the time we get to the simple type
- * we have getAddress().getStreet()....
- */
- public void addParentGetter(String getter, String type)
- {
- if(fGetters == null) fGetters = new Vector();
- if(fTypes == null) fTypes = new Vector();
- fGetters.addElement(getter);
- fTypes.addElement(type);
- }
-
- /*
- * this will be used when passing between two visitors
- *
- */
- public void addParentGetter(Vector getters, Vector types)
- {
- if(fGetters == null) fGetters = new Vector();
- if(fTypes == null) fTypes = new Vector();
- int size = getters.size();
- for(int i = 0; i<size; i++){
- fGetters.addElement(getters.get(i));
- fTypes.addElement(types.get(i));
- }
- }
-
- protected String returnParentGetter(int count)
- {
- if (fGetters == null || count > fGetters.size()) return null;
- return (String)fGetters.get(count);
- }
-
- protected String returnParentGetterType(int count)
- {
- if (fTypes == null || count > fTypes.size()) return null;
- return (String)fTypes.get(count);
- }
-
- protected Vector returnParentGetter()
- {
- if (fGetters == null ) return new Vector();
- return fGetters;
- }
-
- protected Vector returnParentGetterType()
- {
- if (fTypes == null ) return new Vector();
- return fTypes;
- }
-
- protected int getterCount()
- {
- if(fGetters == null) return 0;
- return fGetters.size();
- }
-
-
- /**
- * This function returns some state data that is important in getting the
- * Strings for display of resultant beans
- * @return String the string of getters to this point
- * The idea is that by the time we get to the simple type
- * we have getAddress().getStreet()....
- */
- public String getParentGetters()
- {
- return fParentGetters;
- }
-
- /*
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public Status visit (Object object)
- {
- TypeElement element = (TypeElement)object;
-
- if (element instanceof SimpleElement) fIsSimple = true;
- else fIsSimple = false;
-
- //this could be a statelessbean need to know
- if (element instanceof BeanElement ){
- BeanElement bean = (BeanElement)element;
- if (bean.isStateLess()) fStateLessBean = true;
- }
-
-
-
- //Complex type support
- //first I need to find out how many levels deep
- if(fLevelsDeep == -1){
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- LevelsDeepVisitorAction ldva = new LevelsDeepVisitorAction();
- attributeVisitor.run(element,ldva);
- fLevelsDeep = ldva.getLevelsDeep();
- //check out the fields
- FieldVisitor fieldVisitor = new FieldVisitor();
- LevelsDeepVisitorAction ldva2 = new LevelsDeepVisitorAction();
- fieldVisitor.run(element,ldva2);
-
- if(fLevelsDeep < ldva2.getLevelsDeep())fLevelsDeep = ldva2.getLevelsDeep();
- fLevelsDeep++;
- }
- fColspan = fLevelsDeep - fCurrentLevel;
-
- //if we have a return param with no getter make sure we are on the
- //attribute and not the parameter then return
- if(getReturnParam() && element.getOwningElement() instanceof AttributeElementType &&(((AttributeElementType)element.getOwningElement()).getGetterMethod() == null) ) return new SimpleStatus("");
-
- //Code gen for all elements
- fbuffer.append("<TR>" + StringUtils.NEWLINE);
- for (int i = 0; i < fCurrentLevel;i++){
- fbuffer.append("<TD WIDTH=\"5%\"></TD>" + StringUtils.NEWLINE);
- }
- fbuffer.append("<TD COLSPAN=\"" + fColspan + "\" ALIGN=\"LEFT\">" + element.getOwningElement().getName() + ":</TD>" + StringUtils.NEWLINE);
- if(fIsSimple || TypeFactory.recognizedBean(element.getName())
- || (getReturnParam() && fStateLessBean)
- || (getReturnParam() && TypeFactory.isRecognizedReturnType(element.getTypeName()))){
- if(getInstanceName().equals("")){
- DataType dataType = TypeFactory.createType(element.getName(),element.getOwningElement().getMUID());
- fbuffer.append(dataType.inputForm(element.getOwningElement().getMUID()));
- }
- else{
- if(getReturnParam() && (TypeFactory.isRecognizedReturnType(element.getTypeName()) || fStateLessBean)){
- DataType dataType = TypeFactory.createType(element.getTypeName(),element.getOwningElement().getMUID());
- String uniqueName = "type" + dataType.getUniqueName();
- fbuffer.append("<TD>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("if(" + getInstanceName() + " != null){" + StringUtils.NEWLINE);
- String afterString = getInstanceName();
- String tmpString = "tebece";
- String prevString = getInstanceName();
- String newTmpString = "";
- for(int i=0;i<getterCount();i++){
- newTmpString = tmpString + i;
- fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
- prevString = newTmpString;
- fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
- afterString = newTmpString;
- }
- fbuffer.append(element.getName() + " " + uniqueName + " = " + afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ ";" + StringUtils.NEWLINE);
- fbuffer.append(dataType.TypeConversion(uniqueName));
- for(int i=0;i<getterCount();i++){
- fbuffer.append("}");
- }
- fbuffer.append("}%>" + StringUtils.NEWLINE);
- fbuffer.append("</TD>" + StringUtils.NEWLINE);
- }
-
- else{
- fbuffer.append("<TD>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("if(" + getInstanceName() + " != null){" + StringUtils.NEWLINE);
- String afterString = getInstanceName();
- String tmpString = "tebece";
- String prevString = getInstanceName();
- String newTmpString = "";
- for(int i=0;i<getterCount();i++){
- newTmpString = tmpString + i;
- fbuffer.append(returnParentGetterType(i) + " " + newTmpString + "=" + prevString + "." + returnParentGetter(i) + ";" + StringUtils.NEWLINE);
- prevString = newTmpString;
- fbuffer.append("if(" + newTmpString + " != null){" + StringUtils.NEWLINE);
- afterString = newTmpString;
- }
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<%=");
- fbuffer.append(afterString + "." + ((AttributeElementType)element.getOwningElement()).getGetterMethod()+ StringUtils.NEWLINE);
- fbuffer.append("%>");
- fbuffer.append("<%");
- for(int i=0;i<getterCount();i++){
- fbuffer.append("}");
- }
- fbuffer.append("}%>" + StringUtils.NEWLINE);
- fbuffer.append("</TD>" + StringUtils.NEWLINE);
- }
- }
-
- }
-
- //Now carry on down the rest of the bean
- else {
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- attributeVisitor.setResidentVector1(returnParentGetter());
- attributeVisitor.setResidentVector2(returnParentGetterType());
- InputFileAttributeGenerator inputFileAttributeGenerator = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
- inputFileAttributeGenerator.setReturnParam(getReturnParam());
- inputFileAttributeGenerator.setInstanceName(fInstanceName);
- attributeVisitor.run(element,inputFileAttributeGenerator);
- fbuffer = inputFileAttributeGenerator.getStringBuffer();
-
- //now do fields very similar
- FieldVisitor fieldVisitor = new FieldVisitor();
- fieldVisitor.setResidentVector1(returnParentGetter());
- fieldVisitor.setResidentVector2(returnParentGetterType());
- InputFileAttributeGenerator inputFileAttributeGenerator2 = new InputFileAttributeGenerator(fbuffer,(fCurrentLevel + 1),fLevelsDeep);
- inputFileAttributeGenerator2.setReturnParam(getReturnParam());
- inputFileAttributeGenerator2.setInstanceName(fInstanceName);
- fieldVisitor.run(element,inputFileAttributeGenerator2);
- fbuffer = inputFileAttributeGenerator2.getStringBuffer();
-
-
-
- }
-
-
- return new SimpleStatus("");
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
deleted file mode 100644
index d488b93..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/LevelsDeepVisitorAction.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.Visitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.VisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a LevelsDeepVisitorAction.
-* */
-public class LevelsDeepVisitorAction implements VisitorAction
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Visitor fVisitor;
- private int fLevelsDeep;
- private int fDeepestLevel;
-
- /**
- * Constructor.
- * This is the starting point
- *
- */
- public LevelsDeepVisitorAction ()
- {
- fLevelsDeep = 0;
- }
-
- /**
- * Constructor.
- * This is the starting point
- *
- */
- public LevelsDeepVisitorAction (int current,boolean increment)
- {
- fLevelsDeep = current;
- if(increment) fLevelsDeep++;
- fDeepestLevel = fLevelsDeep;
- }
-
- public void initialize(String resident)
- {
- //nothing to be done but must be implemented
- }
-
-
-
- /**
- * The visitor that called this VisitorAction
- * @param visitor the visitor that called this visitor action
- */
- public void setVisitor(Visitor visitor)
- {
- fVisitor = visitor;
- }
-
-
- /**
- * Returns the level of nesting within this bean
- * @return int returns the int number representing the number of nests of this bean
- */
- public int getLevelsDeep()
- {
- return fDeepestLevel;
- }
-
-
- /**
- * Takes in an object to be acted upon by this visitor action
- * @param Object The object to be acted upon
- */
- public Status visit (Object object)
- {
- Element element = (Element)object;
- if (element instanceof AttributeElement || element instanceof TypeElement){
- TypeVisitor typeVisitor = new TypeVisitor();
- LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,true);
- typeVisitor.run(element,lvda);
-
- if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep();
-
- }
- else if (element instanceof BeanElement && !(TypeFactory.recognizedBean(element.getName()))){
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- LevelsDeepVisitorAction lvda = new LevelsDeepVisitorAction(fLevelsDeep,false);
- attributeVisitor.run(element,lvda);
- if (lvda.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda.getLevelsDeep();
-
- FieldVisitor fieldVisitor = new FieldVisitor();
- LevelsDeepVisitorAction lvda2 = new LevelsDeepVisitorAction(fLevelsDeep,false);
- fieldVisitor.run(element,lvda2);
- if (lvda2.getLevelsDeep() > fDeepestLevel) fDeepestLevel = lvda2.getLevelsDeep();
-
- }
-
- return new SimpleStatus("");
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
deleted file mode 100644
index cbd667f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileGenerator.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fInputName;
- /**
- * Constructor.
- *
- */
- public MethodFileGenerator (String inputs)
- {
- super();
- fInputName = inputs;
- }
-
- /**
- * Constructor.
- * @param StringBuffer buffer to append codegen
- */
- public MethodFileGenerator (StringBuffer buffer,String inputs)
- {
- super(buffer);
- fInputName = inputs;
- }
-
-
- public void setFileNames(String inputs)
- {
- fInputName = inputs;
- }
-
- //public static String LOCATOR = "Locator";
- public static String BEAN = "Proxy";
- public static String GET = "get";
-
-
- //takes in a bean node
- public Status visit (Object object)
- {
- Element beanElement = (Element)object;
- BeanElement bean = (BeanElement)beanElement;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE + "<HEAD>" + StringUtils.NEWLINE + "<TITLE>Methods</TITLE>" + StringUtils.NEWLINE + "</HEAD>" + StringUtils.NEWLINE + "<BODY>" + StringUtils.NEWLINE + "<H1>Methods</H1>" + StringUtils.NEWLINE + "<UL>" + StringUtils.NEWLINE);
- MethodVisitor methodVisitor = new MethodVisitor();
- MethodFileHelpGenerator methodFileHelpGenerator = new MethodFileHelpGenerator(fbuffer,fInputName);
- methodVisitor.run(beanElement,methodFileHelpGenerator);
- fbuffer = methodFileHelpGenerator.getStringBuffer();
- fbuffer.append("</UL>" + StringUtils.NEWLINE + "</BODY>" + StringUtils.NEWLINE + "</HTML>");
-
- return new SimpleStatus("");
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
deleted file mode 100644
index f17420d..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/MethodFileHelpGenerator.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class MethodFileHelpGenerator extends MethodFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- /**
- * Constructor.
- *
- */
- public MethodFileHelpGenerator (StringBuffer buffer,String inputName)
- {
- super(buffer,inputName);
- }
-
-
- //takes in a Method node
- public Status visit (Object object)
- {
- Element methodElement = (Element)object;
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return new SimpleStatus("");
-
- fbuffer.append("<LI><A HREF=\"" + fInputName + "?method=" + method.getNumberID());
- fbuffer.append("\" TARGET=\"inputs\"> " + method.getDisplayName());
- fbuffer.append("</A></LI>" + StringUtils.NEWLINE);
-
- return new SimpleStatus("");
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
deleted file mode 100644
index e17c910..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileAttributeGenerator.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.AttributeElementType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.BasicElement;
-
-/**
-* Objects of this class represent a ResultFileAttributeGenerator.
-* */
-public class ResultFileAttributeGenerator extends ResultFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Vector fSetterVector;
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileAttributeGenerator (StringBuffer buffer)
- {
- super(buffer);
-
- }
-
- /**
- * Setter vector
- */
- public Vector getSetterVector()
- {
- return fSetterVector;
- }
-
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public Status visit (Object object)
- {
- AttributeElementType attributeElementType = (AttributeElementType)object;
- BasicElement element = (BasicElement)object;
- if(attributeElementType.getTypeElement().isSimple() || TypeFactory.recognizedBean(attributeElementType.getTypeElement().getName())){
- //start the codegen
- //ask the datatype for its request line, it may need mark up or not.
- //ie For the simple types we need the mark up
- //for the dom element we cant use it.
- DataType dataType = TypeFactory.createType(attributeElementType.getTypeElement().getName(),element.getMUID());
- setTypeOwnerId(idName(element.getName()));
- fbuffer.append(dataType.getRequestCode(element.getMUID(),getTypeOwnerId()));
-
- }
-
- TypeVisitor typeVisitor = new TypeVisitor();
- ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
- resultFileTypeGenerator.setNumberFactory(getNumberFactory());
- resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
-
- typeVisitor.run(attributeElementType,resultFileTypeGenerator);
- setNumberFactory(resultFileTypeGenerator.getNumberFactory());
- Vector setterInputs = resultFileTypeGenerator.getResidentVector();
- if(attributeElementType.getSetterMethod() == null) return new SimpleStatus("");
- putResidentVector(attributeElementType.getSetterSignature((String)setterInputs.firstElement()));
-
- return new SimpleStatus("");
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
deleted file mode 100644
index 86d55df..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileGenerator.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.MethodVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.BeanElement;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a MethodFilegenerator.
-* */
-public class ResultFileGenerator extends Generator
-{
- public static String TRIPLE_TAB = Generator.DOUBLE_TAB + Generator.TAB;
- public static String QUAD_TAB = Generator.DOUBLE_TAB + Generator.DOUBLE_TAB;
-
- private String setEndpointMethod;
-
- /**
- * Constructor.
- *
- */
- public ResultFileGenerator ()
- {
- super();
- }
-
- /**
- * Constructor.
- *
- */
- public ResultFileGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- //takes in a bean node
- public Status visit (Object object)
- {
- Element beanElement = (Element)object;
- BeanElement bean = (BeanElement)beanElement;
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Result</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("<H1>Result</H1>" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("<jsp:useBean id=\""+ getSessionBeanId() + "\" scope=\"session\" class=\"");
- fbuffer.append(bean.getName() + "\" />" + StringUtils.NEWLINE);
- if (setEndpointMethod != null && setEndpointMethod.length() > 0)
- {
- fbuffer.append("<%");
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append("if (request.getParameter(\"endpoint\") != null && request.getParameter(\"endpoint\").length() > 0)");
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append(getSessionBeanId());
- fbuffer.append(".");
- int index = setEndpointMethod.indexOf('?');
- if (index != -1)
- {
- fbuffer.append(setEndpointMethod.substring(0, index));
- fbuffer.append("(new ");
- fbuffer.append(setEndpointMethod.substring(index+1, setEndpointMethod.length()));
- fbuffer.append("(request.getParameter(\"endpoint\")));");
- }
- else
- {
- fbuffer.append(setEndpointMethod);
- fbuffer.append("(request.getParameter(\"endpoint\"));");
- }
- fbuffer.append(StringUtils.NEWLINE);
- fbuffer.append("%>");
- fbuffer.append(StringUtils.NEWLINE);
- }
- fbuffer.append(StringUtils.NEWLINE);
-
- //carry on with regular gorp
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("String method = request.getParameter(\"method\");" + StringUtils.NEWLINE);
- fbuffer.append("int methodID = 0;" + StringUtils.NEWLINE);
- fbuffer.append("if (method == null) methodID = -1;" + StringUtils.NEWLINE + "" + StringUtils.NEWLINE);
- fbuffer.append("if(methodID != -1) methodID = Integer.parseInt(method);" + StringUtils.NEWLINE);
- fbuffer.append("boolean gotMethod = false;" + StringUtils.NEWLINE + StringUtils.NEWLINE);
-
- fbuffer.append("try {" + StringUtils.NEWLINE);
- fbuffer.append("switch (methodID){ " + StringUtils.NEWLINE);
-
- // go to the next generator
- MethodVisitor methodVisitor = new MethodVisitor();
- ResultFileHelp1Generator resultFileHelp1Generator = new ResultFileHelp1Generator(fbuffer);
- resultFileHelp1Generator.setNumberFactory(getNumberFactory());
- resultFileHelp1Generator.setClientFolderPath(getClientFolderPath());
- methodVisitor.run(beanElement,resultFileHelp1Generator);
- setNumberFactory(resultFileHelp1Generator.getNumberFactory());
-
- fbuffer = resultFileHelp1Generator.getStringBuffer();
-
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("} catch (Exception e) { " + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("exception: <%= e %>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("return;" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("if(!gotMethod){" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("result: N/A" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>");
-
- return new SimpleStatus("");
- }
-
- /**
- * @param setEndpointMethod The setEndpointMethod to set.
- */
- public void setSetEndpointMethod(String setEndpointMethod)
- {
- this.setEndpointMethod = setEndpointMethod;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
deleted file mode 100644
index 5bf4ae4..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp1Generator.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.ReturnParameterVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.MethodElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a ResultFilegenerator.
-* */
-public class ResultFileHelp1Generator extends ResultFileGenerator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public static final int INITIAL_STATE = 1;
- public static final int FINAL_STATE = 2;
- public static final String MTEMP = "mtemp";
- public static String BEAN = "Proxy";
-
- /**
- * keeps the state of the visitor
- * */
-
- private int fstate;
-
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileHelp1Generator (StringBuffer buffer)
- {
- super(buffer);
- fstate = INITIAL_STATE;
-
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param method method code will be generated for
- */
- public Status visit (Object object)
- {
- Element methodElement = (Element)object;
-
-
- MethodElement method = (MethodElement)methodElement;
- if (method.getMethodOmmission()) return new SimpleStatus("");
-
- fbuffer.append("case " + method.getNumberID()+ ":" + StringUtils.NEWLINE);
- visitHelper(method);
-
- fbuffer.append("break;" + StringUtils.NEWLINE);
-
- return new SimpleStatus("");
- }
- /**
- * Helps out the visitor
- * @param method method code will be generated for
- */
- public void visitHelper (Element methodElement)
- {
-
- fbuffer.append(Generator.DOUBLE_TAB + "gotMethod = true;" + StringUtils.NEWLINE);
-
- MethodElement method = (MethodElement)methodElement;
- // go to the next generator
- ResultFileHelp2Generator resultFileHelp2Generator = new ResultFileHelp2Generator(fbuffer);
- resultFileHelp2Generator.setNumberFactory(getNumberFactory());
- ParameterVisitor parameterVisitor = new ParameterVisitor();
- parameterVisitor.run(methodElement,resultFileHelp2Generator);
- fbuffer = resultFileHelp2Generator.getStringBuffer();
- setNumberFactory(resultFileHelp2Generator.getNumberFactory());
- // we must now grab the state data from the resident vector
- setResidentVector(resultFileHelp2Generator.getResidentVector());
-
-
- //there is no return type if void occurs
-
-
- if (method.getReturnParameterElement().getTypeElement().getName().equals("void"))
- fbuffer.append(Generator.DOUBLE_TAB + getSessionBeanId() + "." +method.getName() + "(");
-
- else{
- fbuffer.append(Generator.DOUBLE_TAB + method.getReturnParameterElement().getTypeElement().getName() + Generator.SPACE + method.getMUID() + MTEMP + Generator.SPACE);
- fbuffer.append("=" + Generator.SPACE + getSessionBeanId() + "." + method.getName() + "(");
- }
-
- Enumeration e = fResidentVector.elements();
- while (e.hasMoreElements()){
- fbuffer.append((String)e.nextElement());
- if (e.hasMoreElements())
- fbuffer.append(",");
- }
- fbuffer.append(");" + StringUtils.NEWLINE);
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()){
- //in case our result is null
- fbuffer.append("if(" + method.getMUID() + "mtemp == null){" + StringUtils.NEWLINE);
- fbuffer.append("%>" + StringUtils.NEWLINE);
- fbuffer.append("<%=" + method.getMUID() + "mtemp %>" + StringUtils.NEWLINE);
- fbuffer.append("<%" + StringUtils.NEWLINE);
- fbuffer.append("}else{" + StringUtils.NEWLINE);
- }
-
- //now lets display the return bean
- // if it is simple we dont need to use the generator
-
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void")){
- if (method.getReturnParameterElement().getTypeElement().isSimple()
- || TypeFactory.recognizedBean(method.getReturnParameterElement().getTypeElement().getName())
- || TypeFactory.isStateLessBean(method.getReturnParameterElement().getTypeElement().getTypeName())
- || TypeFactory.isRecognizedReturnType(method.getReturnParameterElement().getTypeElement().getTypeName())){
- DataType dataType = TypeFactory.createType(method.getReturnParameterElement().getTypeElement().getTypeName(),method.getReturnParameterElement().getMUID());
- fbuffer.append(dataType.TypeConversion(method.getMUID() + MTEMP));
- }
- else{
- fbuffer.append("%>" + StringUtils.NEWLINE);
- InputFileHelp2Generator inputFileHelp2Generator = new InputFileHelp2Generator(fbuffer);
- inputFileHelp2Generator.setInstanceName(method.getMUID() + MTEMP);
- inputFileHelp2Generator.setReturnParam(true);
- ReturnParameterVisitor returnParameterVisitor = new ReturnParameterVisitor();
- returnParameterVisitor.run(method,inputFileHelp2Generator);
- fbuffer = inputFileHelp2Generator.getStringBuffer();
- fbuffer.append("<%" + StringUtils.NEWLINE);
-
- }
- }
-
- if (!method.getReturnParameterElement().getTypeElement().getName().equals("void") && !method.getReturnParameterElement().getTypeElement().isPrimitive()) fbuffer.append("}" + StringUtils.NEWLINE);
-
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
deleted file mode 100644
index 0a7d3ce..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileHelp2Generator.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.TypeVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.ParameterElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileHelp2Generator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private String fTypeOwnerId;
-
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileHelp2Generator (StringBuffer buffer)
- {
- super(buffer);
-
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public Status visit (Object object)
- {
-
-
- ParameterElement parameterElement = (ParameterElement)object;
- Element element= parameterElement.getTypeElement();
- if(parameterElement.getTypeElement().isSimple() || TypeFactory.recognizedBean(parameterElement.getTypeElement().getName())){
- //start the codegen
- //ask the datatype for its request line, it may need mark up or not.
- //ie For the simple types we need the mark up
- //for the dom element we cant use it.
- DataType dataType = TypeFactory.createType(parameterElement.getTypeElement().getName(),parameterElement.getMUID());
- setTypeOwnerId(idName(parameterElement.getName()));
- fbuffer.append(dataType.getRequestCode(parameterElement.getMUID(),getTypeOwnerId()));
- }
-
- //visit the type generator
- ResultFileTypeGenerator resultFileTypeGenerator = new ResultFileTypeGenerator(fbuffer);
- resultFileTypeGenerator.setNumberFactory(getNumberFactory());
- resultFileTypeGenerator.setTypeOwnerId(getTypeOwnerId());
- TypeVisitor TypeVisitor = new TypeVisitor();
- TypeVisitor.run(parameterElement,resultFileTypeGenerator);
- fbuffer = resultFileTypeGenerator.getStringBuffer();
- setNumberFactory(resultFileTypeGenerator.getNumberFactory());
- String name = (String)resultFileTypeGenerator.getResidentVector().firstElement();
- putResidentVector(name);
-
- return new SimpleStatus("");
- }
-
-
- public String getTypeOwnerId()
- {
- if (fTypeOwnerId == null) fTypeOwnerId = "";
- return fTypeOwnerId;
- }
-
- public void setTypeOwnerId(String name)
- {
- fTypeOwnerId = name;
- }
-
- public String idName(String name)
- {
-
- String uniqueNum = String.valueOf(getUniqueNumber());
- String newName = name.replace('.','1') + "_" +uniqueNum + "id";
- return newName;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
deleted file mode 100644
index 1b73326..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/ResultFileTypeGenerator.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import java.util.Enumeration;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.AttributeVisitor;
-import org.eclipse.jst.ws.internal.consumption.codegen.bean.FieldVisitor;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.DataType;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeElement;
-import org.eclipse.jst.ws.internal.consumption.datamodel.beanmodel.TypeFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-/**
-* Objects of this class represent a ResultFileHelp2generator.
-* */
-public class ResultFileTypeGenerator extends ResultFileHelp2Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
-
- public String fTypeIdName;
-
- /**
- * Constructor.
- * @param buffer StringBuffer object that this code generator writes to
- */
- public ResultFileTypeGenerator (StringBuffer buffer)
- {
- super(buffer);
- }
-
- /**
- * Visit Method generates code for this Visitor
- * @param Parameter parameter code will be generated
- */
- public Status visit (Object object)
- {
- Element typeElement = (Element)object;
- TypeElement type = (TypeElement)typeElement;
- // right now we only have simple to worry about
- if(type.isSimple() || TypeFactory.recognizedBean(type.getName())){
- // create the type that represents the simple type name
- DataType dataType = TypeFactory.createType(type.getName(),type.getOwningElement().getMUID());
-
- String nodeName = getTypeOwnerId()+ "Temp";
- fbuffer.append(dataType.stringConversion(type.getName(),nodeName,getTypeOwnerId()));
-
- putResidentVector(nodeName);
- }
-
- else {
- //must be complex
- String typeName = typeElement.getName();
- fTypeIdName = idName(typeName);
-
- AttributeVisitor attributeVisitor = new AttributeVisitor();
- ResultFileAttributeGenerator resultFileAttributeGenerator = new ResultFileAttributeGenerator(fbuffer);
- resultFileAttributeGenerator.setNumberFactory(getNumberFactory());
- attributeVisitor.run(typeElement,resultFileAttributeGenerator);
- setNumberFactory(resultFileAttributeGenerator.getNumberFactory());
- fbuffer = resultFileAttributeGenerator.getStringBuffer();
-
- FieldVisitor fieldVisitor = new FieldVisitor();
- ResultFileAttributeGenerator resultFileAttributeGenerator2 = new ResultFileAttributeGenerator(fbuffer);
- resultFileAttributeGenerator2.setNumberFactory(getNumberFactory());
- fieldVisitor.run(typeElement,resultFileAttributeGenerator2);
- setNumberFactory(resultFileAttributeGenerator2.getNumberFactory());
- fbuffer = resultFileAttributeGenerator2.getStringBuffer();
-
-
- fbuffer.append(Generator.DOUBLE_TAB + "%>" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "<jsp:useBean id=\"" + fTypeIdName + "\" scope=\"session\" class=\"" + typeName + "\" />" + StringUtils.NEWLINE);
- fbuffer.append(Generator.DOUBLE_TAB + "<%" + StringUtils.NEWLINE);
-
- Enumeration e = resultFileAttributeGenerator.getResidentVector().elements();
- while(e.hasMoreElements()){
- fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e.nextElement() + StringUtils.NEWLINE);
- }
-
- Enumeration e2 = resultFileAttributeGenerator2.getResidentVector().elements();
- while(e2.hasMoreElements()){
- fbuffer.append(Generator.DOUBLE_TAB + fTypeIdName + "." + e2.nextElement() + StringUtils.NEWLINE);
- }
- putResidentVector(fTypeIdName);
- //end of changes
-
- }
-
- return new SimpleStatus("");
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
deleted file mode 100644
index 958f18f..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/codegen/TestClientFileGenerator.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.codegen;
-
-import org.eclipse.jst.ws.internal.common.StringUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-
-
-/**
-* Objects of this class represent a TestClientFilegenerator.
-* */
-public class TestClientFileGenerator extends Generator
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- public String fMethodName;
- public String fInputName;
- public String fResultName;
-
- /**
- * Constructor.
- *
- */
- public TestClientFileGenerator (String inputs, String methods, String results)
- {
- super();
- fInputName = inputs;
- fMethodName = methods;
- fResultName = results;
- }
-
- public void setFileNames(String inputs, String methods, String results)
- {
- fInputName = inputs;
- fMethodName = methods;
- fResultName = results;
- }
-
- //takes in a bean node
- public Status visit (Object object)
- {
- Element beanElement = (Element)object;
-
- fbuffer.append("<%@page contentType=\"text/html;charset=UTF-8\"%>");
- fbuffer.append("<HTML>" + StringUtils.NEWLINE);
- fbuffer.append("<HEAD>" + StringUtils.NEWLINE);
- fbuffer.append("<TITLE>Web Services Test Client</TITLE>" + StringUtils.NEWLINE);
- fbuffer.append("</HEAD>" + StringUtils.NEWLINE + "");
- fbuffer.append("<FRAMESET COLS=\"220,*\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\""+ fMethodName + "\" NAME=\"methods\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAMESET ROWS=\"80%,20%\">" + StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\""+ fInputName + "\" NAME=\"inputs\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("<%").append(StringUtils.NEWLINE);
- fbuffer.append("StringBuffer resultJSP = new StringBuffer(\"").append(fResultName).append("\");").append(StringUtils.NEWLINE);
- fbuffer.append("resultJSP.append(\"?\");").append(StringUtils.NEWLINE);
- fbuffer.append("java.util.Enumeration resultEnum = request.getParameterNames();");
- fbuffer.append("while (resultEnum.hasMoreElements()) {").append(StringUtils.NEWLINE);
- fbuffer.append("Object resultObj = resultEnum.nextElement();").append(StringUtils.NEWLINE);
- fbuffer.append("resultJSP.append(resultObj.toString()).append(\"=\").append(request.getParameter(resultObj.toString())).append(\"&\");").append(StringUtils.NEWLINE);
- fbuffer.append("}").append(StringUtils.NEWLINE);
- fbuffer.append("%>").append(StringUtils.NEWLINE);
- fbuffer.append("<FRAME SRC=\"<%=resultJSP.toString()%>\" NAME=\"result\" MARGINWIDTH=\"1\" MARGINHEIGHT=\"1\" SCROLLING=\"yes\" FRAMEBORDER=\"1\">" + StringUtils.NEWLINE);
- fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
-
-
- fbuffer.append("<NOFRAMES>" + StringUtils.NEWLINE);
- fbuffer.append("<BODY>" + StringUtils.NEWLINE);
- fbuffer.append("The Web Services Test Client requires a browser that supports frames." + StringUtils.NEWLINE);
- fbuffer.append("</BODY>" + StringUtils.NEWLINE);
- fbuffer.append("</NOFRAMES>" + StringUtils.NEWLINE);
- fbuffer.append("</FRAMESET>" + StringUtils.NEWLINE);
- fbuffer.append("</HTML>");
-
- return new SimpleStatus("");
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
deleted file mode 100644
index 527d0f8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/GeneratePageCommand.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.command;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.jst.ws.internal.consumption.codegen.Generator;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-
-/**
- * MofToBeanModelCommand
- * Creation date: (4/10/2001 12:41:48 PM)
- * @author: Gilbert Andrews
- */
-public class GeneratePageCommand extends SimpleCommand {
-
-private String LABEL = "GeneratePageCommand";
-private String DESCRIPTION = "Generate code based on the model";
-private MessageUtils msgUtils_;
-
-private Model model_;
-private Generator fGenerator;
-private IFile fIFile;
-private ResourceContext resourceContext_;
-private StringBuffer fStringBuffer;
-
-private Element rootElement_;
-/**
- * Build constructor comment.
- */
-public GeneratePageCommand()
-{
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
-}
-
-/**
-* Constructor
-* This command will generate code from a Model
-* @param model The model to be traversed
-* @param generator The code generator to be used
-* @param resource the resource to place the finished product
-*/
-public GeneratePageCommand(ResourceContext context, Model model, Generator generator, IFile file)
-{
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
-
- model_ = model;
- fGenerator = generator;
- fIFile = file;
- resourceContext_ = context;
-}
-
-public Model getDataModel()
-{
- return model_;
-}
-
-/**
- *
- */
-public Status execute(Environment env)
-{
- Status status = new SimpleStatus( "" );
- try {
- fGenerator.visit(model_.getRootElement());
- fStringBuffer = fGenerator.getStringBuffer();
- String tempString = fStringBuffer.toString();
- OutputStream fileResource = FileResourceUtils.newFileOutputStream(resourceContext_, fIFile.getFullPath(), env.getProgressMonitor(), env.getStatusHandler());
- //PrintStream ps = new PrintStream(fileResource);
- //ps.print(tempString);
- OutputStreamWriter osw = new OutputStreamWriter(fileResource,"UTF-8");
- osw.write(tempString,0,fStringBuffer.length());
- osw.close();
- fileResource.close();
- return status;
- } catch (IOException ioexc) {
- status = new SimpleStatus("", ioexc.getMessage(), Status.ERROR);
- return status;
- }
-}
-
-public void setRootElement(Element rootElement)
-{
- rootElement_ = rootElement;
-}
-
-}
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
deleted file mode 100644
index d982163..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/command/JavaToModelCommand.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.command;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitoractions.JavaMofBeanVisitorAction;
-import org.eclipse.jst.ws.internal.consumption.codegen.javamofvisitors.JavaMofBeanVisitor;
-import org.eclipse.jst.ws.internal.consumption.command.common.JavaMofReflectionCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-import org.eclipse.wst.ws.internal.datamodel.Element;
-import org.eclipse.wst.ws.internal.datamodel.Model;
-
-/**
-* This is the base class for commands that need to report progress
-* and status during and after their execution. This class extends
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-* with methods to {@link #setProgressMonitor set}
-* and {@link #getProgressMonitor get} a progress monitor,
-* and to get a status object {@link #getReadyStatus before}
-* or {@link #getResultStatus after} execution.
-* <p>
-* Note that the responsibility of providing an
-* {@link org.eclipse.core.runtime.IProgressMonitor IProgressMonitor}
-* rests with frameworks that construct or run ProgressCommand objects,
-* whereas the responsibility of providing an
-* {@link org.eclipse.core.runtime.IStatus IStatus}
-* object lies with the subclasses of ProgressCommand.
-* Subclasses must follow the rules described for
-* {@link org.eclipse.emf.common.command.AbstractCommand AbstractCommand}.
-*/
-public class JavaToModelCommand extends SimpleCommand
-{
- private MessageUtils msgUtils;
- private IResource resource;
- private String clientProject;
- private BooleanSelection[] methods;
- private String proxyBean;
- private JavaClass javaClass;
- private Model model;
- private Element parentElement;
- private IProject project;
-
- public static String LABEL = "JavaToModelCommand";
- public static String DESCRIPTION = "this creates a model from a resource";
-
-
-
- public JavaToModelCommand ()
- {
- String pluginId = "org.eclipse.jst.ws.consumption";
- msgUtils = new MessageUtils(pluginId + ".plugin", this);
- setDescription(DESCRIPTION);
- setName(LABEL);
- }
-
-
- private Status createJavaReflection(Environment env)
- {
- Status status = new SimpleStatus("");
- JavaMofReflectionCommand javaMofReflectionCommand = new JavaMofReflectionCommand();
- javaMofReflectionCommand.setClientProject(clientProject);
- javaMofReflectionCommand.setProxyBean(proxyBean);
- //javaMofReflectionCommand.setStatusMonitor(getStatusMonitor());
- status = javaMofReflectionCommand.execute(env);
- javaClass = (JavaClass)javaMofReflectionCommand.getJavaClass();
- return status;
- }
-
- /**
- * The Model that was created from this javamof
- * @return Model The data model that was created
- **/
- public Model getDataModel()
- {
- return model;
- }
-
- /**
- * Build the datamodel from the mof
- */
- public Status buildModelFromMof (Environment env) throws CoreException
- {
-
- Choice OKChoice = new Choice('O', msgUtils.getMessage("LABEL_OK"), msgUtils.getMessage("DESCRIPTION_OK"));
- Choice CancelChoice = new Choice('C', msgUtils.getMessage("LABEL_CANCEL"), msgUtils.getMessage("DESCRIPTION_CANCEL"));
-
- // we could have one of three cases:
- //1. The model is null meaning we want and the parent element is null, meaning we want to
- // create a brand new model and make this bean its root
- //2. The model is null but the parentElement is not, meaning we want to add the Bean to the
- // given parent element
- //3. The model is not null however the parentElement is, meaning we want to add this Bean to
- // This model but dont attach it to anything
- Status status = new SimpleStatus("");
-
- if(model == null && parentElement == null){
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(clientProject,methods, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- model = beanVisitorAction.getModel();
-
- }
- else if (model == null && parentElement != null){
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(parentElement,clientProject, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- model = beanVisitorAction.getModel();
- }
- else {
- JavaMofBeanVisitorAction beanVisitorAction = new JavaMofBeanVisitorAction(model,clientProject, env);
- //beanVisitorAction.setStatusMonitor(getStatusMonitor());
- JavaMofBeanVisitor beanVisitor = new JavaMofBeanVisitor();
- status = beanVisitor.run(javaClass,beanVisitorAction);
- //
- int severity = status.getSeverity();
- if (severity==Status.ERROR)
- return status;
-
- if (severity==Status.WARNING)
- {
- Choice result = env.getStatusHandler().report(status, new Choice[]{OKChoice, CancelChoice});
- if (result.getLabel().equals(CancelChoice.getLabel()))
- {
- //return an error status since the user canceled
- return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_SAMPLE_CREATION_CANCELED"), Status.ERROR);
- }
-
- }
- //
- model = beanVisitorAction.getModel();
- }
-
- return status;
- }
-
- /**
- * Get the java model from the resource then
- * build the model from the mof
- */
- public Status execute(Environment env)
- {
- Status status = new SimpleStatus("");
- if(clientProject == null) return status;
- IProject project = (IProject)ProjectUtilities.getProject(clientProject);
-
- status = createJavaReflection(env);
- if (status.getSeverity()==Status.ERROR) return status;
- try{
- status = buildModelFromMof(env);
- return status;
- }catch(CoreException exc){
- IStatus embeddedStatus = exc.getStatus();
- status = EnvironmentUtils.convertIStatusToStatus(embeddedStatus);
- return status;
- }
-
- }
-
- public void setMethods(BooleanSelection[] methods)
- {
- this.methods = methods;
- }
-
- public void setClientProject(String clientProject)
- {
- this.clientProject = clientProject;
- }
-
- public void setParentElement(Element parentElement)
- {
- this.parentElement = parentElement;
- }
-
- public void setProxyBean(String proxyBean)
- {
- this.proxyBean = proxyBean;
- }
-
- }
-
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
deleted file mode 100644
index 74f4b01..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/sampleapp/common/SamplePropertyDescriptor.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.sampleapp.common;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.Method;
-
-
-/**
-* Objects of this class represent a PropertyDescriptor.
-* */
-public class SamplePropertyDescriptor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
-
- private Method fReadMethod;
- private Method fWriteMethod;
- private String fPropertyName;
- private JavaHelpers fPropertyType;
- private boolean fStatic;
-
- /*
- * Constructor
- **/
- public SamplePropertyDescriptor(String name)
- {
- fPropertyName = name;
- }
-
- /*
- * set the ReadMethod
- */
- public void setReadMethod(Method readMethod)
- {
- fReadMethod = readMethod;
- }
-
- /*
- * get the ReadMethod
- */
- public Method getReadMethod()
- {
- return fReadMethod;
- }
-
- /*
- * set the writeMethod
- */
- public void setWriteMethod(Method writeMethod)
- {
- fWriteMethod = writeMethod;
- }
-
- /*
- * get the writeMethod
- */
- public Method getWriteMethod()
- {
- return fWriteMethod;
- }
-
- /*
- * set the propertyName
- */
- public void setName(String name)
- {
- fPropertyName= name;
- }
-
- /*
- * get the propertyName
- */
- public String getName()
- {
- return fPropertyName;
- }
-
- /*
- * set the PropertyType
- */
- public void setPropertyType(JavaHelpers propertyType)
- {
- fPropertyType = propertyType;
- }
-
- /*
- * get the PropertyType
- */
- public JavaHelpers getPropertyType()
- {
- return fPropertyType;
- }
-
- public boolean isfStatic()
- {
- return fStatic;
- }
-
- public void setfStatic(boolean fStatic)
- {
- this.fStatic = fStatic;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
deleted file mode 100644
index 7ea7ff5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/IWSFinder.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.List;
-
-public interface IWSFinder
-{
- public String getID();
- public void setID(String id);
-
- public String getName();
- public void setName(String name);
-
- public String getDescription();
- public void setDescription(String desc);
-
- public List find();
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
deleted file mode 100644
index 18b1f2e..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/LiveWSDLFilter.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.WSDLException;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPAddress;
-import javax.wsdl.extensions.soap.SOAPAddress;
-
-import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt;
-import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException;
-
-public class LiveWSDLFilter extends Thread
-{
- private String wsdlURL_;
- private boolean finish_;
- private boolean live_;
-
- public LiveWSDLFilter(String wsdlURL)
- {
- wsdlURL_ = wsdlURL;
- finish_ = false;
- live_ = false;
- }
-
- public String getWSDLURL()
- {
- return wsdlURL_;
- }
-
- public boolean isFinish()
- {
- return finish_;
- }
-
- public boolean isWSDLLive()
- {
- return live_;
- }
-
- public void run()
- {
- try
- {
- live_ = validateWSDL();
- }
- catch (Throwable t)
- {
- live_ = false;
- }
- finally
- {
- finish_ = true;
- }
- }
-
- private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException
- {
- WebServicesParserExt parser = new WebServicesParserExt();
- Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_);
- Map services = definition.getServices();
- Iterator serviceIterator = services.values().iterator();
- while (serviceIterator.hasNext())
- {
- Service service = (Service)serviceIterator.next();
- Map ports = service.getPorts();
- Iterator portIterator = ports.values().iterator();
- while (portIterator.hasNext())
- {
- Port port = (Port)portIterator.next();
- List extensibilityElements = port.getExtensibilityElements();
- Iterator extensibilityElementsIterator = extensibilityElements.iterator();
- while (extensibilityElementsIterator.hasNext())
- {
- ExtensibilityElement extensibilityElement = (ExtensibilityElement)extensibilityElementsIterator.next();
- if ((extensibilityElement instanceof SOAPAddress) || (extensibilityElement instanceof HTTPAddress))
- return true;
- }
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderCommon.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderCommon.java
deleted file mode 100644
index 4cc1cc8..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderCommon.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectNature;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.IWebNatureConstants;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-
-public abstract class WSFinderCommon implements IWSFinder
-{
- private String id_;
- private String name_;
- private String desc_;
-
- public WSFinderCommon()
- {
- id_ = null;
- name_ = null;
- desc_ = null;
- }
-
- public String getID()
- {
- return id_;
- }
-
- public void setID(String id)
- {
- id_ = id;
- }
-
- public String getName()
- {
- return name_;
- }
-
- public void setName(String name)
- {
- name_ = name;
- }
-
- public String getDescription()
- {
- return desc_;
- }
-
- public void setDescription(String desc)
- {
- desc_ = desc;
- }
-
- protected IProject[] getWorkspaceProjects()
- {
- IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();
- return root.getProjects();
- }
-
- protected J2EEWebNatureRuntime getWebNature(IProject project)
- {
- try
- {
- IProjectNature nature = project.getNature(IWebNatureConstants.J2EE_NATURE_ID);
- if (nature != null && nature instanceof J2EEWebNatureRuntime)
- return (J2EEWebNatureRuntime)nature;
- }
- catch (CoreException ce)
- {
- }
- return null;
- }
-
- protected EJBNatureRuntime getEJBNature(IProject project)
- {
- try
- {
- IProjectNature nature = project.getNature(IEJBNatureConstants.NATURE_ID);
- if (nature != null && nature instanceof EJBNatureRuntime)
- return (EJBNatureRuntime)nature;
- }
- catch (CoreException ce)
- {
- }
- return null;
- }
-
- protected IFolder getFolderRootPublishable(J2EEWebNatureRuntime webNature)
- {
- return (IFolder)webNature.getRootPublishableFolder();
- }
-
- protected IFolder getFolderWEBINF(J2EEWebNatureRuntime webNature)
- {
- return webNature.getProject().getFolder(webNature.getWEBINFPath().toString());
- }
-
- protected IFolder getFolderMETAINF(EJBNatureRuntime ejbNature)
- {
- return ejbNature.getMetaFolder();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
deleted file mode 100644
index 04d7c92..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/wsfinder/WSFinderRegistry.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.consumption.wsfinder;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class WSFinderRegistry
-{
- private static WSFinderRegistry instance_;
- private Vector wsfinders_;
-
- private WSFinderRegistry()
- {
- wsfinders_ = new Vector();
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WSFinderRegistry object.
- */
- public static WSFinderRegistry getInstance()
- {
- if (instance_ == null)
- {
- instance_ = new WSFinderRegistry();
- instance_.init();
- }
- return instance_;
- }
-
- private void init()
- {
- IExtensionRegistry pluginReg = Platform.getExtensionRegistry();
- IConfigurationElement[] configElements = pluginReg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption", "wsfinder");
- for (int i = 0; i < configElements.length; i++)
- {
- try
- {
- Object object = configElements[i].createExecutableExtension("class");
- if (object instanceof IWSFinder)
- {
- IWSFinder wsfinder = (IWSFinder)object;
- wsfinder.setID(configElements[i].getAttribute("id"));
- wsfinder.setName(configElements[i].getAttribute("name"));
- wsfinder.setDescription(configElements[i].getAttribute("description"));
- wsfinders_.add(wsfinder);
- }
- }
- catch (CoreException ce)
- {
- }
- }
- }
-
- public List getWSFinders()
- {
- return wsfinders_;
- }
-
- public List getWebServices()
- {
- List ws = new Vector();
- List wsFinders = getWSFinders();
- for (Iterator it = wsFinders.iterator(); it.hasNext();)
- {
- IWSFinder wsFinder = (IWSFinder)it.next();
- ws.addAll(wsFinder.find());
- }
- return ws;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
deleted file mode 100644
index 641cdf6..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/DomElementHelper.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.DocumentBuilder;
-import org.w3c.dom.Document;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DomElementHelper {
-
-
- public static org.w3c.dom.Element createDomElementFromXMLString(java.lang.String xmlString )
- {
- java.io.StringReader stringReader = new java.io.StringReader(xmlString);
- org.xml.sax.InputSource inputSource = new org.xml.sax.InputSource(stringReader);
- try
- {
- DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
- DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
- Document document = docBuilder.parse(inputSource);
- return document.getDocumentElement();
- }
- catch (Throwable t)
- {
- return null;
- }
- }
-
- public static java.lang.String domWriter(org.w3c.dom.Node node,java.lang.StringBuffer buffer)
- {
- if ( node == null ) {
- return "";
- }
- int type = node.getNodeType();
- switch ( type ) {
- case org.w3c.dom.Node.DOCUMENT_NODE: {
- buffer.append(JspUtils.markup("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + "<br>");
- domWriter(((org.w3c.dom.Document)node).getDocumentElement(),buffer);
- break;
- }
- case org.w3c.dom.Node.ELEMENT_NODE: {
- buffer.append(JspUtils.markup("<" + node.getNodeName()));
- org.w3c.dom.Attr attrs[] = sortAttributes(node.getAttributes());
- for ( int i = 0; i < attrs.length; i++ ) {
- org.w3c.dom.Attr attr = attrs[i];
- buffer.append(" " + attr.getNodeName() + "=\"" + JspUtils.markup(attr.getNodeValue()) + "\"");
- }
- buffer.append(JspUtils.markup(">"));
- org.w3c.dom.NodeList children = node.getChildNodes();
- if ( children != null ) {
- int len = children.getLength();
- for ( int i = 0; i < len; i++ ) {
- if(((org.w3c.dom.Node)children.item(i)).getNodeType() == org.w3c.dom.Node.ELEMENT_NODE)
- buffer.append("<br>");
- domWriter(children.item(i),buffer);
- }
- }
- buffer.append(JspUtils.markup("</" + node.getNodeName() + ">"));
- break;
- }
- case org.w3c.dom.Node.ENTITY_REFERENCE_NODE: {
- org.w3c.dom.NodeList children = node.getChildNodes();
- if ( children != null ) {
- int len = children.getLength();
- for ( int i = 0; i < len; i++ )
- {
- buffer.append(children.item(i));
- }
- }
- break;
- }
- case org.w3c.dom.Node.CDATA_SECTION_NODE: {
- buffer.append(JspUtils.markup(node.getNodeValue()));
- break;
- }
- case org.w3c.dom.Node.TEXT_NODE:{
- buffer.append(JspUtils.markup(node.getNodeValue()));
- break;
- }
- case org.w3c.dom.Node.PROCESSING_INSTRUCTION_NODE:{
- buffer.append(JspUtils.markup("<?"));
- buffer.append(node.getNodeName());
- String data = node.getNodeValue();
- if ( data != null && data.length() > 0 ){
- buffer.append(" ");
- buffer.append(data);
- }
- buffer.append(JspUtils.markup("?>"));
- break;
- }
- }
- return buffer.toString();
- }
-
- public static org.w3c.dom.Attr[] sortAttributes(org.w3c.dom.NamedNodeMap attrs)
- {
- int len = (attrs != null) ? attrs.getLength() : 0;
- org.w3c.dom.Attr array[] = new org.w3c.dom.Attr[len];
- for ( int i = 0; i < len; i++ ){
- array[i] = (org.w3c.dom.Attr)attrs.item(i);
- }
- for ( int i = 0; i < len - 1; i++ ) {
- String name = array[i].getNodeName();
- int index = i;
- for ( int j = i + 1; j < len; j++ ) {
- String curName = array[j].getNodeName();
- if ( curName.compareTo(name) < 0 ) {
- name = curName;
- index = j;
- }
- }
- if ( index != i ) {
- org.w3c.dom.Attr temp = array[i];
- array[i] = array[index];
- array[index] = temp;
- }
- }
- return (array);
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
deleted file mode 100644
index abb9013..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/JspUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class JspUtils {
- public static String markup(String text) {
- if (text == null) {
- return null;
- }
-
- StringBuffer buffer = new StringBuffer();
- for (int i = 0; i < text.length(); i++) {
- char c = text.charAt(i);
- switch (c) {
- case '<':
- buffer.append("<");
- break;
- case '&':
- buffer.append("&");
- break;
- case '>':
- buffer.append(">");
- break;
- case '"':
- buffer.append(""");
- break;
- default:
- buffer.append(c);
- break;
- }
- }
- return buffer.toString();
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
deleted file mode 100644
index ba85190..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementHelper.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class SoapElementHelper {
-/*
- * This class is being gutted for the moment,
- * until a means for including saaj.jar or an
- * equivalent keeper of the javax.xml.soap package
- * can be determined. The disabling of this class
- * will only cause problems if Sample JSPs are
- * generated for Web Service proxies that have
- * SOAPElements on their interfaces.
- *
- public static javax.xml.soap.SOAPElement createSOAPElementFromXMLString(String xmlString) throws SoapElementRuntimeException
- {
- throw new SoapElementRuntimeException("SoapElement is not supported by the sample on the current runtime. Please use WebSphere v5.1 or higher.");
- }
-
- public static java.lang.String soapElementWriter(javax.xml.soap.SOAPElement node,java.lang.StringBuffer buffer)
- {
- if (node == null ) {
- return "";
- }
-
- buffer.append(JspUtils.markup("<" + node.getElementName().getLocalName()));
- java.util.Iterator attrs = node.getAllAttributes();
- while(attrs.hasNext()) {
- javax.xml.soap.Name attr = (javax.xml.soap.Name)attrs.next();
- buffer.append(" " + attr.getQualifiedName() + "=\"" + JspUtils.markup(node.getAttributeValue(attr)) + "\"");
- }
- buffer.append(JspUtils.markup(">"));
- java.util.Iterator children = node.getChildElements();
- if ( children != null ) {
- while(children.hasNext()){
- javax.xml.soap.Node childNode = (javax.xml.soap.Node)children.next();
- if(childNode instanceof javax.xml.soap.SOAPElement){
- buffer.append("<br>");
- soapElementWriter((javax.xml.soap.SOAPElement)childNode,buffer);
- }
- else
- buffer.append(JspUtils.markup(((javax.xml.soap.Text)childNode).getValue()));
- }
- buffer.append(JspUtils.markup("</" + node.getElementName().getLocalName() + ">"));
- }
- return buffer.toString();
- }
-*/
-}
diff --git a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java b/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
deleted file mode 100644
index 2335ef5..0000000
--- a/bundles/org.eclipse.jst.ws.consumption/webserviceutils/org/eclipse/jst/ws/util/SoapElementRuntimeException.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.util;
-
-/**
- * @author gilberta
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class SoapElementRuntimeException extends Exception {
-
- /**
- * Comment for <code>serialVersionUID</code>
- */
- private static final long serialVersionUID = 3761693372674748471L;
-
-public SoapElementRuntimeException(String message){
- super(message);
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project b/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
deleted file mode 100644
index 8023461..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.ejb.ui</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 9dad884..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ejb.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.ui,
- org.eclipse.wst.command.env.ui
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
deleted file mode 100644
index 6e2940f..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = plugin.xml,\
- plugin.properties,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
deleted file mode 100644
index 13fe654..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation EJB Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-#
-# Web service types
-#
-WEBSERVICETYPE_NAME_EJB_TP=EJB Web Service
-WEBSERVICETYPE_NAME_WSDL_EJB_TP=Skeleton EJB Web Service
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
deleted file mode 100644
index 4a8659f..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ejb.ui/plugin.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- EJB Web Service Types -->
-<!--
- <extension
- point="org.eclipse.jst.ws.consumption.ui.webServiceServerRuntimeType">
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_WSDL_EJB_TP"
- resourceTypeMetadata="File IResource"
- extensionMetadata=".wsdl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.WSDLSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.wsdl.ejb">
- </webServiceType>
-
- <webServiceType
- label="%WEBSERVICETYPE_NAME_EJB_TP"
- resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
- extensionMetadata=".java .class .SessionImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget"
- includeNatures="org.eclipse.jst.j2ee.ejb.EJBNature"
- excludeNatures=""
- id="org.eclipse.jst.ws.type.ejb">
- </webServiceType>
- </extension>
--->
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
- </extension>
-
-
-<!-- EJB stuff -->
- <extension point="org.eclipse.jst.ws.consumption.ui.wsImpl">
- <webServiceImpl
- id="org.eclipse.jst.ws.wsImpl.ejb"
- label="%WEBSERVICETYPE_NAME_EJB_TP"
- resourceTypeMetadata="EJBObject org.eclipse.jst.j2ee.ejb.EnterpriseBean SessionImpl"
- extensionMetadata=".java .class .SessionImpl"
- objectSelectionWidget="org.eclipse.jst.ws.internal.consumption.ui.widgets.object.EJBSelectionWidget">
- </webServiceImpl>
- </extension>
-
-<extension point="org.eclipse.jst.ws.consumption.ui.serviceType">
- <serviceType
- id="org.eclipse.jst.ws.serviceType.ejb"
- implId="org.eclipse.jst.ws.wsImpl.ejb"
- buModuleTypesInclude="jst.ejb"
- buModuleTypesExclude=""
- tdModuleTypesInclude="jst.ejb"
- tdModuleTypesExclude="">
- </serviceType>
-</extension>
-
-
-
-</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.classpath b/bundles/org.eclipse.jst.ws.creation.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore b/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
deleted file mode 100644
index f5bbdc1..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-wss-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/.project b/bundles/org.eclipse.jst.ws.creation.ui/.project
deleted file mode 100644
index ef454e4..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.creation.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.ui</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 7ba1d95..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,41 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.creation.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: wss-ui.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.creation.ui,
- org.eclipse.jst.ws.internal.creation.ui.extension,
- org.eclipse.jst.ws.internal.creation.ui.plugin,
- org.eclipse.jst.ws.internal.creation.ui.preferences,
- org.eclipse.jst.ws.internal.creation.ui.widgets,
- org.eclipse.jst.ws.internal.creation.ui.widgets.binding,
- org.eclipse.jst.ws.internal.creation.ui.widgets.runtime,
- org.eclipse.jst.ws.internal.creation.ui.widgets.test
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.wsdl,
- org.eclipse.wst.ws,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.ws,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws.ui,
- org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jdt.core,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.common,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.wsdl4j
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/about.html b/bundles/org.eclipse.jst.ws.creation.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/build.properties b/bundles/org.eclipse.jst.ws.creation.ui/build.properties
deleted file mode 100644
index 70eb6b7..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.wss-ui.jar = src/
-bin.includes = wss-ui.jar,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
deleted file mode 100644
index ca44ef8..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
deleted file mode 100644
index 74fcd77..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/export_ws_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
deleted file mode 100644
index 2d737f0..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/ctool16/new_webserv_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif b/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
deleted file mode 100644
index abd1f9c..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/icons/full/wizban/webservices_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
deleted file mode 100644
index c124705..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.properties
+++ /dev/null
@@ -1,62 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Creation Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-PLUGIN_NEW_WIZARD_NAME_WS_SERVICE=Web Service
-PLUGIN_EXPORT_WIZARD_NAME_WS=Web Service
-PLUGIN_NEW_WIZARD_DESC_WS_SERVICE=Create a new XML web service.
-PLUGIN_EXPORT_WIZARD_DESC_WS=A wizard for exporting a web service.
-
-#
-# Web Services Preferance Pages
-#
-# Dialogs
-CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG=Hide Create Web service Dialog
-CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG=Hide Generate Java Bean Skeleton Dialog
-CHECKBOX_SHOW_GENERATE_WSDL_FILES_DIALOG=Hide Generate WSDL Files Dialog
-CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG=Hide Publish WSDL Dialog
-
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-
-
-#
-# Preferences Tooltips
-#
-#Action Dialogs
-TOOLTIP_PPAD_CHECKBOX_DEPLOY=Hides the dialog for deploying a Web service action
-TOOLTIP_PPAD_CHECKBOX_SKELETON=Hides the dialog for generating Java bean Skeleton action
-TOOLTIP_PPAD_CHECKBOX_WSDL=Hides the dialog for generating WSDL files action
-TOOLTIP_PPAD_CHECKBOX_PUBLISH=Hides the dialog for publishing the WSDL action
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-ACTION_GENERATE_JAVA_SKELETON=Generate Java bean skeleton
-ACTION_PUBLISH_WSDL=Publish WSDL file
-
-#
-# Wizards.
-#
-WIZARD_TITLE_WSS=Web Service
-
-
-#
-# Pop-up actions
-#
-ACTION_DEPLOY_WEBSERVICE=Create Web service
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml b/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
deleted file mode 100644
index 9392d11..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/plugin.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <!-- Wizards -->
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"
- id="org.eclipse.jst.ws.ui.new">
- </category>
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_SERVICE"
- icon="icons/full/ctool16/new_webserv_wiz.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_SERVICE
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/full/wizban/webservices_wiz.gif"
- title="%WIZARD_TITLE_WSS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ServerWidgetBinding"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.ui.exportWizards">
- <wizard
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- icon="icons/export_ws.gif"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="wsexport">
- <description>
- %PLUGIN_EXPORT_WIZARD_DESC_WS
- </description>
- </wizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/export_ws_wiz.gif"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="wsexport">
- </dynamicWizard>
- </extension>
-
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- iconbanner="icons/export_ws_wiz.gif"
- name="%PLUGIN_EXPORT_WIZARD_NAME_WS"
- class="org.eclipse.jst.ws.internal.creation.ui.widgets.binding.ExportWSWidgetBinding"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </dynamicWizard>
- </extension>
-
- <!-- "Don't Show Me" Preferences -->
-
- <extension
- point="org.eclipse.wst.command.env.actionDialogPreferenceType">
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_DEPLOY_WEB_SERVICE_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_DEPLOY"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0006"
- category="org.eclipse.jst.wss.popup.category"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_GENERATE_SKELETON_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_SKELETON"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0008"
- category="org.eclipse.jst.wss.popup.category"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- </actionDialogPreferenceType>
-
- <actionDialogPreferenceType
- name="%CHECKBOX_SHOW_PUBLISH_WSDL_DIALOG"
- tooltip="%TOOLTIP_PPAD_CHECKBOX_PUBLISH"
- infopop="org.eclipse.jst.ws.creation.ui.PPAD0009"
- category="org.eclipse.jst.wss.popup.category"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </actionDialogPreferenceType>
-
- </extension>
-
- <!-- Popups -->
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jdt.internal.core.CompilationUnit"
- nameFilter="*.java"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.Service"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.wst.wsdl.util.WSDLResourceImpl"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"
- nameFilter="*"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java">
- <action
- label="%ACTION_DEPLOY_WEBSERVICE"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="additions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsil"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton">
- <action
- label="%ACTION_GENERATE_JAVA_SKELETON"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.serverwizard">
- </action>
- </objectContribution>
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IFile"
- nameFilter="*.wsdl"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- <action
- label="%ACTION_PUBLISH_WSDL"
- class="org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard"
- menubarPath="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu/popupActions"
- id="org.eclipse.jst.ws.creation.ui.wizard.publish">
- </action>
- </objectContribution>
-
- </extension>
-
- <!-- Preference Pages -->
-
- <extension point="org.eclipse.ui.preferencePages">
- <page
- name="%PREFERENCE_CATEGORY_SCENARIO_DEFAULTS"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage"
- id="org.eclipse.jst.ws.internal.creation.ui.preferences.ScenarioDefaultsPreferencePage">
- </page>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
deleted file mode 100644
index 6a4c47a..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/creation/ui/plugin.properties
+++ /dev/null
@@ -1,25 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# WSDL Test Errors
-#
-MSG_ERROR_UNABLE_TO_LAUNCH_WSDL_TEST=IWAB0361E An error occurred. Unable to launch WSDL test facility.
-
-
-#
-# Wizard pages
-#
-PAGE_TITLE_OBJECT_SELECTION=Object Selection Page
-PAGE_DESC_OBJECT_SELECTION=Object Selection Page
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
deleted file mode 100644
index fb74deb..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceAssembleCommand.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceAssembleCommand extends SimpleCommand
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
- private String j2eeLevel_;
-
- public Status execute(Environment environment)
- {
- System.out.println( "In Pre service assemble command." );
-
- // Check if EAR module is req'd, ie. !=null
- if (earProject_==null)
- return new SimpleStatus("");
-
-
- //Create the service EAR module
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(earProject_);
- command.setModuleName(ear_);
- command.setModuleType(CreateModuleCommand.EAR);
- command.setServerFactoryId(webService_.getWebServiceInfo().getServerFactoryId());
- command.setServerInstanceId( webService_.getWebServiceInfo().getServerInstanceId() );
- command.setJ2eeLevel(j2eeLevel_);
- Status status = command.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- return status;
- }
-
-
- //Associate the service module and service EAR
- AssociateModuleWithEARCommand associateCommand = new AssociateModuleWithEARCommand();
- associateCommand.setProject(project_);
- associateCommand.setModule(module_);
- associateCommand.setEARProject(earProject_);
- associateCommand.setEar(ear_);
- status = associateCommand.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
-
- return status;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
-
- public void setJ2eeLevel( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
deleted file mode 100644
index 3f27a29..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDeployCommand.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class PreServiceDeployCommand extends SimpleCommand
-{
- public Status execute(Environment environment)
- {
- System.out.println( "In Pre service deploy command." );
-
- return super.execute(environment);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
deleted file mode 100644
index 44336fd..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceDevelopCommand.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IContext;
-import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceState;
-import org.eclipse.wst.ws.internal.wsrt.SimpleContext;
-
-public class PreServiceDevelopCommand extends SimpleCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private Environment environment_;
- private IContext context_;
- private ISelection selection_;
- private String project_;
- private String module_;
- private String moduleType_;
- private String earProject_;
- private String ear_;
-
- private IWebService webService_;
- private String j2eeLevel_;
- private ResourceContext resourceContext_;
-
- private boolean run_;
- private boolean client_;
- private boolean test_;
- private boolean publish_;
-
-
- public Status execute(Environment environment)
- {
-
- // Split up the project and module
- int index = module_.indexOf("/");
- if (index!=-1){
- project_ = module_.substring(0,index);
- module_ = module_.substring(index+1);
- }
-
- if (ear_!=null && ear_.length()>0)
- {
- int earIndex = ear_.indexOf("/");
- if (earIndex!=-1) {
- earProject_ = ear_.substring(0,earIndex);
- ear_ = ear_.substring(earIndex+1);
- }
- }
-
-
- IWebServiceRuntime wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntime( typeRuntimeServer_.getRuntimeId() );
- WebServiceInfo wsInfo = new WebServiceInfo();
-
- System.out.println( "In Pre service develop command." );
-
- wsInfo.setJ2eeLevel( j2eeLevel_ );
- wsInfo.setServerFactoryId( typeRuntimeServer_.getServerId() );
- wsInfo.setServerInstanceId( typeRuntimeServer_.getServerInstanceId());
- wsInfo.setState( WebServiceState.UNKNOWN_LITERAL );
- wsInfo.setWebServiceRuntimeId( typeRuntimeServer_.getRuntimeId() );
-
-
- environment_ = environment;
- webService_ = wsrt.getWebService( wsInfo );
-
- //Set up the IContext
- WebServiceScenario scenario = null;
- int scenarioInt = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(typeRuntimeServer_.getTypeId());
- if (scenarioInt == WebServiceScenario.BOTTOMUP)
- {
- scenario = WebServiceScenario.BOTTOMUP_LITERAL;
- String impl = (String)(selection_.getSelection())[0];
- wsInfo.setImplURL(impl);
- }
- else if (scenarioInt == WebServiceScenario.TOPDOWN)
- {
- scenario = WebServiceScenario.TOPDOWN_LITERAL;
- String wsdlURL = (String)(selection_.getSelection())[0];
- wsInfo.setWsdlURL(wsdlURL);
- }
-
- context_ = new SimpleContext(true, true, true, true, run_, client_, test_, publish_,
- scenario,
- resourceContext_.isOverwriteFilesEnabled(),
- resourceContext_.isCreateFoldersEnabled(),
- resourceContext_.isCheckoutFilesEnabled());
-
- //Create the service module
-
- //rsk todo -- pick the correct module type based on the Web service type, it's hard coded to WEB for now.
- int intModuleType = convertModuleType(moduleType_);
-
-
- CreateModuleCommand command = new CreateModuleCommand();
- command.setProjectName(project_);
- command.setModuleName(module_);
- command.setModuleType(intModuleType);
- command.setServerFactoryId(typeRuntimeServer_.getServerId());
- command.setServerInstanceId(typeRuntimeServer_.getServerInstanceId());
- command.setJ2eeLevel(j2eeLevel_);
- Status status = command.execute(environment);
-
-
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
-
- private int convertModuleType(String type)
- {
- if (type.equals(IModuleConstants.JST_WEB_MODULE))
- {
- return CreateModuleCommand.WEB;
- }
- else if (type.equals(IModuleConstants.JST_EJB_MODULE))
- {
- return CreateModuleCommand.EJB;
- }
- else if (type.equals(IModuleConstants.JST_APPCLIENT_MODULE))
- {
- return CreateModuleCommand.APPCLIENT;
- }
- else if (type.equals(IModuleConstants.JST_EAR_MODULE))
- {
- return CreateModuleCommand.EAR;
- }
- else
- {
- return -1;
- }
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer typeRuntimeServer )
- {
- typeRuntimeServer_ = typeRuntimeServer;
- }
-
- public void setServiceJ2EEVersion( String j2eeLevel )
- {
- j2eeLevel_ = j2eeLevel;
- }
-
- public String getJ2eeLevel()
- {
- return j2eeLevel_;
- }
-
- public IWebService getWebService()
- {
- return webService_;
- }
-
- public Environment getEnvironment()
- {
- return environment_;
- }
-
- public IContext getContext()
- {
- return context_;
- }
-
- public void setResourceContext( ResourceContext resourceContext )
- {
- resourceContext_ = resourceContext;
- }
-
- public ISelection getSelection()
- {
- return selection_;
- }
-
- public void setSelection( ISelection selection )
- {
- selection_ = selection;
- }
-
- public String getProject()
- {
- return project_;
- }
-
- public String getModule()
- {
- return module_;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setModuleType(String type)
- {
- moduleType_ = type;
- }
-
- public String getEarProject()
- {
- return earProject_;
- }
-
- public String getEar()
- {
- return ear_;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setStartService(boolean startService)
- {
- run_ = startService;
- }
-
- public void setTestService(boolean testService)
- {
- test_ = testService;
- }
-
- public void setPublishService(boolean publishService)
- {
- publish_ = publishService;
- }
-
- public void setGenerateProxy(boolean genProxy)
- {
- client_ = genProxy;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
deleted file mode 100644
index e3805de..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceInstallCommand.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.AddModuleToServerCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceInstallCommand extends SimpleCommand
-{
- private IWebService webService_;
- private String project_;
- private String module_;
- private String earProject_;
- private String ear_;
-
- public Status execute(Environment environment)
- {
- System.out.println( "In Pre service install command." );
-
- if (webService_.getWebServiceInfo().getServerInstanceId()==null)
- {
- CreateServerCommand createServerCommand = new CreateServerCommand();
- createServerCommand.setServerFactoryid(webService_.getWebServiceInfo().getServerFactoryId());
- Status createServerStatus = createServerCommand.execute(environment);
- if (createServerStatus.getSeverity()==Status.OK)
- {
- webService_.getWebServiceInfo().setServerInstanceId(createServerCommand.getServerInstanceId());
- }
- else
- {
- if (createServerStatus.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(createServerStatus);
- }
- return createServerStatus;
- }
- }
-
-
-
- AddModuleToServerCommand command = new AddModuleToServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- if (earProject_ != null && earProject_.length()>0 && ear_!= null && ear_.length()>0)
- {
- command.setProject(earProject_);
- command.setModule(ear_);
- }
- else
- {
- command.setProject(project_);
- command.setModule(module_);
- }
-
- Status status = command.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
- }
-
- public void setProject( String project )
- {
- project_ = project;
- }
-
- public void setModule( String module )
- {
- module_ = module;
- }
-
- public void setEarProject( String earProject )
- {
- earProject_ = earProject;
- }
-
- public void setEar( String ear )
- {
- ear_ = ear;
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
deleted file mode 100644
index d6f839b..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/PreServiceRunCommand.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.StartServerCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService;
-
-public class PreServiceRunCommand extends SimpleCommand
-{
- private IWebService webService_;
-
- public Status execute(Environment environment)
- {
- System.out.println( "In Pre service run command." );
-
- StartServerCommand command = new StartServerCommand();
- command.setServerInstanceId(webService_.getWebServiceInfo().getServerInstanceId());
- Status status = command.execute(environment);
- if (status.getSeverity()==Status.ERROR)
- {
- environment.getStatusHandler().reportError(status);
- }
- return status;
-
- }
-
- public void setWebService( IWebService webService )
- {
- webService_ = webService;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
deleted file mode 100644
index 6331cb6..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/extension/ServiceRootFragment.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.creation.ui.extension;
-
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.DataObjectCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.extensions.AssembleServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DeployServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.DevelopServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.InstallServiceFragment;
-import org.eclipse.wst.ws.internal.extensions.RunServiceFragment;
-
-public class ServiceRootFragment extends SequenceFragment
-{
- public ServiceRootFragment()
- {
- add( new SimpleFragment( new PreServiceDevelopCommand(), "" ) );
- add( new DevelopServiceFragment() );
- add( new SimpleFragment( new PreServiceAssembleCommand(), "" ) );
- add( new AssembleServiceFragment() );
- add( new SimpleFragment( new PreServiceDeployCommand(), "" ) );
- add( new DeployServiceFragment() );
- add( new SimpleFragment( new PreServiceInstallCommand(), "" ) );
- add( new InstallServiceFragment() );
- add( new SimpleFragment( new PreServiceRunCommand(), "" ) );
- add( new RunServiceFragment() );
- }
-
- public void registerDataMappings(DataMappingRegistry registry)
- {
- //Mappings from framework to extension fragments
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DevelopServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", DevelopServiceFragment.class );
-
- // Map the PreServiceDevelopCommand into the dataObject and the PreClientDevelopCommand.
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DataObjectCommand.class, "DataObject", null );
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreClientDevelopCommand.class, "DataObject", null );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", AssembleServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", AssembleServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", DeployServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", DeployServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", InstallServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", InstallServiceFragment.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Environment", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Context", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Selection", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", RunServiceFragment.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", RunServiceFragment.class );
-
- //Mappings from framework to framework commands
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceAssembleCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "J2eeLevel", PreServiceAssembleCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Project", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Module", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "EarProject", PreServiceInstallCommand.class );
- registry.addMapping( PreServiceDevelopCommand.class, "Ear", PreServiceInstallCommand.class );
-
- registry.addMapping( PreServiceDevelopCommand.class, "WebService", PreServiceRunCommand.class );
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
deleted file mode 100644
index db02600..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/plugin/WebServiceCreationUIPlugin.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services Creation UI plugin.
-* <p>
-* The Web Services Creation UI plugin's sole function is to add
-* user interface of the Web Services Creation Wizard, contained in
-* the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServiceCreationUIPlugin extends Plugin
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.creation.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceCreationUIPlugin instance_;
- private Log log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- * The "plugin" element in plugin.xml should include the attribute
- * class = "org.eclipse.jst.ws.internal.creation.ui.plugin.WebServiceCreationUIPlugin".
- * @param descriptor The descriptor of this plugin.
- */
- public WebServiceCreationUIPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceCreationUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.creation.ui");
- * @return The WebServiceCreationUIPlugin singleton.
- */
- public static WebServiceCreationUIPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.creation.ui.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties. Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See the JDK's
- * {@link java.text.MessageFormat java.text.MessageFormat}
- * class for further details on substitution.
- * @return The String message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index d0ab4aa..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-
-
-
-/**
- *
- */
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- private ServerWizardWidget serverWidget_ = null;
-
- public void init(IWorkbench workbench) { }
- /* (non-Javadoc)
- * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite)
- */
-
- protected Control createContents(Composite parent)
- {
- UIUtils utils = new UIUtils(null, null);
-
- Composite page = utils.createComposite( parent, 1 );
-
- serverWidget_ = new ServerWizardWidget( false );
- serverWidget_.addControls( page, new Listener()
- {
- public void handleEvent( Event evt ){}
- } );
- initializeValues();
- return page;
- }
-
- private void initializeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- // Set values from context.
- TypeRuntimeServer serverIds = new TypeRuntimeServer();
- TypeRuntimeServer clientIds = new TypeRuntimeServer();
-
- serverIds.setTypeId( context.getWebServiceType() );
- clientIds.setTypeId( context.getClientWebServiceType() );
-
- serverWidget_.setServiceTypeRuntimeServer( serverIds );
- serverWidget_.setClientTypeRuntimeServer( clientIds );
- serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxy()) );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorer()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebService()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebService()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebService()));
- serverWidget_.internalize();
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- setToDefaults();
- }
-
- private void setToDefaults()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- // Set values from context.
- TypeRuntimeServer serverIds = new TypeRuntimeServer();
- TypeRuntimeServer clientIds = new TypeRuntimeServer();
-
- serverIds.setTypeId( context.getWebServiceTypeDefault() );
- clientIds.setTypeId( context.getClientWebServiceTypeDefault() );
-
- serverWidget_.setServiceTypeRuntimeServer( serverIds );
- serverWidget_.setClientTypeRuntimeServer( clientIds );
- serverWidget_.setGenerateProxy( new Boolean(context.getGenerateProxyDefault()) );
- serverWidget_.setPublishService( new Boolean(context.getLaunchWebServiceExplorerDefault()) );
- serverWidget_.setStartService( new Boolean(context.getStartWebServiceDefault()) );
- serverWidget_.setTestService( new Boolean(context.getTestWebServiceDefault()) );
- serverWidget_.setMonitorService(new Boolean(context.getMonitorWebServiceDefault()));
- serverWidget_.internalize();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- private void storeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
-
- TypeRuntimeServer serverIds = serverWidget_.getServiceTypeRuntimeServer();
- TypeRuntimeServer clientIds = serverWidget_.getClientTypeRuntimeServer();
-
- context.setWebServiceType( serverIds.getTypeId() );
- context.setClientWebServiceType( clientIds.getTypeId() );
- context.setGenerateProxy( serverWidget_.getGenerateProxy().booleanValue() );
- context.setLaunchWebServiceExplorer( serverWidget_.getPublishService().booleanValue() );
- context.setStartWebService( serverWidget_.getStartService().booleanValue() );
- context.setTestWebService( serverWidget_.getTestService().booleanValue() );
- context.setMonitorWebService(serverWidget_.getMonitorService().booleanValue());
- }
-
- protected void performApply()
- {
- performOk();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
deleted file mode 100644
index 37927fe..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidget.java
+++ /dev/null
@@ -1,302 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PreferencesSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.WebServiceClientTypeWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidget extends SimpleWidgetDataContributor
-{
- private WebServiceClientTypeWidget clientWidget_;
- private PreferencesSelectionWidget preferencesWidget_;
- private Listener statusListener_;
- private TypeRuntimeServer ids_;
- private LabelsAndIds labelIds_;
- private boolean displayPreferences_;
-
- /*CONTEXT_ID PWPR0001 for the Project Page*/
- private String INFOPOP_PWPR_PAGE = "PWPR0001";
-
- /*CONTEXT_ID PWPR0005 for the Generate Proxy check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY = "PWPR0005";
- private Button generateProxy_;
-
- /*CONTEXT_ID PWPR0010 for the Web Service Type combo box of the Project Page*/
- private String INFOPOP_PWPR_COMBO_TYPE = "PWPR0010";
- private Combo webserviceType_;
-
- /*CONTEXT_ID PWPR0011 for the Wizard Scenario Service group of the Project Page*/
- private String INFOPOP_PWPR_GROUP_SCENARIO_SERVICE = "PWPR0011";
- private Button startService_;
-
- /*CONTEXT_ID PWPR0009 for the Start Web Project check box check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT = "PWPR0009";
-
- /*CONTEXT_ID PWPR0013 for the test service checkbox of the project page*/
- private String INFOPOP_PWPR_CHECKBOX_TEST_SERVICE = "PWPR0013";
- private Button testService_;
-
- /*CONTEXT_ID PWPR0014 for the monitor service checkbox of the projec page*/
- private String INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE = "PWPR0014";
- private Button monitorService;
-
- /*CONTEXT_ID PWPR0012 for the Launch UDDI check box of the Project Page*/
- private String INFOPOP_PWPR_CHECKBOX_LAUNCH_WS = "PWPR0012";
- private Button launchUddi_;
-
- public ServerWizardWidget( boolean displayPreferences )
- {
- displayPreferences_ = displayPreferences;
- }
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener)
- {
- String pluginId = "org.eclipse.jst.ws.consumption.ui";
- String createPluginId = "org.eclipse.jst.ws.creation.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId + ".plugin", this );
- UIUtils utils = new UIUtils( msgUtils, createPluginId );
-
- statusListener_ = statusListener;
-
- PlatformUI.getWorkbench().getHelpSystem().setHelp( parent, pluginId + "." + INFOPOP_PWPR_PAGE );
-
- Composite serverComposite = utils.createComposite( parent, 1 );
-
- Group serviceGroup = utils.createGroup( serverComposite, "GROUP_SCENARIO_SERVICE",
- "TOOLTIP_PWPR_GROUP_SCENARIO_SERVICE",
- INFOPOP_PWPR_GROUP_SCENARIO_SERVICE,
- 2, 10, 10);
-
-
- // Create webservice combo box.
- webserviceType_ = utils.createCombo( serviceGroup, "LABEL_WEBSERVICETYPE",
- "TOOLTIP_PWPR_COMBO_TYPE",
- INFOPOP_PWPR_COMBO_TYPE,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
- webserviceType_.addListener( SWT.Modify, statusListener );
-
- Composite buttonsGroup = utils.createComposite( serviceGroup, 1 );
- GridData buttonGrid = new GridData();
- buttonGrid.horizontalSpan = 2;
- buttonsGroup.setLayoutData( buttonGrid );
-
- // Create start service check box.
- startService_ = utils.createCheckbox( buttonsGroup, "BUTTON_START_WEB_PROJECT",
- "TOOLTIP_PWPR_CHECKBOX_START_WEB_PROJECT",
- INFOPOP_PWPR_CHECKBOX_START_WEB_PROJECT );
- startService_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- handleStartPressed();
- }
- });
-
- launchUddi_ = utils.createCheckbox( buttonsGroup, "BUTTON_WS_PUBLISH",
- "TOOLTIP_PWPR_CHECKBOX_LAUNCH_WS",
- INFOPOP_PWPR_CHECKBOX_LAUNCH_WS );
-
- Composite proxyComposite = utils.createComposite( serverComposite, 1, 5, 0 );
-
- // Create generate proxy check box.
- generateProxy_ = utils.createCheckbox( proxyComposite, "BUTTON_GENERATE_PROXY",
- "TOOLTIP_PWPR_CHECKBOX_GENERATE_PROXY",
- INFOPOP_PWPR_CHECKBOX_GENERATE_PROXY );
- generateProxy_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent evt )
- {
- clientWidget_.enableWidget( generateProxy_.getSelection() );
- }
- });
-
- // Create client selection widget.
- clientWidget_ = new WebServiceClientTypeWidget();
- clientWidget_.addControls( serverComposite, statusListener );
-
- Composite testGroup = utils.createComposite(serverComposite,1);
-
- // Create test service check box.
- testService_ = utils.createCheckbox( testGroup, "CHECKBOX_TEST_WEBSERVICE",
- "TOOLTIP_PWPR_CHECKBOX_TEST_SERVICE",
- INFOPOP_PWPR_CHECKBOX_TEST_SERVICE );
-
- monitorService = utils.createCheckbox( testGroup, "CHECKBOX_MONITOR_WEBSERVICE",
- "TOOLTIP_PWPR_CHECKBOX_MONITOR_SERVICE",
- INFOPOP_PWPR_CHECKBOX_MONITOR_SERVICE );
-
- if( displayPreferences_ )
- {
- // Create the preferences widgets.
- preferencesWidget_ = new PreferencesSelectionWidget();
- preferencesWidget_.addControls( serverComposite, statusListener );
- }
-
- return this;
- }
-
- private void handleStartPressed()
- {
- boolean enabled = startService_.getSelection();
-
- testService_.setEnabled( enabled );
- monitorService.setEnabled(enabled);
- launchUddi_.setEnabled( enabled );
- generateProxy_.setEnabled( enabled );
- clientWidget_.enableWidget( getGenerateProxy().booleanValue() );
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientWidget_.setTypeRuntimeServer( ids );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientWidget_.getTypeRuntimeServer();
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- LabelsAndIds labelIds = WebServiceRuntimeExtensionUtils.getServiceTypeLabels();
- //rskreg
- int selection = 0;
- String[] serviceIds = labelIds.getIds_();
- String selectedId = ids.getTypeId();
-
- webserviceType_.removeListener( SWT.Modify, statusListener_ );
- webserviceType_.setItems( labelIds.getLabels_() );
-
- // Now find the selected one.
- for( int index = 0; index < serviceIds.length; index++ )
- {
- if( selectedId.equals( serviceIds[index ]) )
- {
- selection = index;
- break;
- }
- }
-
- webserviceType_.select( selection );
- webserviceType_.addListener( SWT.Modify, statusListener_ );
- ids_ = ids;
- labelIds_ = labelIds;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- int selectionIndex = webserviceType_.getSelectionIndex();
-
- ids_.setTypeId( labelIds_.getIds_()[selectionIndex] );
-
- return ids_;
- }
-
- public Boolean getStartService()
- {
- return new Boolean( startService_.getSelection() );
- }
-
- public void setStartService( Boolean value )
- {
- startService_.setSelection( value.booleanValue() );
- }
-
- public Boolean getTestService()
- {
- return new Boolean( testService_.getSelection() && startService_.getSelection() );
- }
-
- public void setTestService( Boolean value )
- {
- testService_.setSelection( value.booleanValue() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(monitorService.getSelection() && startService_.getSelection());
- }
-
- public void setMonitorService(Boolean value)
- {
- monitorService.setSelection(value.booleanValue());
- }
-
- public Boolean getPublishService()
- {
- return new Boolean( launchUddi_.getSelection() && startService_.getSelection() );
- }
-
- public void setPublishService( Boolean value )
- {
- launchUddi_.setSelection( value.booleanValue() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( generateProxy_.getSelection() && startService_.getSelection() );
- }
-
- public void setGenerateProxy( Boolean value )
- {
- generateProxy_.setSelection( value.booleanValue() );
- }
-
- public ResourceContext getResourceContext()
- {
- return preferencesWidget_.getResourceContext();
- }
-
- public void setResourceContext( ResourceContext context )
- {
- preferencesWidget_.setResourceContext( context );
- }
-
- public void internalize()
- {
- handleStartPressed();
- }
-
- public Status getStatus()
- {
- Status status = new SimpleStatus( "" );
-
- // If the webservice has not been selected then user can not move
- // forward to the next page.
- if( webserviceType_.getText().equals("") )
- {
- status = new SimpleStatus( "", "", Status.ERROR );
- }
-
- return status;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
deleted file mode 100644
index 5d36055..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-public class ServerWizardWidgetDefaultingCommand extends ClientWizardWidgetDefaultingCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private IStructuredSelection initialSelection_;
-
- public Status execute(Environment env)
- {
- String type = getScenarioContext().getWebServiceType();
- String runtime = WebServiceRuntimeExtensionUtils.getDefaultRuntimeValueFor( type );
-
- String factoryID = WebServiceRuntimeExtensionUtils.getDefaultServerValueFor(type);
- typeRuntimeServer_ = new TypeRuntimeServer();
-
- typeRuntimeServer_.setTypeId( type );
- typeRuntimeServer_.setRuntimeId( runtime );
- typeRuntimeServer_.setServerId( factoryID );
-
- //Default the typeId from the initial selection
- String[] typeIds = WebServiceRuntimeExtensionUtils.getWebServiceTypeBySelection(initialSelection_);
-
- if (typeIds!=null && typeIds.length>0)
- {
- typeRuntimeServer_.setTypeId(typeIds[0]);
- }
-
- return new SimpleStatus("");
- }
-
- public void setInitialSelection(IStructuredSelection selection)
- {
- initialSelection_ = selection;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return typeRuntimeServer_;
- }
-
- public Boolean getStartService()
- {
- return new Boolean( getScenarioContext().getStartWebService() );
- }
-
- public Boolean getPublishService()
- {
- return new Boolean( getScenarioContext().getLaunchWebServiceExplorer() );
- }
-
- public Boolean getGenerateProxy()
- {
- return new Boolean( getScenarioContext().getGenerateProxy() );
- }
-
- public Boolean getMonitorService()
- {
- return new Boolean(getScenarioContext().getMonitorWebService());
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
deleted file mode 100644
index 2395c95..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/ServerWizardWidgetOutputCommand.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.ClientWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-public class ServerWizardWidgetOutputCommand extends ClientWizardWidgetOutputCommand
-{
- private TypeRuntimeServer typeRuntimeServer_;
- private boolean startService_;
- private boolean testService_;
- private boolean publishService_;
- private boolean generateProxy_;
- private ResourceContext resourceContext_;
-
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return typeRuntimeServer_;
- }
-
- public boolean getStartService()
- {
- return startService_;
- }
-
- public boolean getTestService()
- {
- return testService_;
- }
-
- public boolean getPublishService()
- {
- return publishService_;
- }
-
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
-
- public ResourceContext getResourceContext()
- {
- return resourceContext_;
- }
-
- /**
- * @param generateProxy_ The generateProxy_ to set.
- */
- public void setGenerateProxy(boolean generateProxy_)
- {
- this.generateProxy_ = generateProxy_;
- }
- /**
- * @param publishService_ The publishService_ to set.
- */
- public void setPublishService(boolean publishService_)
- {
- this.publishService_ = publishService_;
- }
- /**
- * @param startService_ The startService_ to set.
- */
- public void setStartService(boolean startService_)
- {
- this.startService_ = startService_;
- }
- /**
- * @param testService_ The testService_ to set.
- */
- public void setTestService(boolean testService_)
- {
- this.testService_ = testService_;
- }
- /**
- * @param typeRuntimeServer_ The typeRuntimeServer_ to set.
- */
- public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer_)
- {
- this.typeRuntimeServer_ = typeRuntimeServer_;
- }
-
- public void setResourceContext(ResourceContext rc)
- {
- resourceContext_ = rc;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
deleted file mode 100644
index 3463070..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ExportWSWidgetBinding.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class ExportWSWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ExportWSWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment("WSExport"));
- root.add(publishToPrivateUDDICmdFrag);
- root.add(new SimpleFragment(new WSExplorerLauncherCommand(), ""));
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(this.canFinishRegistry);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- this.dataMappingRegistry = dataRegistry;
- publishToPrivateUDDICmdFrag.registerDataMappings(this.dataMappingRegistry);
-
- // PublishToPrivateUDDICommandFragment
- dataMappingRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataMappingRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataMappingRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- this.widgetRegistry = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("WSExport",
- msgUtils.getMessage("PAGE_TITLE_WS_PUBLISH"),
- msgUtils.getMessage("PAGE_DESC_WS_PUBLISH"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(true);
- }
- }
- );
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
deleted file mode 100644
index 068d4af..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/PublishWSDLWidgetBinding.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PublishWSDLWidgetBinding implements CommandWidgetBinding
-{
- public PublishWSDLWidgetBinding()
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new SimpleFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- }
-
- /* (non-Javadoc),
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
deleted file mode 100644
index 2a84344..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/binding/ServerWidgetBinding.java
+++ /dev/null
@@ -1,645 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.binding;
-
-import org.eclipse.jst.ws.internal.common.StringToIProjectTransformer;
-import org.eclipse.jst.ws.internal.consumption.command.common.ClientServerDeployableConfigCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ComputeEndpointCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateClientProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateMonitorCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServiceProjectCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ManageServerStartUpCommand;
-import org.eclipse.jst.ws.internal.consumption.command.common.ServerDeployableConfigurationCommand;
-import org.eclipse.jst.ws.internal.consumption.common.ScenarioCleanupCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.command.data.ServerInstToIServerTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.common.FinishFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.ClientRootFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.extension.PreClientDevelopCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.selection.SelectionTransformer;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishToPrivateUDDICommandFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.PublishWSWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ClientExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.extensions.ServerExtensionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionOutputCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.object.ObjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.AddModuleDependenciesCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestDelegateCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.ClientTestWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishDefaultCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishJavaTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.FinishTestFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.TestDefaultingFragment;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceClientTestArrivalCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceClientTypeRegistry;
-import org.eclipse.jst.ws.internal.consumption.ui.wizard.WebServiceServerRuntimeTypeRegistry;
-import org.eclipse.jst.ws.internal.creation.ui.extension.PreServiceDevelopCommand;
-import org.eclipse.jst.ws.internal.creation.ui.extension.ServiceRootFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.ServerWizardWidgetOutputCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.runtime.ServerRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.LaunchFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestFragment;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.ServiceTestWidget;
-import org.eclipse.jst.ws.internal.creation.ui.widgets.test.WebServiceTestDefaultingCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.SelectionCommand;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-public class ServerWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry_;
- private WidgetRegistry widgetRegistry_;
- private DataMappingRegistry dataMappingRegistry_;
- private PublishToPrivateUDDICommandFragment publishToPrivateUDDICmdFrag;
-
- public ServerWidgetBinding()
- {
- publishToPrivateUDDICmdFrag = new PublishToPrivateUDDICommandFragment();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- return new ServiceRootCommandFragment();
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- canFinishRegistry_ = canFinishRegistry;
- publishToPrivateUDDICmdFrag.registerCanFinish(canFinishRegistry_);
- }
-
- /* (non-Javadoc),
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry_ = dataRegistry;
-
- // Before ServerWizardWidget
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "MonitorService", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidget.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidget.class);
-
- // After ServerWizardWidget
- dataRegistry.addMapping(ServerWizardWidget.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class );
- dataRegistry.addMapping(ServerWizardWidget.class, "StartService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "TestService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "MonitorService", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "PublishService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidget.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-
- // Before ObjectSelectionWidget
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService",FinishTestFragment.class);
-
- // Before ServerRuntimeSelectionWidget
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerRuntimeSelectionWidget.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ServerRuntimeSelectionWidget.class);
-
-
- // After ServerRuntimeSelectionWidget
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class );
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class );
- //dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
-
- // Map fragments that depend on data.
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidget.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
-
- // CreateMonitorCommand
- dataRegistry.addMapping(CreateMonitorCommand.class, "MonitoredPort", ComputeEndpointCommand.class);
-
- // ComputeEndpointCommand
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ServiceTestWidget.class);
- dataRegistry.addMapping(ComputeEndpointCommand.class, "Endpoint", ClientTestDelegateCommand.class);
-
- //ServiceTestWidget mappings
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", CreateMonitorCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ServiceTestWidget.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ComputeEndpointCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WebServicesParser", ComputeEndpointCommand.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ServiceTestFacilities", ServiceTestWidget.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "Environment", ServiceTestWidget.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", FinishTestFragment.class);
- dataRegistry.addMapping(ServiceTestWidget.class, "LaunchedServiceTestName", TestDefaultingFragment.class);
-
- // CreateClientProjectCommand
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", CreateClientProjectCommand.class, "ProxyProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", CreateClientProjectCommand.class, "ProxyProjectEAR", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectType", CreateClientProjectCommand.class, "ClientProjectTypeId", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", CreateClientProjectCommand.class, "ServerFactoryId", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", CreateClientProjectCommand.class, "J2EEVersion", null);
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "ServiceExistingServerInstId", CreateClientProjectCommand.class, "ExistingServerId", null);
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "AddedProjectToServer", CreateClientProjectCommand.class);
-
- // Before Client Test widget.
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ClientTestWidget.class );
-
- // Before ClientTestWidget
-
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject", ClientTestWidget.class );
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR", ClientTestWidget.class );
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestWidget.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestWidget.class);
-
-
- // After ClientTestWidget
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProjectEAR",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "SampleProject",FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestService",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "TestID",FinishTestFragment.class);
- dataRegistry.addMapping(ClientTestWidget.class, "IsTestWidget",FinishTestFragment.class);
- // PublishWSWidget
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
-
- // PublishToPrivateUDDICommandFragment
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", PublishToPrivateUDDICommandFragment.class);
-
- // LaunchWebServicesExplorerCommand
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPrivateUDDI", LaunchFragment.class);
- dataRegistry.addMapping(PublishWSWidget.class, "PublishToPublicUDDI", LaunchFragment.class);
- // TODO Need defaults for these properties.
- dataRegistry.addMapping(PublishWSWidget.class, "ForceLaunchOutsideIDE", WSExplorerLauncherCommand.class);
- dataRegistry.addMapping(PublishWSWidget.class, "LaunchOptions", WSExplorerLauncherCommand.class);
-
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
-
- widgetRegistry_ = widgetRegistry;
- publishToPrivateUDDICmdFrag.registerWidgetMappings(widgetRegistry_);
-
- widgetRegistry.add( "ServerWizardWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_PROJECT"),
- msgUtils.getMessage("PAGE_DESC_WS_PROJECT"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServerWizardWidget( true );
- }
- } );
-
- MessageUtils creationUIMessageUtils = new MessageUtils("org.eclipse.jst.ws.creation.ui.plugin", this);
- widgetRegistry.add( "ObjectSelectionWidget",
- creationUIMessageUtils.getMessage("PAGE_TITLE_OBJECT_SELECTION"),
- creationUIMessageUtils.getMessage("PAGE_DESC_OBJECT_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ObjectSelectionWidget();
- }
- });
-
- widgetRegistry.add( "ServerRuntimeSelectionWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_RUNTIME_SELECTION"),
- msgUtils.getMessage("PAGE_DESC_WS_RUNTIME_SELECTION"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServerRuntimeSelectionWidget();
- }
- } );
-
- widgetRegistry.add( "TestService",
- msgUtils.getMessage("PAGE_TITLE_WSTEST"),
- msgUtils.getMessage("PAGE_DESC_WSTEST"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ServiceTestWidget();
- }
- } );
-
- widgetRegistry.add( "ClientTestWidget",
- msgUtils.getMessage("PAGE_TITLE_WS_SAMPLE"),
- msgUtils.getMessage("PAGE_DESC_WS_SAMPLE"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new ClientTestWidget();
- }
- });
-
- widgetRegistry.add( "Publish",
- msgUtils.getMessage("PAGE_TITLE_WS_PUBLISH"),
- msgUtils.getMessage("PAGE_DESC_WS_PUBLISH"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PublishWSWidget(true);
- }
- } );
- }
-
- private class InitRegistries extends SimpleCommand
- {
- private WebServiceClientTypeRegistry clientRegistry_ = WebServiceClientTypeRegistry.getInstance();
- private WebServiceServerRuntimeTypeRegistry serverRegistry_ = WebServiceServerRuntimeTypeRegistry.getInstance();
-
- public Status execute(Environment environment)
- {
- clientRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
- clientRegistry_.setWidgetRegistry( widgetRegistry_ );
- clientRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-
- serverRegistry_.setDataMappingRegistry( dataMappingRegistry_ );
- serverRegistry_.setWidgetRegistry( widgetRegistry_ );
- serverRegistry_.setCanFinishRegistry( canFinishRegistry_ );
-
- return new SimpleStatus( "" );
- }
- }
-
- private class ClientFragment extends BooleanFragment
- {
- boolean genProxy_ = false;
-
- public ClientFragment()
- {
- setCondition( new Condition()
- {
- public boolean evaluate()
- {
- return genProxy_;
- }
- });
-
- SequenceFragment clientRoot = new SequenceFragment();
-
- clientRoot.add( new SimpleFragment( new ClientExtensionDefaultingCommand( false ), ""));
- //clientRoot.add(new SimpleFragment(new ClientServerDeployableConfigCommand(), "")); //Note: added here for client
- //clientRoot.add( new SimpleFragment( new CreateClientProjectCommand(), ""));
- //clientRoot.add( new ClientExtensionFragment() );
- clientRoot.add( new ClientRootFragment() );
- clientRoot.add( new SimpleFragment( new ClientExtensionOutputCommand(), "" ));
-
- setTrueFragment( clientRoot );
- }
-
- public void setGenerateProxy( boolean genProxy )
- {
- genProxy_ = genProxy;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- // Map the output of the service scenario to the client scenario.
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WebServicesParser", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "WsdlURI", ClientExtensionDefaultingCommand.class );
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerFactoryId", ClientExtensionDefaultingCommand.class );
- dataRegistry.addMapping( ServerExtensionOutputCommand.class, "ServiceServerInstanceId", ClientExtensionDefaultingCommand.class );
-
-
- // Setup the PreClientDevelopCommand.
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", PreClientDevelopCommand.class );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", PreClientDevelopCommand.class);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProject", PreClientDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectType", PreClientDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "ClientProjectEAR", PreClientDevelopCommand.class, "Ear", null );
- dataRegistry.addMapping( ClientExtensionDefaultingCommand.class, "WsdlURI", PreClientDevelopCommand.class);
- dataRegistry.addMapping( PreClientDevelopCommand.class, "WebService", ClientExtensionOutputCommand.class, "WebServiceClient", null );
- }
- }
-
- private class ServiceRootCommandFragment extends SequenceFragment
- {
- public ServiceRootCommandFragment()
- {
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
-
- add( new SimpleFragment( new InitRegistries(), "" ) );
- add( new SimpleFragment( new ServerWizardWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "ServerWizardWidget" ) );
- add( new SimpleFragment( new ServerWizardWidgetOutputCommand(), "" ));
- add( new ObjectSelectionFragment() );
- add( new SimpleFragment( new ServerRuntimeSelectionWidgetDefaultingCommand(), ""));
- add( new SimpleFragment( "ServerRuntimeSelectionWidget" ) );
- add( new SimpleFragment( new ServerExtensionDefaultingCommand(), ""));
- //add(new SimpleFragment(new ServerDeployableConfigurationCommand(), "")); //Note: added here
- //add( new SimpleFragment( new CreateServiceProjectCommand(), ""));
- //add( new ServerExtensionFragment() );
- add( new ServiceRootFragment() );
- add( new SimpleFragment( new ServerExtensionOutputCommand(), "" ));
- add(new SimpleFragment(new CreateMonitorCommand(), ""));
- add(new SimpleFragment(new ComputeEndpointCommand(), ""));
- add( new ServiceTestFragment( "TestService") );
- add( new SimpleFragment(new TestDefaultingFragment(),""));
- add( new ClientFragment() );
-// add( new SimpleFragment(new ManageServerStartUpCommand(),""));
- add( new ClientTestFragment( "ClientTestWidget") );
- add( new SimpleFragment( "Publish") );
- add(publishToPrivateUDDICmdFrag);
- add(new LaunchFragment());
- add(new FinishFragment());
-
- add( new SimpleFragment( new ScenarioCleanupCommand(), "" ));
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.env.core.fragment.CommandFragment#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- publishToPrivateUDDICmdFrag.registerDataMappings(dataMappingRegistry_);
-
- dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerWizardWidgetDefaultingCommand.class );
-
- //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
- //dataRegistry.addMapping(SelectionCommand.class, "InitialSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
-
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ObjectSelection", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialSelection", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "Project", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialProject", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "InitialComponentName", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "ComponentName", ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientInitialComponentName", null);
- dataRegistry.addMapping(ObjectSelectionOutputCommand.class, "WebServicesParser", ServerExtensionDefaultingCommand.class );
-
- // Map ServerWizardWidgetDefaultingCommand
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "StartService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "TestService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "PublishService", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "GenerateProxy", ServerWizardWidgetOutputCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetDefaultingCommand.class, "ResourceContext", ServerWizardWidgetOutputCommand.class);
-
- // Map ServerWizardWidgetOutputCommand.
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ObjectSelectionFragment.class, "TypeRuntimeServer", null);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ClientTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ServiceTypeRuntimeServer", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "PublishService", PublishWSWidget.class, "PublishToPublicUDDI", null);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServerRuntimeSelectionWidgetDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "ResourceContext", ClientExtensionDefaultingCommand.class);
-
- //to the test wizard
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "GenerateProxy", ServiceTestFragment.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", WSDLTestLaunchCommand.class);
-
-
-
- // Map ServerRuntimeSelectionWidgetDefaultingCommand
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionDefaultingCommand.class);
- //dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProject2EARProject", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarProjectName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceEarComponentName", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "Runtime2ClientTypes", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarProjectName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientEarComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentName", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientComponentType", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceJ2EEVersion", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientJ2EEVersion", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientFragment.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "GenerateProxy", ClientExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceNeedEAR", ServerExtensionDefaultingCommand.class);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientNeedEAR", ClientExtensionDefaultingCommand.class);
-
-
- // Map ServerExtensionDefaultingCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ServerExtensionFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "TestService", ServiceTestFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "Publish", PublishToPrivateUDDICommandFragment.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer",WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", ClientTestDelegateCommand.class);
-
- // Setup the PreServiceDevelopCommand.
- //
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "StartService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "TestService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "PublishService", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "GenerateProxy", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerWizardWidgetOutputCommand.class, "ResourceContext", PreServiceDevelopCommand.class);
- //
- dataRegistry.addMapping( ServerRuntimeSelectionWidgetDefaultingCommand.class, "ServiceComponentType", PreServiceDevelopCommand.class, "ModuleType", null);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceTypeRuntimeServer", PreServiceDevelopCommand.class );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", PreServiceDevelopCommand.class);
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProject", PreServiceDevelopCommand.class, "Module", null );
- dataRegistry.addMapping( ServerExtensionDefaultingCommand.class, "ServerProjectEAR", PreServiceDevelopCommand.class, "Ear", null );
- //
- dataRegistry.addMapping( ObjectSelectionOutputCommand.class, "ObjectSelection", PreServiceDevelopCommand.class, "Selection", new SelectionTransformer() );
-
- dataRegistry.addMapping( PreServiceDevelopCommand.class, "WebService", ServerExtensionOutputCommand.class );
-
- // Map CreateServiceProjectCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", CreateServiceProjectCommand.class, "ProjectName", null);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", CreateServiceProjectCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", CreateServiceProjectCommand.class,"ServerFactoryId",null);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceJ2EEVersion", CreateServiceProjectCommand.class, "J2EEVersion", null);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class,"ServiceNeedEAR",CreateServiceProjectCommand.class,"NeedEAR",null);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class,"IsServiceProjectEJB",CreateServiceProjectCommand.class);
-
-
- // Map ClientExtensionDefaultingCommand
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientExtensionFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", WebServiceClientTestArrivalCommand.class, "ClientIds", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", FinishDefaultCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestFragment.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "TestService", ClientTestWidget.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "LaunchedServiceTestName", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", AddModuleDependenciesCommand.class );
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", WebServiceClientTestArrivalCommand.class, "J2eeVersion", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "Runtime2ClientTypes", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "GenerateProxy", FinishJavaTestFragment.class);
-
- //ServerDeployableConfigurationCommand
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "StartService", ServerDeployableConfigurationCommand.class );
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ServerDeployableConfigurationCommand.class, "ServiceProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "WsdlURI", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServiceServerInstanceId", ServerDeployableConfigurationCommand.class,"ServiceExistingServer", new ServerInstToIServerTransformer());
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ServerDeployableConfigurationCommand.class,"ServiceServerTypeID", null);
- dataRegistry.addMapping(ServerRuntimeSelectionWidgetDefaultingCommand.class, "ClientTypeRuntimeServer", ServerDeployableConfigurationCommand.class, "ClientTypeRuntimeServer", null );
- dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", ServerExtensionDefaultingCommand.class,"ServiceExistingServerInstanceId",null);
- dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "SampleExistingServerInstId", ClientExtensionDefaultingCommand.class,"ClientExistingServerInstanceId", null);
- dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", CreateServiceProjectCommand.class,"ExistingServerId", null);
- dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "AddedProjectToServer", CreateServiceProjectCommand.class);
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "ServiceServerInstanceId", CreateMonitorCommand.class);
- dataRegistry.addMapping(ClientServerDeployableConfigCommand.class, "ServiceExistingServerInstId", FinishDefaultCommand.class, "ExistingServerId", null);
-
- // Map ServerExtensionOutputCommand for ServerStart()
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProjectEAR", ServerExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", ServerExtensionOutputCommand.class,"ExistingServerId", null);
-
- // Map CreateClientProjectCommand
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", CreateClientProjectCommand.class, "ProxyProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", CreateClientProjectCommand.class, "ProxyProjectEAR", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", CreateClientProjectCommand.class, "ExistingServer", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServer", CreateClientProjectCommand.class, "ServerFactoryId", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientJ2EEVersion", CreateClientProjectCommand.class, "J2EEVersion", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientNeedEAR", CreateClientProjectCommand.class, "NeedEAR", null);
-
- //ServerDeployableConfigurationCommand for client side
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ClientServerDeployableConfigCommand.class, "SampleProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientTypeRuntimeServer", ClientServerDeployableConfigCommand.class,"ClientTypeRuntimeServer", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientServerDeployableConfigCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
-
- // MAP post server config call
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProjectEAR", ClientExtensionOutputCommand.class, "EarProjectName", null);
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ClientExtensionOutputCommand.class, "ExistingServerId", null);
-
- // Map ClientExtensionOutputCommand
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "GenerateProxy", FinishTestFragment.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", WebServiceClientTestArrivalCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ProxyBean", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "SetEndpointMethod", ClientTestDelegateCommand.class);
- dataRegistry.addMapping(ClientExtensionOutputCommand.class, "ServerInstanceId", FinishDefaultCommand.class);
-
- // Map ManageServerStartUpCommand
- dataRegistry.addMapping(ServerExtensionOutputCommand.class, "IsWebProjectStartupRequested", ManageServerStartUpCommand.class);
-
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "StartService", ManageServerStartUpCommand.class);
- dataRegistry.addMapping(ServerWizardWidgetOutputCommand.class, "TestService", ManageServerStartUpCommand.class);
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerProject", ManageServerStartUpCommand.class, "ServiceProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ServerExtensionDefaultingCommand.class, "ServerServer", ManageServerStartUpCommand.class,"ServiceServerTypeId", null);
- dataRegistry.addMapping(ServerDeployableConfigurationCommand.class, "ServiceExistingServerInstId", ManageServerStartUpCommand.class,"ServiceExistingServer", new ServerInstToIServerTransformer());
-
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientProject", ManageServerStartUpCommand.class, "SampleProject", new StringToIProjectTransformer());
- dataRegistry.addMapping(ClientExtensionDefaultingCommand.class, "ClientServerInstance", ManageServerStartUpCommand.class,"SampleExistingServer", new ServerInstToIServerTransformer());
-
- // Map WebServiceClientTestArrivalCommand
- dataRegistry.addMapping(TestDefaultingFragment.class, "TestFacility",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Folder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "JspFolder",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "RunClientTest",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "Methods",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",ClientTestDelegateCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProject",AddModuleDependenciesCommand.class);
- dataRegistry.addMapping(WebServiceClientTestArrivalCommand.class, "SampleProjectEAR",AddModuleDependenciesCommand.class);
-
- //Map Finish Command
-
-
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
deleted file mode 100644
index 9acff6d..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidget.java
+++ /dev/null
@@ -1,407 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ValidationUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ProjectSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.RuntimeServerSelectionWidget;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-
-/*
- *
- * ServerRuntimeSelectionWidget
- * This widget is the parent widget for server and client deployment/environment settings
- *
- */
-public class ServerRuntimeSelectionWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-
- /* CONTEXT_ID PWRS0002 for the Wizard Scenario Service configuration of the Runtime Selection Page */
- private String INFOPOP_PWRS_GROUP_SERVICE = "PWRS0002";
-
- private RuntimeServerSelectionWidget runtimeWidget_;
- private ProjectSelectionWidget projectWidget_;
- private ClientRuntimeSelectionWidget clientWidget_;
- private SelectionListChoices serviceChoices_;
- private TextModifyListener textListener_;
- private MessageUtils msgUtils_;
-
- private boolean isClientWidgetVisible_ = true;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- msgUtils_ = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils_, createPluginId_ );
-
- Composite root = uiUtils.createComposite( parent, 1 );
-
- Text messageText = new Text( root, SWT.WRAP | SWT.MULTI | SWT.READ_ONLY );
-
- GridData gd = new GridData();
- gd.horizontalIndent = 10;
-
- messageText.setLayoutData(gd);
- messageText.setText(
- msgUtils_.getMessage("MSG_GENERAL_PROJECT_AND_EAR", new String[] { msgUtils_.getMessage("MSG_SERVICE_SUB")})
- + "\n"
- + msgUtils_.getMessage("MSG_EAR_PROJECT_WILL_BE_CREATED"));
-
- Composite serverComp = uiUtils.createComposite( root, 1, 5, 0 );
-
- Group serverGroup = uiUtils.createGroup( serverComp, "LABEL_SELECTION_VIEW_TITLE",
- null, INFOPOP_PWRS_GROUP_SERVICE,
- 2, 5, 5);
-
- runtimeWidget_ = new RuntimeServerSelectionWidget( false );
- runtimeWidget_.addControls( serverGroup, statusListener );
- textListener_ = new TextModifyListener();
- runtimeWidget_.addModifyListener( textListener_ );
-
- projectWidget_ = new ProjectSelectionWidget();
- projectWidget_.addControls( serverGroup, statusListener );
-
- clientWidget_ = new ClientRuntimeSelectionWidget();
- clientWidget_.addControls( root, statusListener );
-
- return this;
- }
-
- //If generate proxy is not selected, don't show the client portion of the page.
- public void setGenerateProxy( Boolean value )
- {
- clientWidget_.setVisible( value.booleanValue() );
- isClientWidgetVisible_ = value.booleanValue();
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return runtimeWidget_.getTypeRuntimeServer();
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- runtimeWidget_.removeModifyListener( textListener_ );
- runtimeWidget_.setTypeRuntimeServer( ids );
- projectWidget_.setTypeRuntimeServer(ids);
- runtimeWidget_.addModifyListener( textListener_ );
- }
-
- public TypeRuntimeServer getClientTypeRuntimeServer()
- {
- return clientWidget_.getClientTypeRuntimeServer();
- }
-
- public void setClientTypeRuntimeServer( TypeRuntimeServer ids )
- {
- clientWidget_.setClientTypeRuntimeServer( ids );
- }
-
- public SelectionListChoices getServiceProject2EARProject()
- {
- return projectWidget_.getProjectChoices();
- }
-
- public void setServiceProject2EARProject(SelectionListChoices serviceProject2EARProject)
- {
- projectWidget_.setProjectChoices(serviceProject2EARProject);
- }
-
- public SelectionListChoices getRuntime2ClientTypes()
- {
- return clientWidget_.getRuntime2ClientTypes();
- }
-
- public void setRuntime2ClientTypes(SelectionListChoices runtime2ClientTypes)
- {
- clientWidget_.setRuntime2ClientTypes(runtime2ClientTypes);
- }
-
- public String getServiceJ2EEVersion()
- {
- return runtimeWidget_.getJ2EEVersion();
- }
-
- public void setServiceJ2EEVersion(String j2eeVersion)
- {
- runtimeWidget_.setJ2EEVersion(j2eeVersion);
- projectWidget_.setJ2EEVersion(j2eeVersion);
- }
-
- public String getClientJ2EEVersion()
- {
- return clientWidget_.getJ2EEVersion();
- }
-
- public void setClientJ2EEVersion(String j2eeVersion)
- {
- clientWidget_.setJ2EEVersion(j2eeVersion);
- }
-
- public boolean getServiceNeedEAR()
- {
- return projectWidget_.getNeedEAR();
- }
-
- public void setServiceNeedEAR(boolean b)
- {
- projectWidget_.setNeedEAR(b);
- }
-
- public boolean getClientNeedEAR()
- {
- return clientWidget_.getClientNeedEAR();
- }
-
- public void setClientNeedEAR(boolean b)
- {
- clientWidget_.setClientNeedEAR(b);
- }
-
- public String getServiceComponentName()
- {
- return projectWidget_.getComponentName();
- }
-
- public void setServiceComponentName( String name )
- {
- projectWidget_.setComponentName( name );
- }
-
- public String getServiceEarComponentName()
- {
- return projectWidget_.getEarComponentName();
- }
-
- public void setServiceEarComponentName( String name )
- {
- projectWidget_.setEarComponentName( name );
- }
-
- public void setServiceComponentType( String type )
- {
- projectWidget_.setComponentType( type );
- }
-
- public String getClientComponentName()
- {
- return clientWidget_.getClientComponentName();
- }
-
- public void setClientComponentName( String name )
- {
- clientWidget_.setClientComponentName( name );
- }
-
- public String getClientEarComponentName()
- {
- return clientWidget_.getClientEarComponentName();
- }
-
- public void setClientEarComponentName( String name )
- {
- clientWidget_.setClientEarComponentName( name );
- }
-
- public String getClientComponentType()
- {
- return clientWidget_.getClientComponentType();
- }
-
- public void setComponentType( String type )
- {
- clientWidget_.setClientComponentType( type );
- }
-
- public String getServiceProjectName()
- {
- return projectWidget_.getProjectName();
- }
-
- public String getServiceEarProjectName()
- {
- return projectWidget_.getEarProjectName();
- }
-
- public String getClientProjectName()
- {
- return clientWidget_.getClientProjectName();
- }
-
- public String getClientEarProjectName()
- {
- return clientWidget_.getClientEarProjectName();
- }
-
- private class TextModifyListener implements ModifyListener
- {
- public void modifyText(ModifyEvent e)
- {
- if( clientWidget_.isVisible() )
- {
- TypeRuntimeServer serviceIds = runtimeWidget_.getTypeRuntimeServer();
- TypeRuntimeServer clientIds = clientWidget_.getClientTypeRuntimeServer();
-
- clientIds.setRuntimeId( serviceIds.getRuntimeId() );
- clientIds.setServerId( serviceIds.getServerId() );
- clientIds.setServerInstanceId( serviceIds.getServerInstanceId() );
-
- clientWidget_.setClientTypeRuntimeServer( clientIds );
- clientWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
- }
-
- //Set the current server selection and J2EE level on the ProjectSelectionWidget
- projectWidget_.setTypeRuntimeServer(runtimeWidget_.getTypeRuntimeServer());
- projectWidget_.setJ2EEVersion(runtimeWidget_.getJ2EEVersion());
- }
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.WidgetContributor#getStatus()
- */
- public Status getStatus()
- {
- Status serviceStatus = runtimeWidget_.getStatus();
- Status projectStatus = projectWidget_.getStatus();
- Status clientStatus = clientWidget_.getStatus();
- Status finalStatus = new SimpleStatus( "" );
-
- // call child widgets' getStatus()
- if( serviceStatus.getSeverity() == Status.ERROR )
- {
- finalStatus = serviceStatus;
- }
- else if( clientStatus.getSeverity() == Status.ERROR )
- {
- if (isClientWidgetVisible_)
- finalStatus = clientStatus;
- }
- else if ( projectStatus.getSeverity()== Status.ERROR) {
- finalStatus = projectStatus;
- }
-
- //Validate service side server target and J2EE level
- ValidationUtils valUtils = new ValidationUtils();
- String serviceEARName = projectWidget_.getEarProjectName();
- String serviceProjName = projectWidget_.getProjectName();
- String serviceServerFactoryId = runtimeWidget_.getTypeRuntimeServer().getServerId();
- String serviceJ2EElevel = runtimeWidget_.getJ2EEVersion();
- String serviceComponentName = projectWidget_.getComponentName();
- String serviceEARComponentName = projectWidget_.getEarComponentName();
- Status serviceProjectStatus = valUtils.validateProjectTargetAndJ2EE(serviceProjName,serviceComponentName, serviceEARName, serviceEARComponentName, serviceServerFactoryId, serviceJ2EElevel);
- if(serviceProjectStatus.getSeverity()==Status.ERROR)
- {
- finalStatus = serviceProjectStatus;
- }
-
- //Ensure the service project type (Web/EJB) is valid
- if (serviceProjName!=null && serviceProjName.length()>0)
- {
- IProject serviceProj = ProjectUtilities.getProject(serviceProjName);
- if (serviceProj.exists())
- {
- //Determine whether an EJB project is required
- String webServiceRuntimeId = runtimeWidget_.getTypeRuntimeServer().getRuntimeId();
- String webServiceTypeId = runtimeWidget_.getTypeRuntimeServer().getTypeId();
- // rskreg
- //WebServiceServerRuntimeTypeRegistry wssrtRegistry = WebServiceServerRuntimeTypeRegistry.getInstance();
- //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId();
- //String serverTypeId = wssrtRegistry.getWebServiceServerByFactoryId(serviceServerFactoryId).getId();
- /* rskejb
- boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBModuleFor(serviceServerFactoryId, webServiceRuntimeId, webServiceTypeId);
- if (!isEJBRequired)
- {
- //Check the Web service type to see if an EJB project is required
- //isEJBRequired = wssrtRegistry.requiresEJBProject(webServiceTypeId);
- isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceTypeId);
- }
- rskejb */
- boolean isEJBRequired = WebServiceRuntimeExtensionUtils.requiresEJBProject(webServiceRuntimeId, webServiceTypeId);
- if (isEJBRequired && serviceComponentName!=null && serviceComponentName.length()>0 && !J2EEUtils.isEJBComponent(serviceProj, serviceComponentName))
- {
- finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_EJB_PROJECT",new String[]{serviceProjName}),Status.ERROR);
- }
- if (!isEJBRequired && serviceComponentName!=null && serviceComponentName.length()>0 && !J2EEUtils.isWebComponent(serviceProj, serviceComponentName))
- {
- finalStatus = new SimpleStatus("",msgUtils_.getMessage("MSG_INVALID_WEB_PROJECT",new String[]{serviceProjName}),Status.ERROR);
- }
- }
- }
-
- if (isClientWidgetVisible_)
- {
- String clientEARName = clientWidget_.getClientEarProjectName();
- String clientProjName = clientWidget_.getClientProjectName();
-
- String clientComponentName = clientWidget_.getClientComponentName();
-
- // check same EAR-ness -----
- String warning_msg = getEARProjectWarningMessage(serviceEARName, clientEARName);
-
- if (serviceComponentName.equalsIgnoreCase(clientComponentName)){
- String err_msg = msgUtils_.getMessage( "MSG_SAME_CLIENT_AND_SERVICE_COMPONENTS", new String[]{ "WEB" } );
- finalStatus = new SimpleStatus( "", err_msg, Status.ERROR );
- }
-
- if( clientProjName != null && serviceProjName != null &&
- clientProjName.equalsIgnoreCase( serviceProjName ))
- {
- String error_msg = msgUtils_.getMessage("MSG_SAME_CLIENT_AND_SERVICE_PROJECTS");
- finalStatus = new SimpleStatus("", error_msg, Status.ERROR);
- }
-
- if (warning_msg != null)
- {
- if (finalStatus.getSeverity()!=Status.ERROR)
- return new SimpleStatus( "", warning_msg, Status.WARNING );
- }
-
- }
-
- return finalStatus;
- }
-
- private String getEARProjectWarningMessage(String serviceEARName, String clientEARName ) {
-
- // check if service and client share the same EAR
- if (serviceEARName!=null && clientEARName!=null) {
-
- if (clientEARName.equalsIgnoreCase(serviceEARName) && clientEARName.length()>0) {
- return msgUtils_.getMessage("MSG_SAME_CLIENT_AND_SERVICE_EARS", new String[]{ "EAR" });
- }
- }
-
- return null;
-
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
deleted file mode 100644
index cfa4302..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/runtime/ServerRuntimeSelectionWidgetDefaultingCommand.java
+++ /dev/null
@@ -1,875 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.runtime;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.common.ServerSelectionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.runtime.ClientRuntimeSelectionWidgetDefaultingCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.ServiceType;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils;
-import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeInfo;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionListChoices;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario;
-
-public class ServerRuntimeSelectionWidgetDefaultingCommand extends ClientRuntimeSelectionWidgetDefaultingCommand
-{
- private String DEFAULT_CLIENT_EAR_PROJECT_EXT = "EAR";
- private boolean generateProxy_;
-
- // webServiceRuntimeJ2EEType contains the default Web service runtime and J2EE level based on the initial selection.
- // If the initialSeleciton does not result in a valid Web service runtime and J2EE level, webServiceRuntimeJ2EEType
- // should remain null for the life of this instance.
- private WSRuntimeJ2EEType webServiceRuntimeJ2EEType = null;
-
- private TypeRuntimeServer serviceIds_;
- private SelectionListChoices serviceProject2EARProject_;
- private String serviceComponentName_;
- private String serviceEarComponentName_;
- private String serviceComponentType_;
- private IStructuredSelection initialSelection_;
- private IProject initialProject_;
- private String initialComponentName_;
- private String serviceJ2EEVersion_;
- private boolean serviceNeedEAR_ = true;
-
- public ServerRuntimeSelectionWidgetDefaultingCommand()
- {
- super();
- }
-
- public Status execute(Environment env)
- {
- try
- {
- Status clientSideStatus = super.execute(env);
- if (clientSideStatus.getSeverity()==Status.ERROR)
- {
- return clientSideStatus;
- }
- Status status = new SimpleStatus("");
-
-
- setDefaultServiceRuntimeFromPreference();
- setDefaultServiceJ2EEVersionFromPreference();
- webServiceRuntimeJ2EEType = getWSRuntimeAndJ2EEFromProject(initialProject_, initialComponentName_);
- if (webServiceRuntimeJ2EEType != null)
- {
- serviceJ2EEVersion_ = webServiceRuntimeJ2EEType.getJ2eeVersionId();
- serviceIds_.setRuntimeId(webServiceRuntimeJ2EEType.getWsrId());
- }
-
- //serviceIds_.setRuntimeId(WebServiceRuntimeExtensionUtils.getDefaultRuntimeValueFor(serviceIds_.getTypeId()));
- //serviceJ2EEVersion_ = (WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels())[0];
-
-
- // Set the default client type to a web client type.
- // setWebClientType();
-
- setServiceComponentType();
- // Default projects EARs and servers.
- setDefaultProjects();
- setDefaultEARs();
- setDefaultServer();
- updateServiceEARs();
- //updateClientProject(getServiceProject2EARProject().getList().getSelection(), serviceComponentName_, serviceIds_.getTypeId());
- updateClientEARs();
-
- return status;
- } catch (Exception e)
- {
- //Catch all Exceptions in order to give some feedback to the user
- Status errorStatus = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_TASK_EXCEPTED",new String[]{e.getMessage()}),Status.ERROR, e);
- env.getStatusHandler().reportError(errorStatus);
- return errorStatus;
- }
-
- }
-
- private void setServiceComponentType()
- {
- ServiceType st = WebServiceRuntimeExtensionUtils.getServiceType(serviceIds_.getRuntimeId(), serviceIds_.getTypeId());
- int scenario = WebServiceRuntimeExtensionUtils.getScenarioFromTypeId(serviceIds_.getTypeId());
- String[] includeComponentTypes = null;
- switch (scenario)
- {
- case WebServiceScenario.BOTTOMUP:
- includeComponentTypes = st.getBottomUpModuleTypesInclude();
- break;
- case WebServiceScenario.TOPDOWN:
- includeComponentTypes = st.getTopDownModuleTypesInclude();
- }
-
- if (includeComponentTypes == null || includeComponentTypes.length==0)
- {
- serviceComponentType_ = IModuleConstants.JST_WEB_MODULE;
- }
- else
- {
- serviceComponentType_ = includeComponentTypes[0];
- }
- }
-
- /*
- private void setWebClientType()
- {
- SelectionListChoices choices = getRuntime2ClientTypes();
- String webId = "org.eclipse.jst.ws.consumption.ui.clientProjectType.Web";
-
- if( choices != null )
- {
- choices.getChoice().getList().setSelectionValue( webId );
- }
- }
- */
-
- /**
- * Returns an object with target Runtime and J2EE value
- * @param project
- * @return
- */
-
- private WSRuntimeJ2EEType getWSRuntimeAndJ2EEFromProject(IProject project, String componentName)
- {
- WSRuntimeJ2EEType wsrJ2EE = null;
- //If there is a valid initial selection, use it to determine
- //reasonable J2EE version and Web service runtime values
-
- if (project != null && project.exists())
- {
- if (J2EEUtils.isWebComponent(project, componentName ) || J2EEUtils.isEJBComponent(project, componentName))
- {
- //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
-
- //Get the J2EE level
- int versionId = J2EEUtils.getJ2EEVersion(project, componentName);
- String versionString = String.valueOf(versionId);
-
- //Get the runtime target of the project
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-
- //If the preferred Web service runtime supports this J2EE level and this server target, keep it
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
- ((runtimeTarget == null) ||
- (runtimeTarget != null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId()))
- )
- )
-
- {
- //Set the J2EE level and Web service runtime
- wsrJ2EE = new WSRuntimeJ2EEType();
- wsrJ2EE.setWsrId(serviceIds_.getRuntimeId());
- wsrJ2EE.setJ2eeVersionId(versionString);
- return wsrJ2EE;
-
- } else
- {
- //Look for a runtime that matches both the J2EE level and the server target.
- String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(serviceIds_.getTypeId());
- for (int i = 0; i < validRuntimes.length; i++)
- {
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, validRuntimes[i]) &&
- ((runtimeTarget == null) ||
- (runtimeTarget!=null && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, validRuntimes[i]))
- )
- )
- {
- wsrJ2EE = new WSRuntimeJ2EEType();
- wsrJ2EE.setWsrId(validRuntimes[i]);
- wsrJ2EE.setJ2eeVersionId(versionString);
- return wsrJ2EE;
- }
- }
- }
- }
- }
- return wsrJ2EE;
- }
-
- private void setDefaultServiceRuntimeFromPreference()
- {
-
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pRuntimeId = context.getRuntimeId();
- //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
- //if the preferred runtime in compatible with the type, select it.
- if (WebServiceRuntimeExtensionUtils.isRuntimeSupportedForType(serviceIds_.getTypeId(), pRuntimeId))
- {
- serviceIds_.setRuntimeId(pRuntimeId);
- }
- else
- {
- //Set the Web service runtime to one that is supported by the selected type.
- String[] validRuntimes = WebServiceRuntimeExtensionUtils.getRuntimesByType(serviceIds_.getTypeId());
- if (validRuntimes != null && validRuntimes.length>0)
- {
- serviceIds_.setRuntimeId(validRuntimes[0]);
- }
- }
- }
-
-
-
- private void setDefaultServiceJ2EEVersionFromPreference()
- {
- if (serviceIds_ != null)
- {
- String runtimeId = serviceIds_.getRuntimeId();
- if (runtimeId != null)
- {
- //IWebServiceRuntime wsr = WebServiceServerRuntimeTypeRegistry.getInstance().getWebServiceRuntimeById(runtimeId);
- WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId);
- if (wsrt != null)
- {
- String[] versions = wsrt.getJ2eeLevels();
- //If the preferred J2EE version is in versions, pick the preferred one.
- //Otherwise, pick the first one.
- if (versions != null && versions.length > 0)
- {
- PersistentServerRuntimeContext context = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- String pJ2EE = context.getJ2EEVersion();
- if (pJ2EE!=null && pJ2EE.length()>0)
- {
- for (int i=0;i<versions.length;i++)
- {
- if (versions[i].equals(pJ2EE))
- {
- serviceJ2EEVersion_ = versions[i];
- return;
- }
- }
- }
- serviceJ2EEVersion_ = versions[0];
- return;
- }
-
- }
- }
- }
- }
-
-
- /**
- * This method needs a lot of work. It does not take into account the component types supported by the
- * selected Web service type or the fact that there are multiple components in a project.
- */
- //rskrem93309
- /*
- private void setDefaultProjectsNew()
- {
- if (initialProject_ != null)
- {
- getServiceProject2EARProject().getList().setSelectionValue(initialProject_.getName());
- String moduleName = null;
- if (initialComponentName_!=null && initialComponentName_.length()>0)
- {
- moduleName = initialComponentName_;
- }
- else
- {
- moduleName = J2EEUtils.getFirstWebModuleName(initialProject_);
- }
-
- serviceComponentName_ = moduleName;
- String version = String.valueOf(J2EEUtils.getJ2EEVersion(initialProject_, moduleName));
- String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels();
- for (int i=0; i< validVersions.length; i++)
- {
- if (validVersions[i].equals(version))
- {
- serviceJ2EEVersion_ = validVersions[i];
- }
- }
- }
- else
- {
- //Pick the first one
- IProject[] projects = WebServiceRuntimeExtensionUtils.getAllProjects();
- if (projects.length>0)
- {
- getServiceProject2EARProject().getList().setSelectionValue(projects[0].getName());
- String moduleName = J2EEUtils.getFirstWebModuleName(projects[0]);
- serviceComponentName_ = moduleName;
- String version = String.valueOf(J2EEUtils.getJ2EEVersion(projects[0], moduleName));
- String[] validVersions = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getJ2eeLevels();
- for (int i=0; i< validVersions.length; i++)
- {
- if (validVersions[i].equals(version))
- {
- serviceJ2EEVersion_ = validVersions[i];
- }
- }
-
- }
- else
- {
- //there are no projects in the workspace. Pass the default names for new projects.
-
- if (serviceComponentType_.equals(IModuleConstants.JST_EJB_MODULE))
- {
- getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultEJBProjectName());
- serviceComponentName_ = ResourceUtils.getDefaultEJBComponentName();
- }
- else
- {
- getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- serviceComponentName_ = ResourceUtils.getDefaultWebComponentName();
- }
- }
-
-
- }
- }
- */
- //
-
- private void setDefaultProjects()
- {
-
- //Handle the case where no valid initial selection exists
- if (initialProject_== null || (initialProject_!=null && webServiceRuntimeJ2EEType==null))
- {
- //Select the first existing project that is valid.
- setServiceProjectToFirstValid();
- String serviceProjectName = getServiceProject2EARProject().getList().getSelection();
-
- //Select a client project with "client" added to the above project name.
- updateClientProject(serviceProjectName, serviceComponentName_, serviceIds_.getTypeId());
- //String clientProjectName = ResourceUtils.getClientWebProjectName(serviceProjectName, serviceIds_.getTypeId() );
- //getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientProjectName);
-
- return;
- }
-
-
- //Set the service project selection to this initialProject
- getServiceProject2EARProject().getList().setSelectionValue(initialProject_.getName());
- serviceComponentName_ = initialComponentName_;
- updateClientProject(initialProject_.getName(), serviceComponentName_, serviceIds_.getTypeId());
- //String clientProjectName = ResourceUtils.getClientWebProjectName(initialProject_.getName(), serviceIds_.getTypeId() );
- //Set the client project selection to clientProject
- //getRuntime2ClientTypes().getChoice().getChoice().getList().setSelectionValue(clientProjectName);
-
- }
-
-
- private void setServiceProjectToFirstValid()
- {
- //WebServiceServerRuntimeTypeRegistry wssrtReg = WebServiceServerRuntimeTypeRegistry.getInstance();
- String[] projectNames = getServiceProject2EARProject().getList().getList();
- for (int i=0;i<projectNames.length; i++)
- {
- IProject project = ProjectUtilities.getProject(projectNames[i]);
- IVirtualComponent[] vcs = J2EEUtils.getComponentsByType(project, serviceComponentType_);
- if (project.isOpen() && vcs!=null && vcs.length>0)
- {
- //Get the runtime target of the project
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(project.getName());
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
-
- for (int j=0; j < vcs.length; j++)
- {
- //Get the J2EE level
- int versionId = J2EEUtils.getJ2EEVersion(vcs[j]);
- String versionString = String.valueOf(versionId);
-
-
- if (serviceJ2EEVersion_!=null && serviceJ2EEVersion_.length()>0 && serviceJ2EEVersion_.equals(versionString))
- {
- if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportJ2EELevel(versionString, serviceIds_.getRuntimeId()) &&
- ((runtimeTarget == null) ||
- ((runtimeTarget!=null) && WebServiceRuntimeExtensionUtils.doesRuntimeSupportServerTarget(runtimeTargetId, serviceIds_.getRuntimeId())))
- )
- {
- getServiceProject2EARProject().getList().setSelectionValue(projectNames[i]);
- serviceComponentName_ = vcs[j].getName();
-
- return;
- }
- }
- }
- }
- }
-
- //Didn't find a single project that worked. Default to a new project name.
- //getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- //serviceComponentName_ = ResourceUtils.getDefaultWebProjectName();
- if (serviceComponentType_.equals(IModuleConstants.JST_EJB_MODULE))
- {
- getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultEJBProjectName());
- serviceComponentName_ = ResourceUtils.getDefaultEJBComponentName();
- }
- else
- {
- getServiceProject2EARProject().getList().setSelectionValue(ResourceUtils.getDefaultWebProjectName());
- serviceComponentName_ = ResourceUtils.getDefaultWebComponentName();
- }
- }
-
-
- private void setDefaultEARs()
- {
- //Service side
- String initialProjectName = getServiceProject2EARProject().getList().getSelection();
- IProject initialProject = FileResourceUtils.getWorkspaceRoot().getProject(initialProjectName);
- boolean earIsSet = false;
- if (initialProject != null && initialProject.exists())
- {
- IVirtualComponent[] earComps = J2EEUtils.getReferencingEARComponents(initialProject, serviceComponentName_);
- if (earComps.length > 0)
- {
- // Pick the first one
- IVirtualComponent earComp = earComps[0];
- String earProjectName = earComp.getProject().getName();
- String earComponentName = earComp.getName();
- getServiceProject2EARProject().getChoice().getList().setSelectionValue(earProjectName);
- serviceEarComponentName_ = earComponentName;
- earIsSet = true;
-
- }
- }
-
- if (!earIsSet)
- {
- // Either the component is not associated with any EARs or the project
- // does not exist,
- // so pick the first EAR yousee with the correct J2EE version.
- IVirtualComponent[] allEarComps = J2EEUtils.getAllEARComponents();
- if (allEarComps.length > 0)
- {
- for (int i = 0; i < allEarComps.length; i++)
- {
- if (serviceJ2EEVersion_.equals(String.valueOf(J2EEUtils.getJ2EEVersion(allEarComps[i]))))
- {
- String earProjectName = allEarComps[i].getProject().getName();
- getServiceProject2EARProject().getChoice().getList().setSelectionValue(earProjectName);
- serviceEarComponentName_ = allEarComps[i].getName();
- earIsSet = true;
- }
-
- }
- }
- }
-
- if (!earIsSet)
- {
- // there are no suitable existing EARs
- getServiceProject2EARProject().getChoice().getList().setSelectionValue(ResourceUtils.getDefaultServiceEARProjectName());
- serviceEarComponentName_ = ResourceUtils.getDefaultServiceEARComponentName();
- }
-
-
-
- //Client side
- String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = ProjectUtilities.getProject(initialClientProjectName);
- String[] clientEARInfo = getDefaultEARFromClientProject(initialClientProject, getClientComponentName());
-
- //If the client project exists and the default EAR is the same as that of the service project,
- //pick the defaultClientEAR
- if(initialClientProject!=null && initialClientProject.exists()
- && clientEARInfo[1].equalsIgnoreCase(serviceEarComponentName_))
- {
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(clientEARInfo[0]);
- setClientEARComponentName(clientEARInfo[1]);
- }
- else
- {
- ProjectTopologyContext ptc= WebServicePlugin.getInstance().getProjectTopologyContext();
- String serviceEARName = getServiceProject2EARProject().getChoice().getList().getSelection();
- if (!ptc.isUseTwoEARs()) {
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(serviceEARName);
- setClientEARComponentName(serviceEarComponentName_);
- }
- else {
- //I am here
- IProject proxyEARProject = getUniqueClientEAR(clientEARInfo[0], serviceEARName, initialClientProjectName);
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(proxyEARProject.getName());
- setClientEARComponentName(proxyEARProject.getName());
- }
- }
-
- }
-
-
-/*
- private void setDefaultEARs() {
- // Service-side
- String initialProjectName = getServiceProject2EARProject().getList().getSelection();
- IProject initialProject = FileResourceUtils.getWorkspaceRoot().getProject(initialProjectName);
- IProject defaultServiceEAR = getDefaultEARFromServiceProject(initialProject);
- getServiceProject2EARProject().getChoice().getList().setSelectionValue(defaultServiceEAR.getName());
- // Client-side
- String initialClientProjectName = getRuntime2ClientTypes().getChoice().getChoice().getList().getSelection();
- IProject initialClientProject = (IProject)((new StringToIProjectTransformer()).transform(initialClientProjectName));
- IProject defaultClientEAR = getDefaultEARFromClientProject(initialClientProject); // If the client project exists and the default EAR is the same as that of the service
- project, // pick the defaultClientEAR
- if(initialClientProject!=null && initialClientProject.exists() && defaultClientEAR.getName().equalsIgnoreCase(defaultServiceEAR.getName())) {
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultClientEAR.getName()); }
- else { ProjectTopologyContext ptc=
- WebServicePlugin.getInstance().getProjectTopologyContext(); if
- (!ptc.isUseTwoEARs()) {
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(defaultServiceEAR.getName()); }
- else { IProject proxyEARProject =
- getUniqueClientEAR(defaultClientEAR.getName(), defaultServiceEAR.getName(),
- initialClientProjectName);
- getRuntime2ClientTypes().getChoice().getChoice().getChoice().getList().setSelectionValue(proxyEARProject.getName()); } } }
- */
-
- private IProject getUniqueClientEAR(String earProject, String serviceProject, String clientProjectName) {
-
- String projectName = new String();
- if (!earProject.equalsIgnoreCase(serviceProject)) {
- projectName = earProject;
- }
- else {
- projectName = clientProjectName+DEFAULT_CLIENT_EAR_PROJECT_EXT;
- int i=1;
- while (projectName.equalsIgnoreCase(serviceProject)) {
- projectName = projectName+i;
- i++;
- }
- }
- return projectName.equals("") ? null : ResourceUtils.getWorkspaceRoot().getProject(projectName);
-
- }
-
- /*
- private void setDefaultServer()
- {
- String initialProjectName = getServiceProject2EARProject().getList().getSelection();
- IRuntime runtimeTarget = ServerSelectionUtils.getRuntimeTarget(initialProjectName);
- String runtimeTargetId = null;
- if (runtimeTarget != null)
- {
- runtimeTargetId = runtimeTarget.getRuntimeType().getId();
- //Pick a compatible existing server if one exists.
- IServer[] servers = ServerSelectionUtils.getCompatibleExistingServers(runtimeTarget);
- if (servers!=null && servers.length>0)
- {
- for (int i=0; i<servers.length; i++)
- {
- String thisFactoryId = servers[0].getServerType().getId();
- //if (WebServiceRuntimeExtensionUtils.doesRuntimeSupportServer(serviceIds_.getRuntimeId(), thisFactoryId))
- //{
- //Pick this server and return.
- serviceIds_.setServerId(thisFactoryId);
- serviceIds_.setServerInstanceId(servers[0].getId());
- return;
- //}
- }
- }
-
- //No compatible existing server, set the factory id to something the runtime supports
- String[] factoryIds = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds();
- if (factoryIds!=null && factoryIds.length>0)
- {
- for (int i=0; i<factoryIds.length; i++)
- {
- IServerType serverType = ServerCore.findServerType(factoryIds[i]);
- if (serverType != null)
- {
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
- if (serverRuntimeTypeId.equals(runtimeTargetId))
- {
- //Found a match
- serviceIds_.setServerId(factoryIds[i]);
- return;
- }
- }
- }
- }
- else
- {
- //Runtime does not specify any server factory ids
- IServerType[] serverTypes = ServerCore.getServerTypes();
- serviceIds_.setServerId(serverTypes[0].getId());
- }
-
- }
- else
- {
- // The project has no server target so pick a server factory id that is supported by the runtime
- String[] fids = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(serviceIds_.getRuntimeId()).getServerFactoryIds();
- if (fids!=null && fids.length>0)
- {
- serviceIds_.setServerId(fids[0]);
- }
- else
- {
- //Runtime does not specify any server factory ids
- IServerType[] serverTypes = ServerCore.getServerTypes();
- serviceIds_.setServerId(serverTypes[0].getId());
- }
-
- }
- }
- */
-
- private void setDefaultServer()
- {
- //Calculate reasonable default server based on the default project selection.
-
- String initialProjectName = getServiceProject2EARProject().getList().getSelection();
- IProject initialProject = ProjectUtilities.getProject(initialProjectName);
- if (initialProject.exists())
- {
- String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialProject, serviceComponentName_, serviceIds_.getRuntimeId(), true);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- serviceIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- serviceIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
- else //the project does not exist.
- {
- //Does the EAR exist?
- String initialEARProjectName = getServiceProject2EARProject().getChoice().getList().getSelection();
- IProject initialEARProject = ProjectUtilities.getProject(initialEARProjectName);
- if (initialEARProject.exists())
- {
- String[] serverInfo = ServerSelectionUtils.getServerInfoFromExistingProject(initialEARProject, serviceEarComponentName_, serviceIds_.getRuntimeId(), false);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- serviceIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- serviceIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
- else
- {
- //We have a new project and EAR. Use the runtime/server selection
- //preferences to set the default server/server type.
- //Pick a server type that is compatible with the Web service runtime
- //If there is an existing server that works, pick that one.
-
- String[] serverInfo = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(serviceIds_.getRuntimeId(), serviceJ2EEVersion_);
- if (serverInfo!=null)
- {
- if (serverInfo[0]!=null && serverInfo[0].length()>0)
- {
- serviceIds_.setServerId(serverInfo[0]);
- }
- if (serverInfo[1]!=null && serverInfo[1].length()>0)
- {
- serviceIds_.setServerInstanceId(serverInfo[1]);
- }
- }
- }
-
- }
- }
-
-
- private void updateServiceEARs()
- {
- //Set EAR selection to null if the project/server defaults imply an EAR should not be created
- String serviceProjectName = getServiceProject2EARProject().getList().getSelection();
- IProject serviceProject = FileResourceUtils.getWorkspaceRoot().getProject(serviceProjectName);
- if (serviceProject != null && serviceProject.exists())
- {
- //Get the runtime target on the serviceProject
- IRuntime serviceTarget = ServerSelectionUtils.getRuntimeTarget(serviceProjectName);
- String j2eeVersion = String.valueOf(J2EEUtils.getJ2EEVersion(serviceProject, serviceComponentName_));
- if (serviceTarget != null)
- {
- if (!ServerUtils.isTargetValidForEAR(serviceTarget.getRuntimeType().getId(),j2eeVersion))
- {
- //Default the EAR selection to be empty
- getServiceProject2EARProject().getChoice().getList().setIndex(-1);
- serviceEarComponentName_ = "";
- serviceNeedEAR_ = false;
- }
-
- }
- }
- else
- {
- //Use the server type
- String serverTargetId = ServerUtils.getRuntimeTargetIdFromFactoryId(serviceIds_.getServerId());
- if (serverTargetId!=null && serverTargetId.length()>0)
- {
- if (!ServerUtils.isTargetValidForEAR(serverTargetId,serviceJ2EEVersion_))
- {
- //Default the EAR selection to be empty
- getServiceProject2EARProject().getChoice().getList().setIndex(-1);
- serviceEarComponentName_ = "";
- serviceNeedEAR_ = false;
- }
- }
- }
-
-
- }
- public void setInitialSelection(IStructuredSelection selection)
- {
- initialSelection_ = selection;
- }
-
- public void setInitialProject(IProject initialProject)
- {
- initialProject_ = initialProject;
- }
-
- public void setInitialComponentName(String name)
- {
- initialComponentName_ = name;
- }
-
- public void setServiceTypeRuntimeServer( TypeRuntimeServer ids )
- {
- serviceIds_ = ids;
- }
-
- public TypeRuntimeServer getServiceTypeRuntimeServer()
- {
- return serviceIds_;
- }
-
- public SelectionListChoices getServiceProject2EARProject()
- {
- if (serviceProject2EARProject_ == null)
- {
- // rskreg
- //IProject[] projects = WebServiceServerRuntimeTypeRegistry.getInstance().getProjectsByWebServiceType(serviceIds_.getTypeId());
- //Populate the list with all the projects in the workspace except Servers and ones that start with "."
- // rskreg
- String[] projectNames = getAllFlexibleProjects();
- SelectionList list = new SelectionList(projectNames, 0);
- Vector choices = new Vector();
- for (int i = 0; i < projectNames.length; i++) {
- IProject project = ProjectUtilities.getProject(projectNames[i]);
- choices.add(getProjectEARChoice(project));
- }
- serviceProject2EARProject_ = new SelectionListChoices(list, choices, getEARProjects());
- }
- return serviceProject2EARProject_;
- }
-
- /**
- * @return Returns the generateProxy_.
- */
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
- /**
- * @param generateProxy_ The generateProxy_ to set.
- */
- public void setGenerateProxy(boolean generateProxy_)
- {
- this.generateProxy_ = generateProxy_;
- }
-
- public String getServiceJ2EEVersion()
- {
- return serviceJ2EEVersion_;
- }
-
- public String getServiceProjectName()
- {
- return getServiceProject2EARProject().getList().getSelection();
- }
-
- public String getServiceEarProjectName()
- {
- return getServiceProject2EARProject().getChoice().getList().getSelection();
- }
-
- public String getServiceComponentName()
- {
- return serviceComponentName_;
- }
-
- public String getServiceEarComponentName()
- {
- return serviceEarComponentName_;
- }
-
- public String getServiceComponentType()
- {
- return serviceComponentType_;
- }
-
- public boolean getServiceNeedEAR()
- {
- return serviceNeedEAR_;
- }
-
- /**
- * Returns the first EAR for a given project
- * @param project
- * @return
- */
- /*
- private IProject getDefaultEARFromServiceProject(IProject project)
- {
- if (project!=null && project.exists())
- {
- IServer[] configuredServers = ServerUtil.getServersByModule(ResourceUtils.getModule(project), null);
- IServer firstSupportedServer = ServerSelectionUtils.getFirstSupportedServer(configuredServers, serviceIds_.getTypeId() );
-
- EARNatureRuntime[] earProjects = J2EEUtils.getEARProjects(project, firstSupportedServer);
- if (earProjects!=null && earProjects[0] instanceof EARNatureRuntime)
- return earProjects[0].getProject();
- }
-
- int versionId = -1;
- if (serviceJ2EEVersion_ != null && serviceJ2EEVersion_.length()>0)
- {
- versionId = Integer.parseInt(serviceJ2EEVersion_);
- }
- EARNatureRuntime newEAR = J2EEUtils.getEAR(versionId);
- IProject earProject = ResourceUtils.getWorkspaceRoot().getProject(ResourceUtils.getDefaultServiceEARProjectName());
-
- if (newEAR!=null)
- earProject = newEAR.getProject();
-
- return earProject;
- }
- */
-
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
deleted file mode 100644
index 72e0589..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/LaunchFragment.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.ws.internal.explorer.WSExplorerLauncherCommand;
-
-
-public class LaunchFragment extends BooleanFragment
-{
- private boolean publishToPublicUDDI_;
- private boolean publishToPrivateUDDI_;
-
- public LaunchFragment()
- {
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return (publishToPublicUDDI_ || publishToPrivateUDDI_);
- }
- };
- setCondition( condition );
- setTrueFragment( new SimpleFragment( new WSExplorerLauncherCommand(), "" ) );
- }
-
- public void setPublishToPublicUDDI(boolean publishToPublicUDDI)
- {
- publishToPublicUDDI_ = publishToPublicUDDI;
- }
-
- public void setPublishToPrivateUDDI(boolean publishToPrivateUDDI)
- {
- publishToPrivateUDDI_ = publishToPrivateUDDI;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
deleted file mode 100644
index 99d8214..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestFragment.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.BooleanFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class ServiceTestFragment extends BooleanFragment
-{
- private boolean testService;
- private boolean generateProxy;
-
-
- public ServiceTestFragment( String id )
- {
- SequenceFragment testRoot = new SequenceFragment();
- Condition condition = new Condition()
- {
- public boolean evaluate()
- {
- return testService;
- }
- };
- setCondition( condition );
-
- testRoot.add( new SimpleFragment( new WebServiceTestDefaultingCommand(), "" ) );
- testRoot.add( new SimpleFragment( id ) );
- setTrueFragment( testRoot );
-
- }
-
-
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
-
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "TestID",WSDLTestLaunchCommand.class);
-
- //from the wizard
- dataRegistry.addMapping(ServiceTestWidget.class, "TestID",WSDLTestLaunchCommand.class);
- dataRegistry.addMapping(WebServiceTestDefaultingCommand.class, "ExternalBrowser",WSDLTestLaunchCommand.class);
- }
-
- public void setGenerateProxy(boolean generateProxy)
- {
- this.generateProxy = generateProxy;
- }
-
- public boolean getGenerateProxy()
- {
- return generateProxy;
- }
-
- /**
- * @return Returns the testService.
- */
- public void setTestService( boolean testService )
- {
- this.testService = testService;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
deleted file mode 100644
index dfd1ffa..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/ServiceTestWidget.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WSDLTestLaunchCommand;
-import org.eclipse.jst.ws.internal.data.TypeRuntimeServer;
-import org.eclipse.jst.ws.internal.ui.common.UIUtils;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-
-
-public class ServiceTestWidget extends SimpleWidgetDataContributor
-{
- private String pluginId_ = "org.eclipse.jst.ws.consumption.ui";
- private String createPluginId_ = "org.eclipse.jst.ws.creation.ui";
-
- private Combo testTypeCombo_;
- /*CONTEXT_ID PSTP0001 for the Test Type Combo box of the Service Test Page*/
- private final String INFOPOP_PSTP_COMBOBOX_TEST = "PSTP0001";
- private final String TOOLTIP_PSTP_COMBOBOX_TEST = "TOOLTIP_PSTP_COMBOBOX_TEST";
-
- private Button launchButton_;
- /*CONTEXT_ID PSTP0002 for the launch button of the Service Test Page*/
- private final String INFOPOP_PSTP_LAUNCH_BUTTON = "PSTP0002";
- private final String TOOLTIP_PSTP_LAUNCH_BUTTON = "TOOLTIP_PSTP_LAUNCH_BUTTON";
-
- private SelectionList facilities_;
-
- private String serviceServerInstanceId = null;
-
- public WidgetDataEvents addControls( Composite parent, Listener statusListener )
- {
- MessageUtils msgUtils = new MessageUtils( pluginId_ + ".plugin", this );
- UIUtils uiUtils = new UIUtils(msgUtils, createPluginId_ );
-
- Composite testComposite = uiUtils.createComposite( parent, 3, 0, 0 );
-
- testTypeCombo_ = uiUtils.createCombo( testComposite, "LABEL_TEST_TYPES",
- TOOLTIP_PSTP_COMBOBOX_TEST,
- INFOPOP_PSTP_COMBOBOX_TEST,
- SWT.SINGLE | SWT.BORDER | SWT.READ_ONLY );
-
- launchButton_ = uiUtils.createPushButton( testComposite, "BUTTON_LAUNCH_SERVICE_TEST",
- TOOLTIP_PSTP_LAUNCH_BUTTON,
- INFOPOP_PSTP_LAUNCH_BUTTON );
- launchButton_.addSelectionListener( new SelectionAdapter()
- {
- public void widgetSelected( SelectionEvent event )
- {
- handleLaunchButton();
- }
- });
-
-
- return this;
- }
-
- private TypeRuntimeServer serviceids;
- private String serverProject;
- private String module;
- private String wsdlURI;
- private String launchedServiceTestName = "";
- private Environment env;
- private List endpoints;
-
- private void handleLaunchButton()
- {
- // Split up the project and module
- int p = serverProject.indexOf("/");
- if (p != -1){
- module = serverProject.substring(p+1);
- serverProject = serverProject.substring(0,p);
- }
-
- String testID = testTypeCombo_.getText();
- launchedServiceTestName = testID;
- WSDLTestLaunchCommand wtlc = new WSDLTestLaunchCommand();
- wtlc.setTestID(testID);
- wtlc.setServiceTypeRuntimeServer(serviceids);
- wtlc.setServiceServerInstanceId(serviceServerInstanceId);
- wtlc.setServerProject(serverProject);
- wtlc.setServerModule(module);
- wtlc.setWsdlURI(wsdlURI);
- wtlc.setExternalBrowser(true);
- wtlc.setEndpoint(endpoints);
- Status status = wtlc.execute(env);
- }
-
- public void setServiceTestFacilities( SelectionList facilities )
- {
- facilities_ = facilities;
- testTypeCombo_.setItems( facilities.getList() );
- testTypeCombo_.select( facilities.getIndex() );
- }
-
- public SelectionList getServiceTestFacilities()
- {
- facilities_.setIndex( testTypeCombo_.getSelectionIndex() );
- return facilities_;
- }
-
- public String getTestID()
- {
- return testTypeCombo_.getText();
- }
-
- public void setWsdlURI(String wsdlURI)
- {
- this.wsdlURI = wsdlURI;
- }
-
- public void setServerProject(String serverProject)
- {
- this.serverProject = serverProject;
- }
-
- public void setServiceTypeRuntimeServer(TypeRuntimeServer serviceids)
- {
- this.serviceids = serviceids;
- }
-
- public String getLaunchedServiceTestName()
- {
- return launchedServiceTestName;
- }
-
- public void setEnvironment(Environment env)
- {
- this.env = env;
- }
-
- public void setEndpoint(String endpoint)
- {
- if (endpoint != null && endpoint.length() > 0)
- {
- Vector v = new Vector();
- v.add(endpoint);
- setEndpoints(v);
- }
- }
-
- public void setEndpoints(List endpoints)
- {
- this.endpoints = endpoints;
- }
-
- public void setServiceServerInstanceId(String ssInstanceId){
- this.serviceServerInstanceId = ssInstanceId;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java b/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
deleted file mode 100644
index 1db6cea..0000000
--- a/bundles/org.eclipse.jst.ws.creation.ui/src/org/eclipse/jst/ws/internal/creation/ui/widgets/test/WebServiceTestDefaultingCommand.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on Apr 15, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.ws.internal.creation.ui.widgets.test;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.selection.SelectionList;
-
-
-/**
- * @author gilberta
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class WebServiceTestDefaultingCommand extends SimpleCommand
-{
-
- private SelectionList serviceTestFacilities;
- private Environment environment;
- private String testID;
-
- public Status execute(Environment env)
- {
- ScenarioContext scenarioContext = WebServicePlugin.getInstance().getScenarioContext().copy();
- testID = scenarioContext.getNonJavaTestService();
- String[] testTypes = scenarioContext.getWebServiceTestTypes();
-
-
- environment = env;
- Status status = new SimpleStatus("");
- WebServiceTestRegistry wsttRegistry = WebServiceTestRegistry.getInstance();
-
-
- Vector wsdlNames = new Vector();
- for(int i =0 ;i<testTypes.length;i++){
- WebServiceTestExtension wscte = (WebServiceTestExtension)wsttRegistry.getWebServiceExtensionsByName(testTypes[i]);
- if(wscte.testWSDL()){
- wsdlNames.addElement(testTypes[i]);
- }
- }
-
- String javaNamesArray[] = new String[wsdlNames.size()];
- Enumeration e = wsdlNames.elements();
- int i = 0;
- while(e.hasMoreElements()){
- javaNamesArray[i] = (String)e.nextElement();
- i++;
- }
-
-
- serviceTestFacilities = new SelectionList(javaNamesArray,0);
-
- return status;
- }
-
- public SelectionList getServiceTestFacilities()
- {
- return serviceTestFacilities;
- }
-
- public String getTestID()
- {
- return testID;
- }
-
- public Environment getEnvironment()
- {
- return environment;
- }
-
- public boolean getExternalBrowser()
- {
- return false;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath b/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore b/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
deleted file mode 100644
index c6d6a02..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-uddiregistry.jar
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/.project b/bundles/org.eclipse.jst.ws.uddiregistry/.project
deleted file mode 100644
index cd999f6..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.uddiregistry</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- <project>org.eclipse.jst.ws.consumption</project>
- <project>org.eclipse.jst.ws.consumption.ui</project>
- <project>org.eclipse.jst.ws.ui</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
deleted file mode 100644
index faa37a9..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,21 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.uddiregistry; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: uddiregistry.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.uddiregistry.plugin,
- org.eclipse.jst.ws.internal.uddiregistry.widgets,
- org.eclipse.jst.ws.internal.uddiregistry.widgets.binding,
- org.eclipse.jst.ws.internal.uddiregistry.wizard,
- org.eclipse.jst.ws.uddiregistry
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.jst.ws.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/about.html b/bundles/org.eclipse.jst.ws.uddiregistry/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties b/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
deleted file mode 100644
index 4b7cb77..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.uddiregistry.jar = src/
-bin.includes = uddiregistry.jar,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
deleted file mode 100644
index 5b43cae..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/registry.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif b/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
deleted file mode 100644
index 31611ec..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/icons/uddiprivateconfig_wiz.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
deleted file mode 100644
index d8cfbff..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-###############################################################################
-# Copyright (c) 2001, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Universal Description Discovery and Integration Registry
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI=Unit Test UDDI
-
-XP_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry Types
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml b/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
deleted file mode 100644
index 77a2c48..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/plugin.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
-
-<!--
- <description>
- %PLUGIN_DESC
- </description>
- -->
- <extension-point id="privateUDDIRegistryType" name="%XP_PRIVATE_UDDI_REGISTRY_TYPES"/>
-
- <extension
- point="org.eclipse.jst.ws.consumption.ui.privateUDDIRegistryType">
- <privateUDDIRegistryType
- name="%PRIVATE_UDDI_REGISTRY_TYPE_IMPL"
- class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl"
- id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeImpl">
- </privateUDDIRegistryType>
- </extension>
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- icon="icons/registry.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard"
- id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
- </wizard>
- </extension>
- <extension
- point="org.eclipse.wst.command.env.dynamicWizard">
- <dynamicWizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- class="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding"
- iconbanner="icons/uddiprivateconfig_wiz.gif"
- id="org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding">
- </dynamicWizard>
- </extension>
- <!--
- <extension
- point="org.eclipse.ui.newWizards">
- <wizard
- name="%PLUGIN_NEW_WIZARD_NAME_WS_UNIT_TEST_UDDI"
- icon="icons/registry.gif"
- category="org.eclipse.jst.ws.ui.new"
- class="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard"
- id="org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIWizard">
- <description>
- %PLUGIN_NEW_WIZARD_DESC_WS_UNIT_TEST_UDDI
- </description>
- <selection
- class="org.eclipse.core.resources.IResource">
- </selection>
- </wizard>
- </extension>
- -->
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
deleted file mode 100644
index fd8d49a..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/plugin/WebServiceUDDIRegistryPlugin.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-/**
-* This is the plugin class for the Web Services UDDI Registry plugin.
-* <p>
-* The Web Services UDDI Registry plugin's is to add the
-* option to create a unit test UDDI registry
-*/
-public class WebServiceUDDIRegistryPlugin extends Plugin
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.uddiregistry";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceUDDIRegistryPlugin instance_;
- private Log log_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceUDDIRegistryPlugin ()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceUDDIRegistryPlugin)Platform.getPlugin("org.eclipse.jst.ws.uddiregistry");
- * @return The WebServiceUDDIRegistryPlugin singleton.
- */
- public static WebServiceUDDIRegistryPlugin getInstance ()
- {
- return instance_;
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor ( String name )
- {
- try
- {
- URL installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL,name);
- return ImageDescriptor.createFromURL(imageURL);
- }
- catch (MalformedURLException e)
- {
- return null;
- }
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- return Platform.getResourceString(instance_.getBundle(),key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties. Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See the JDK's
- * {@link java.text.MessageFormat java.text.MessageFormat}
- * class for further details on substitution.
- * @return The String message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
deleted file mode 100644
index d063114..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommand.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-/*
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-*/
-
-public class PrivateUDDISelectionCommand extends SimpleCommand
-{
- private byte operationType;
- private PrivateUDDIRegistryType registryType;
-
- /*
- public Status execute(Environment env)
- {
- MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
- if (registryType != null)
- {
- switch (operationType)
- {
- case PrivateUDDIRegistryType.OP_DEPLOY:
- return registryType.deploy(env);
- case PrivateUDDIRegistryType.OP_UPDATE:
- return registryType.update(env);
- case PrivateUDDIRegistryType.OP_REMOVE:
- return registryType.remove(env);
- default:
- }
- }
- return new SimpleStatus("");
- }
- */
-
- public PrivateUDDIRegistryType getRegistryType()
- {
- return getPrivateUDDIRegistryType();
- }
-
- public byte getOperationType()
- {
- return operationType;
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
- {
- return registryType;
- }
-
- public void setRegistryType(PrivateUDDIRegistryType regType)
- {
- setPrivateUDDIRegistryType(regType);
- }
-
- public void setOperationType(byte type)
- {
- operationType = type;
- }
-
- public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType regType)
- {
- registryType = regType;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
deleted file mode 100644
index c70c21c..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionCommandFragment.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.wst.command.internal.env.core.fragment.AbstractCommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.CommandFactory;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PrivateUDDISelectionCommandFragment extends AbstractCommandFragment
-{
- private PrivateUDDIRegistryType registryType;
- private DataMappingRegistry dataMappingRegistry;
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
-
- public PrivateUDDISelectionCommandFragment()
- {
- super((CommandFactory)null, "");
- }
-
- /**
- * Gets the first child fragment for this fragment.
- *
- * @return returns the first child fragment for this fragment. Returns
- * null when there is no first child.
- **/
- public CommandFragment getFirstSubFragment()
- {
- if (registryType != null)
- {
- registryType.registerCanFinish(canFinishRegistry);
- registryType.registerDataMappings(dataMappingRegistry);
- registryType.registerWidgetMappings(widgetRegistry);
- return registryType.create().create();
- }
- else
- return null;
- }
-
- /**
- * Gets the next child fragment for this fragment.
- *
- * @return returns the next child fragment for this fragment. Returns null
- * when there is no next child.
- **/
- public CommandFragment getNextSubFragment(CommandFragment fragment)
- {
- return null;
- }
-
- /*
- * This method is called to retrieve the data mappings for this command fragment.
- */
- public void registerDataMappings(DataMappingRegistry registry)
- {
- dataMappingRegistry = registry;
- }
-
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- }
-
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- this.widgetRegistry = widgetRegistry;
- }
-
- /**
- * All wizard fragments need to be cloneable.
- **/
- public Object clone()
- {
- PrivateUDDISelectionCommandFragment fragment = new PrivateUDDISelectionCommandFragment();
- fragment.registerDataMappings(dataMappingRegistry);
- fragment.registerCanFinish(canFinishRegistry);
- fragment.registerWidgetMappings(widgetRegistry);
- fragment.setPrivateUDDIRegistryType(registryType);
- return fragment;
- }
-
- public void setPrivateUDDIRegistryType(PrivateUDDIRegistryType registryType)
- {
- this.registryType = registryType;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
deleted file mode 100644
index 16109c6..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidget.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryType;
-import org.eclipse.jst.ws.internal.uddiregistry.wizard.PrivateUDDIRegistryTypeRegistry;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleWidgetDataContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetDataEvents;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-/**
-* This UDDI configuration page prompts the user
-* for the information required to configure the
-* unit test UDDI registry.
-*/
-public class PrivateUDDISelectionWidget extends SimpleWidgetDataContributor
-{
- private MessageUtils msgUtils;
- private Listener statusListener;
-
- private Button deployRadio_;
- private Label typesLabel_;
- private Combo typesCombo_;
- private Button updateRadio_;
- private Button removeRadio_;
- private PrivateUDDIRegistryType[] types_;
- private PrivateUDDIRegistryType installedType_;
-
- // Infopop
- private final String INFOPOP_PUPR_PRIVATE_UDDI_PAGE = WebServiceUDDIRegistryPlugin.ID + ".pupr0001";
- private final String INFOPOP_PUPR_PRIVATE_UDDI_TYPE = WebServiceUDDIRegistryPlugin.ID + ".pupr0002";
- private final String INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0003";
- private final String INFOPOP_PUPR_UPDATE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0005";
- private final String INFOPOP_PUPR_REMOVE_PRIVATE_UDDI = WebServiceUDDIRegistryPlugin.ID + ".pupr0004";
-
- public PrivateUDDISelectionWidget()
- {
- msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this );
- }
-
- public WidgetDataEvents addControls(Composite parent, Listener statusListener)
- {
- this.statusListener = statusListener;
- parent.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_PAGE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent, INFOPOP_PUPR_PRIVATE_UDDI_PAGE);
-
- GridLayout gl;
- GridData gd;
-
- Listener listener = new Listener()
- {
- public void handleEvent(Event event)
- {
- handleWidgetEvent(event);
- }
- };
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- deployRadio_ = new Button(parent, SWT.RADIO);
- deployRadio_.setText(msgUtils.getMessage("BUTTON_DEPLOY_UDDI_REGISTRY"));
- deployRadio_.setSelection(true);
- deployRadio_.addListener(SWT.Selection, listener);
- deployRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI"));
- helpSystem.setHelp(deployRadio_, INFOPOP_PUPR_DEPLOY_PRIVATE_UDDI);
-
- Composite typeComposite = new Composite(parent,SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 5;
- gl.verticalSpacing = 15;
- gl.marginWidth = 20;
- typeComposite.setLayout(gl);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- typeComposite.setLayoutData(gd);
-
- typesLabel_ = new Label(typeComposite, SWT.WRAP);
- typesLabel_.setText(msgUtils.getMessage("LABEL_PRIVATE_UDDI_REGISTRY_TYPES"));
- typesLabel_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
- helpSystem.setHelp(typesLabel_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
- typesCombo_ = new Combo(typeComposite, SWT.DROP_DOWN | SWT.READ_ONLY);
- gd = new GridData(GridData.FILL_HORIZONTAL);
- typesCombo_.setLayoutData(gd);
- typesCombo_.addListener(SWT.Selection, listener);
- typesCombo_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_PRIVATE_UDDI_TYPE"));
- helpSystem.setHelp(typesCombo_, INFOPOP_PUPR_PRIVATE_UDDI_TYPE);
-
- updateRadio_ = new Button(parent,SWT.RADIO);
- updateRadio_.setText(msgUtils.getMessage("BUTTON_UPDATE_UDDI_REGISTRY"));
- updateRadio_.setSelection(false);
- updateRadio_.addListener(SWT.Selection,listener);
- updateRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI"));
- helpSystem.setHelp(updateRadio_, INFOPOP_PUPR_UPDATE_PRIVATE_UDDI);
-
- removeRadio_ = new Button(parent, SWT.RADIO);
- removeRadio_.setText(msgUtils.getMessage("BUTTON_REMOVE_UDDI_REGISTRY"));
- removeRadio_.setSelection(false);
- removeRadio_.addListener(SWT.Selection, listener);
- removeRadio_.setToolTipText(msgUtils.getMessage("TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI"));
- helpSystem.setHelp(removeRadio_, INFOPOP_PUPR_REMOVE_PRIVATE_UDDI);
-
- loadTypes();
- init();
- return this;
- }
-
- private final void loadTypes()
- {
- types_ = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- }
-
- private final void init()
- {
- for (int i = 0; i < types_.length; i++)
- {
- if (types_[i] != null)
- {
- typesCombo_.add(types_[i].getName());
- if (types_[i].isPrivateUDDIRegistryInstalled())
- installedType_ = types_[i];
- }
- }
- if (typesCombo_.getItemCount() > 0)
- typesCombo_.setText(typesCombo_.getItem(0));
- if (installedType_ != null)
- {
- updateRadio_.setEnabled(true);
- removeRadio_.setEnabled(true);
- }
- else
- {
- updateRadio_.setEnabled(false);
- removeRadio_.setEnabled(false);
- }
- }
-
- private void handleWidgetEvent(Event event)
- {
- if (event.widget == removeRadio_ || event.widget == updateRadio_)
- {
- boolean isUpdateOrRemoveSelected = ((Button)event.widget).getSelection();
- typesLabel_.setEnabled(!isUpdateOrRemoveSelected);
- typesCombo_.setEnabled(!isUpdateOrRemoveSelected);
- }
- else if (event.widget == deployRadio_)
- {
- boolean isDeploySelected = ((Button)event.widget).getSelection();
- typesLabel_.setEnabled(isDeploySelected);
- typesCombo_.setEnabled(isDeploySelected);
- }
- statusListener.handleEvent(event);
- }
-
- public PrivateUDDIRegistryType getPrivateUDDIRegistryType()
- {
- if (deployRadio_.getSelection())
- {
- String selectedRegistryName = typesCombo_.getText();
- for (int i = 0; i < types_.length; i++)
- if (selectedRegistryName.equals(types_[i].getName()))
- return types_[i];
- return null;
- }
- else
- return installedType_;
- }
-
- public byte getOperationType()
- {
- if (deployRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_DEPLOY;
- else if (updateRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_UPDATE;
- else if (removeRadio_.getSelection())
- return PrivateUDDIRegistryType.OP_REMOVE;
- else
- return PrivateUDDIRegistryType.OP_DEPLOY;
- }
-
- public Status getStatus()
- {
- PrivateUDDIRegistryType privateUDDIRegistryType = getPrivateUDDIRegistryType();
- if (privateUDDIRegistryType != null)
- return privateUDDIRegistryType.getOperationStatus(getOperationType());
- else
- return new SimpleStatus("", msgUtils.getMessage("MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE"), Status.ERROR);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
deleted file mode 100644
index d6ec49f..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/PrivateUDDISelectionWidgetConditionCommand.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets;
-
-import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommand;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Condition;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class PrivateUDDISelectionWidgetConditionCommand extends SimpleCommand implements Condition
-{
- private boolean condition;
-
- public PrivateUDDISelectionWidgetConditionCommand()
- {
- condition = true;
- }
-
- public Status execute(Environment env)
- {
- condition = !condition;
- return new SimpleStatus("");
- }
-
- public Status undo(Environment env)
- {
- condition = !condition;
- return new SimpleStatus("");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.core.Command#isUndoable()
- */
- public boolean isUndoable()
- {
- return true;
- }
-
- public boolean evaluate()
- {
- return condition;
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
deleted file mode 100644
index 78dedf1..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/widgets/binding/PrivateUDDIWidgetBinding.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.widgets.binding;
-
-import org.eclipse.jst.ws.internal.uddiregistry.plugin.WebServiceUDDIRegistryPlugin;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommand;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionCommandFragment;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidget;
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.PrivateUDDISelectionWidgetConditionCommand;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragmentFactory;
-import org.eclipse.wst.command.internal.env.core.fragment.SequenceFragment;
-import org.eclipse.wst.command.internal.env.core.fragment.SimpleFragment;
-import org.eclipse.wst.command.internal.env.ui.widgets.CanFinishRegistry;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributor;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetContributorFactory;
-import org.eclipse.wst.command.internal.env.ui.widgets.WidgetRegistry;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry;
-
-
-public class PrivateUDDIWidgetBinding implements CommandWidgetBinding
-{
- private CanFinishRegistry canFinishRegistry;
- private WidgetRegistry widgetRegistry;
- private DataMappingRegistry dataMappingRegistry;
- private PrivateUDDISelectionCommandFragment privateUDDISelFragment;
- private PrivateUDDISelectionWidgetConditionCommand conditionCommand;
-
- public PrivateUDDIWidgetBinding()
- {
- privateUDDISelFragment = new PrivateUDDISelectionCommandFragment();
- conditionCommand = new PrivateUDDISelectionWidgetConditionCommand();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#create()
- */
- public CommandFragmentFactory create()
- {
- return new CommandFragmentFactory()
- {
- public CommandFragment create()
- {
- SequenceFragment root = new SequenceFragment();
- root.add(new SimpleFragment(conditionCommand, ""));
- root.add(new SimpleFragment("PrivateUDDISelectionWidget"));
- root.add(new SimpleFragment(conditionCommand, ""));
- root.add(new SimpleFragment(new PrivateUDDISelectionCommand(), ""));
- root.add(privateUDDISelFragment);
- return root;
- }
- };
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerCanFinish(org.eclipse.wst.command.env.ui.widgets.CanFinishRegistry)
- */
- public void registerCanFinish(CanFinishRegistry canFinishRegistry)
- {
- this.canFinishRegistry = canFinishRegistry;
- privateUDDISelFragment.registerCanFinish(this.canFinishRegistry);
-
- canFinishRegistry.addCondition(conditionCommand);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerDataMappings(org.eclipse.wst.command.internal.provisional.env.core.data.DataMappingRegistry)
- */
- public void registerDataMappings(DataMappingRegistry dataRegistry)
- {
- dataMappingRegistry = dataRegistry;
- privateUDDISelFragment.registerDataMappings(dataMappingRegistry);
-
- // PrivateUDDISelectionCommand
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommand.class);
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "OperationType", PrivateUDDISelectionCommand.class);
-
- // PrivateUDDISelectionCommandFragment
- dataMappingRegistry.addMapping(PrivateUDDISelectionWidget.class, "PrivateUDDIRegistryType", PrivateUDDISelectionCommandFragment.class);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.env.ui.widgets.CommandWidgetBinding#registerWidgetMappings(org.eclipse.wst.command.env.ui.widgets.WidgetRegistry)
- */
- public void registerWidgetMappings(WidgetRegistry widgetRegistry)
- {
- MessageUtils msgUtils = new MessageUtils(WebServiceUDDIRegistryPlugin.ID + ".plugin", this);
- this.widgetRegistry = widgetRegistry;
- privateUDDISelFragment.registerWidgetMappings(this.widgetRegistry);
-
- widgetRegistry.add("PrivateUDDISelectionWidget",
- msgUtils.getMessage("PAGE_TITLE_PRIVATE_UDDI_CONFIG"),
- msgUtils.getMessage("PAGE_DESC_PRIVATE_UDDI_CONFIG"),
- new WidgetContributorFactory()
- {
- public WidgetContributor create()
- {
- return new PrivateUDDISelectionWidget();
- }
- }
- );
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
deleted file mode 100644
index 5687a3f..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public interface PrivateUDDIRegistryType extends CommandWidgetBinding
-{
- // operation types
- public static byte OP_DEPLOY = 0x0;
- public static byte OP_UPDATE = 0x1;
- public static byte OP_REMOVE = 0x2;
-
- // general information
- public String getID();
- public String getName();
- public boolean isPrivateUDDIRegistryInstalled();
- public Status getOperationStatus(byte operation);
-
- // registry URLs
- public String getInquiryAPI();
- public String getPublishAPI();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
deleted file mode 100644
index 2af533c..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeImpl.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.jst.ws.internal.uddiregistry.widgets.binding.PrivateUDDIWidgetBinding;
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-
-public class PrivateUDDIRegistryTypeImpl implements org.eclipse.jst.ws.internal.ui.uddi.PrivateUDDIRegistryType
-{
- public PrivateUDDIRegistryTypeImpl() {
- }
-
- public boolean isPrivateUDDIRegistryInstalled() {
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled())
- return true;
- }
- return false;
- }
-
- public String[] getPrivateUDDIRegistryInquiryAPI() {
- Vector inquiryAPIVector = new Vector();
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled()) {
- String inquiryAPI = types[i].getInquiryAPI();
- if (inquiryAPI != null && inquiryAPI.startsWith("http"))
- inquiryAPIVector.add(inquiryAPI);
- }
- }
-
- String[] inquiryAPIArray = new String[inquiryAPIVector.size()];
- Enumeration e = inquiryAPIVector.elements();
- int j = 0;
- while(e.hasMoreElements()) {
- inquiryAPIArray[j] = (String)e.nextElement();
- j++;
- }
- return inquiryAPIArray;
- }
-
- public String[] getPrivateUDDIRegistryPublishAPI() {
- Vector publishAPIVector = new Vector();
- PrivateUDDIRegistryType[] types = PrivateUDDIRegistryTypeRegistry.getInstance().getTypes();
- for (int i = 0; i < types.length; i++) {
- if (types[i].isPrivateUDDIRegistryInstalled()) {
- String publishAPI = types[i].getPublishAPI();
- if (publishAPI != null && publishAPI.startsWith("http"))
- publishAPIVector.add(publishAPI);
- }
- }
-
- String[] publishAPIArray = new String[publishAPIVector.size()];
- Enumeration e = publishAPIVector.elements();
- int j = 0;
- while(e.hasMoreElements()) {
- publishAPIArray[j] = (String)e.nextElement();
- j++;
- }
- return publishAPIArray;
- }
-
- public CommandWidgetBinding getBinding()
- {
- return new PrivateUDDIWidgetBinding();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
deleted file mode 100644
index 971d6c5..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/internal/uddiregistry/wizard/PrivateUDDIRegistryTypeRegistry.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.uddiregistry.wizard;
-
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class PrivateUDDIRegistryTypeRegistry {
-
- private static PrivateUDDIRegistryTypeRegistry instance_;
- private IConfigurationElement[] configElements_;
-
- private PrivateUDDIRegistryTypeRegistry() {
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceClientTypeRegistry object.
- */
- public static PrivateUDDIRegistryTypeRegistry getInstance() {
- if (instance_ == null) {
- instance_ = new PrivateUDDIRegistryTypeRegistry();
- instance_.getConfigElements();
- }
- return instance_;
- }
-
- public IConfigurationElement[] getConfigElements() {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- configElements_ = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.uddiregistry",
- "privateUDDIRegistryType");
- Vector v = new Vector();
- for (int i = 0; i < configElements_.length; i++)
- {
- int weight = getWeight(configElements_[i]);
- int index = -1;
- for (int j = v.size()-1; j >= 0; j--)
- {
- if (weight > getWeight((IConfigurationElement)v.get(j)))
- index = j;
- else
- break;
- }
- if (index != -1)
- v.add(index, configElements_[i]);
- else
- v.add(configElements_[i]);
- }
- v.copyInto(configElements_);
- return configElements_;
- }
-
- private int getWeight(IConfigurationElement e)
- {
- try
- {
- return Integer.parseInt(e.getAttribute("weight"));
- }
- catch (NumberFormatException nfe)
- {
- return -1;
- }
- }
-
- private IConfigurationElement getConfigElementByID(String id) {
- for (int i = 0; i <configElements_.length; i++) {
- if (configElements_[i].getAttribute("id").equals(id))
- return configElements_[i];
- }
- return null;
- }
-
- public PrivateUDDIRegistryType[] getTypes() {
- Vector types = new Vector();
- for (int i = 0; i < configElements_.length; i++) {
- try {
- Object typeObj = configElements_[i].createExecutableExtension("class");
- if (typeObj instanceof PrivateUDDIRegistryType)
- types.add(typeObj);
- }
- catch (Exception e) {}
- }
-
- PrivateUDDIRegistryType[] typesArray = new PrivateUDDIRegistryType[types.size()];
- for (int j = 0; j < types.size(); j++) {
- typesArray[j] = (PrivateUDDIRegistryType)types.elementAt(j);
- }
- return typesArray;
- }
-
- public PrivateUDDIRegistryType getTypeByID(String id) {
- try {
- Object typeObj = getConfigElementByID(id).createExecutableExtension("class");
- if (typeObj instanceof PrivateUDDIRegistryType)
- return (PrivateUDDIRegistryType)typeObj;
- }
- catch (Exception e) {}
- return null;
- }
-
- public String[] getSupportedServerFactoryIDByID(String id) {
- IConfigurationElement configElement = getConfigElementByID(id);
- if (configElement == null)
- return new String[0];
- Vector idVector = new Vector();
- StringTokenizer st = new StringTokenizer(configElement.getAttribute("serverFactoryID"), ",");
- while (st.hasMoreTokens()) {
- idVector.add(st.nextToken());
- }
- String[] ids = new String[idVector.size()];
- for (int i = 0; i < idVector.size(); i++) {
- ids[i] = (String)idVector.elementAt(i);
- }
- return ids;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties b/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
deleted file mode 100644
index c4d8af3..0000000
--- a/bundles/org.eclipse.jst.ws.uddiregistry/src/org/eclipse/jst/ws/uddiregistry/plugin.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# PrivateUDDIConfigPage
-#
-PAGE_TITLE_PRIVATE_UDDI_CONFIG=Unit Test UDDI Registry Configuration
-PAGE_DESC_PRIVATE_UDDI_CONFIG=Configure the unit test UDDI registry.
-
-#
-# Tooltip for PrivateUDDIConfigPage
-#
-TOOLTIP_PUPR_PRIVATE_UDDI_PAGE=Deploy or remove a Unit Test UDDI Registry
-TOOLTIP_PUPR_PRIVATE_UDDI_TYPE=Choose the type of Unit Test UDDI Registry you want to deploy
-TOOLTIP_PUPR_DEPLOY_PRIVATE_UDDI=Deploy a Unit Test UDDI Registry
-TOOLTIP_PUPR_UPDATE_PRIVATE_UDDI=Update the existing Unit Test UDDI Registry
-TOOLTIP_PUPR_REMOVE_PRIVATE_UDDI=Remove the existing Unit Test UDDI Registry
-
-#
-# Common wizard strings.
-#
-LABEL_PRIVATE_UDDI_REGISTRY_TYPES=Private UDDI Registry type:
-BUTTON_DEPLOY_UDDI_REGISTRY=Deploy the Unit Test UDDI Registry
-BUTTON_UPDATE_UDDI_REGISTRY=Update the previously deployed UDDI registry
-BUTTON_REMOVE_UDDI_REGISTRY=Remove the previously deployed UDDI registry
-
-#
-# Wizard page task labels and descriptions
-# (used only for progress indication).
-#
-
-#
-# Dialog messages
-#
-
-#
-# Progress messages
-#
-
-#
-# Warning messages
-#
-
-#
-# Error messages
-#
-MSG_ERROR_NO_UDDI_REGISTRY_AVAILABLE=IWAB0363E No UDDI registry available.
diff --git a/bundles/org.eclipse.jst.ws.ui/.classpath b/bundles/org.eclipse.jst.ws.ui/.classpath
deleted file mode 100644
index cb01053..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws.ui/.cvsignore b/bundles/org.eclipse.jst.ws.ui/.cvsignore
deleted file mode 100644
index 7bfad37..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ws-ui.jar
diff --git a/bundles/org.eclipse.jst.ws.ui/.project b/bundles/org.eclipse.jst.ws.ui/.project
deleted file mode 100644
index 17ef9ac..0000000
--- a/bundles/org.eclipse.jst.ws.ui/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.ui</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.jst.ws</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 8252a00..0000000
--- a/bundles/org.eclipse.jst.ws.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws.ui; singleton:=true
-Bundle-Version: 0.7.0
-Bundle-ClassPath: ws-ui.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.internal.ui.action,
- org.eclipse.jst.ws.internal.ui.common,
- org.eclipse.jst.ws.internal.ui.dialog,
- org.eclipse.jst.ws.internal.ui.plugin,
- org.eclipse.jst.ws.internal.ui.preferences,
- org.eclipse.jst.ws.internal.ui.uddi,
- org.eclipse.jst.ws.ui
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jst.ws,
- org.eclipse.jdt.core,
- org.eclipse.jdt.ui,
- org.eclipse.ui.ide,
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.emf.ecore,
- org.eclipse.jem.util,
- org.eclipse.wst.server.core,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.ws.explorer,
- org.eclipse.jst.j2ee.core
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws.ui/about.html b/bundles/org.eclipse.jst.ws.ui/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws.ui/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws.ui/build.properties b/bundles/org.eclipse.jst.ws.ui/build.properties
deleted file mode 100644
index 775fd49..0000000
--- a/bundles/org.eclipse.jst.ws.ui/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.ws-ui.jar = src/
-bin.includes = ws-ui.jar,\
- icons/,\
- plugin.properties,\
- plugin.xml,\
- META-INF/,\
- about.html
diff --git a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif b/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
deleted file mode 100644
index 152f4f2..0000000
--- a/bundles/org.eclipse.jst.ws.ui/icons/jar_obj.gif
+++ /dev/null
Binary files differ
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/plugin.properties
deleted file mode 100644
index bf5d6cf..0000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.properties
+++ /dev/null
@@ -1,48 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_PROVIDER=Eclipse.org
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-
-#
-# WS-I Preference pages
-#
-# WS-I Compliance Page
-#
-PREFERENCE_CATEGORY_WSI=WS-I Compliance
-
-#
-# Popup action Category
-#
-LABEL_POPUP_CATEGORY_WEB_SERVICES=Web Services
-
-#
-# Messages for popup action (Test with Web Services Explorer)
-#
-POPUP_TEST_WSDL=Test with Web Services Explorer
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws.ui/plugin.xml b/bundles/org.eclipse.jst.ws.ui/plugin.xml
deleted file mode 100644
index 375662a..0000000
--- a/bundles/org.eclipse.jst.ws.ui/plugin.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<plugin>
-
- <extension
- point="org.eclipse.ui.newWizards">
- <category
- name="%PLUGIN_NEW_CATEGORY_NAME_WS"
- id="org.eclipse.jst.ws.ui.new">
- </category>
- </extension>
-
- <extension
- point="org.eclipse.ui.preferencePages">
-
- <page
- name="%PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT"
- category="org.eclipse.wst.ws.internal.ui.preferences.name"
- class="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage"
- id="org.eclipse.jst.ws.internal.ui.preferences.ResourceManagmentPreferencePage">
- </page>
-
- </extension>
-
- <extension
- point="org.eclipse.ui.propertyPages">
-
-
-
- </extension>
-
- <extension
- point="org.eclipse.ui.popupMenus">
-
- <objectContribution
- objectClass="org.eclipse.core.resources.IResource"
- adaptable="true"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
- <menu
- label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
- path="additions"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.popupMenu">
- <separator
- name="popupActions">
- </separator>
- </menu>
- </objectContribution>
-
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.ejb.EnterpriseBean"
- adaptable="true"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <menu
- label="%LABEL_POPUP_CATEGORY_WEB_SERVICES"
- path="additions"
- id="org.eclipse.jst.ws.atk.ui.webservice.category.ejb.popupMenu">
- <separator
- name="popupActions">
- </separator>
- </menu>
- </objectContribution>
-
-
- <objectContribution
- objectClass="org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"
- nameFilter="*"
- id="org.eclipse.jst.ws.internal.consumption.ui.action.WSDLFileMenu">
- <action
- label="%POPUP_TEST_WSDL"
- class="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL"
- menubarPath="additions"
- id="org.eclipse.wst.ws.internal.explorer.popup.PopupTestWSDL">
- </action>
- </objectContribution>
- </extension>
-
-</plugin>
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
deleted file mode 100644
index 9597ab9..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/LaunchImportWizardAction.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.ui.IActionDelegate;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.ui.widgets.DynamicWizard;
-
-
-/**
- * This class launches the import wizard.
- */
-public class LaunchImportWizardAction implements IActionDelegate
-{
- private IStructuredSelection selection_;
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#run(org.eclipse.jface.action.IAction)
- */
- public void run(IAction action)
- {
- DynamicWizard wizard = new DynamicWizard();
-
- try
- {
- wizard.setInitialData( "wsimport" );
- wizard.init( PlatformUI.getWorkbench(), selection_ );
- }
- catch( CoreException exc )
- {
- // Do nothing.
- return;
- }
-
- WizardDialog dialog= new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), wizard);
- dialog.setPageSize( 500, 400 );
- dialog.create();
- dialog.open();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.IActionDelegate#selectionChanged(org.eclipse.jface.action.IAction, org.eclipse.jface.viewers.ISelection)
- */
- public void selectionChanged(IAction action, ISelection selection)
- {
- if( selection instanceof IStructuredSelection )
- {
- selection_ = (IStructuredSelection)selection;
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b7..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-import org.eclipse.core.resources.IResource;
-
-
-public interface WebServiceDeploy {
- public void run(IResource selection);
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
deleted file mode 100644
index 87b1095..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeployAction.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.IModule;
-
-public class WebServiceDeployAction extends WindowActionDelegate {
-public void run(org.eclipse.jface.action.IAction action) {
-
- IProject project = getSelectedResourceProject();
-
- String [] typeIds = ServerUtils.getServerTypeIdsByModule(project);
- Object theAction = null;
-
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.ui", "webservicedeploy");
- try {
-
- if (typeIds == null || typeIds.length <= 0)
- {
- // that means the module is not attached to a server then pick the first extension found
- theAction = elements[0].createExecutableExtension("class");
- }
- else if ( typeIds.length == 1)
- {
- // that means the module is attached to one server then finds it id and a matchin extension or give a message
- for (int i = 0; i < elements.length; i++)
- {
- String id = elements[i].getAttribute("factoryId");
- if ( typeIds[0].equals(id))
- {
- theAction = elements[i].createExecutableExtension("class");
- break;
- }
- }
- if (theAction == null )
- {
- // give a message
- }
- }
- else
- {
- // The module is attached to more than one server find the first server-extension couple
- // TBD: add a dialog to choose the server for deployment
- for (int i = 0; i < elements.length; i++)
- {
- String id = elements[i].getAttribute("factoryId");
- for ( int k=0; k< typeIds.length; k++)
- {
- if ( typeIds[k].equals(id))
- {
- theAction = elements[i].createExecutableExtension("class");
- break;
- }
- }
- if (theAction != null) break;
- }
- if (theAction == null)
- {
- // give a Message
- }
- }
-
- if (theAction instanceof WebServiceDeploy)
- ((WebServiceDeploy)theAction).run(project);
- }
-
- catch (Exception e) {}
-}
-
-
- private IModule getModule(IProject project) {
-
- IModule[] modules = ServerUtil.getModules(project);
- if (modules!=null && modules.length!=0) {
- return modules[0];
- }
- return null;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
deleted file mode 100644
index 837e284..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WindowActionDelegate.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.action;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-public abstract class WindowActionDelegate implements IWorkbenchWindowActionDelegate {
-protected IStructuredSelection fSelection;
-
-public WindowActionDelegate() {
- super();
- }
-
-public void dispose()
- {
- }
-
-public void init(org.eclipse.ui.IWorkbenchWindow window) { }
-
-public void selectionChanged(org.eclipse.jface.action.IAction action,
- org.eclipse.jface.viewers.ISelection selection) {
- if (selection instanceof IStructuredSelection)
- fSelection = (IStructuredSelection) selection;
- }
-
-public void setSelection(IStructuredSelection selection) {
- fSelection = selection;
-}
-public IStructuredSelection getSelection() {
- return fSelection;
-}
-
-public IProject getSelectedResourceProject() {
- IProject project = null;
- IResource resource_ = null;
- try {
- if (fSelection != null && fSelection.size() == 1) {
- Object obj = fSelection.getFirstElement();
-
- if (obj != null) {
- if ( obj instanceof IResource)
- {
- resource_ = (IResource) obj;
- }
- else if (obj instanceof ICompilationUnit)
- {
- ICompilationUnit compUnit = (ICompilationUnit)obj;
- resource_= compUnit.getCorrespondingResource();
- }
- else if (obj instanceof IJavaProject) {
- project = ((IJavaProject) obj).getProject();
- }
-
- else if (obj instanceof EObject) {
- project = ProjectUtilities.getProject((EObject) obj);
- }
-
- if ( resource_ != null )
- project = resource_.getProject();
-
- }
- }
- }
- catch (Exception e) {}
- return project;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
deleted file mode 100644
index e4ffb0e..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/DialogResourceBrowser.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.j2ee.internal.project.J2EENature;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-/**
-* This class provides a dialog for browsing workspace resources.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class DialogResourceBrowser extends Dialog
-{
- private final String INFOPOP_RESOURCE_TREE = WebServiceUIPlugin.ID + ".DRES0001";
-
- private Shell shell_;
- private IResource root_;
- private IFilter[] filters_;
- private boolean multipleSelectionEnabled_;
- private IResource[] selection_;
- private Tree resourceTree_;
- private TreeViewer fileViewer_;
-
- public DialogResourceBrowser(Shell shell, IResource root, IFilter filter)
- {
- this(shell, root, new IFilter[]{filter});
- }
-
- /**
- * Constructs a new <code>DialogResourceBrowser</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code>
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param filters An array of java.lang.String
- */
- public DialogResourceBrowser(Shell shell, IResource root, IFilter[] filters)
- {
- super(shell);
- shell_ = shell;
-
- IResource moduleRoot = root;
- if (root instanceof IProject)
- {
- IProject p = (IProject)moduleRoot;
- J2EENature nature = (J2EENature) J2EENature.getRegisteredRuntime(p);
- if (nature != null)
- {
- moduleRoot = nature.getModuleServerRoot();
- }
-
- }
-
- root_ = (moduleRoot == null) ? ResourcesPlugin.getWorkspace().getRoot() : moduleRoot;
- filters_ = (filters == null) ? new IFilter[0] : filters;
- multipleSelectionEnabled_ = false;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
-
- /**
- * Enables or disables multiple selection in the tree view.
- * Multiple selection is disabled by default.
- * @param multipleSelectionEnabled True to enabled or false to disable.
- */
- public void setMultipleSelectionEnabled(boolean multipleSelectionEnabled)
- {
- multipleSelectionEnabled_ = multipleSelectionEnabled;
- }
-
- /**
- * Returns the selections made in the dialog if OK was pressed,
- * or null if Cancel was pressed. Returns null if the dialog
- * has never been opened.
- * @return An array of selected resources, possibly empty, possibly null.
- */
- public IResource[] getSelection()
- {
- return selection_;
- }
-
- public IResource getFirstSelection()
- {
- if (selection_ != null && selection_.length > 0)
- return selection_[0];
- else
- return null;
- }
-
- /**
- * Called when the Cancel button is pressed.
- * Insures that {@link #getResult} will return null.
- */
- protected void cancelPressed()
- {
- selection_ = null;
- setReturnCode(Dialog.CANCEL);
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- * Squirrels away the list of zero or more selected
- * <code>IResource</code>s to be returned by {@link #getResult}.
- */
- protected void okPressed()
- {
- ISelection selection = fileViewer_.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- selection_ = new IResource[structuredSelection.size()];
- int i = 0;
- Iterator it = structuredSelection.iterator();
- while (it.hasNext())
- {
- Object object = it.next();
- if (object instanceof IResource)
- selection_[i++] = (IResource)object;
- }
- }
- setReturnCode(Dialog.OK);
- super.okPressed();
- }
-
- /**
- * See {@link org.eclipse.jface.window.Window#configureShell}.
- * @param shell The shell.
- */
- protected void configureShell(Shell shell)
- {
- super.configureShell(shell);
- shell.setText(getMessage("%DIALOG_TITLE_RESOURCE_BROWSER"));
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea(Composite parent)
- {
- Composite composite = (Composite)super.createDialogArea(parent);
- GridData gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.heightHint = 300;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- if (multipleSelectionEnabled_)
- {
- resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- else
- {
- resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- resourceTree_.setLayoutData(gd);
- resourceTree_.setToolTipText(getMessage("%TOOLTIP_RESOURCE_TREE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_, INFOPOP_RESOURCE_TREE);
-
- fileViewer_ = new TreeViewer(resourceTree_);
- fileViewer_.setContentProvider(new WorkbenchContentProvider());
- fileViewer_.setLabelProvider(new DecoratingLabelProvider(new WorkbenchLabelProvider(), WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
- fileViewer_.addFilter(
- new ViewerFilter()
- {
- public boolean select(Viewer viewer, Object parentObject, Object object)
- {
- if ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
- return true;
- else
- {
- for (int i = 0; i < filters_.length; i++)
- {
- if (filters_[i].accepts(object))
- return true;
- }
- return false;
- }
- }
- }
- );
- fileViewer_.setInput(root_);
- return composite;
- }
-
- private String getMessage(String msgId)
- {
- return WebServiceUIPlugin.getMessage(msgId);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
deleted file mode 100644
index ed355c4..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/FileExtensionFilter.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-import org.eclipse.core.resources.IFile;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public class FileExtensionFilter implements IFilter
-{
- private String[] extensions_;
-
- public FileExtensionFilter(String[] extensions)
- {
- extensions_ = (extensions != null) ? extensions : new String[0];
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName()
- {
- return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription()
- {
- return "org.eclipse.jst.ws.atk.ui.editor.common.FileExtensionFilter";
- }
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts(Object object)
- {
- if (object instanceof IFile)
- {
- IFile file = (IFile)object;
- for (int i = 0; i < extensions_.length; i++)
- {
- if (file.getFileExtension() != null && file.getFileExtension().equals(extensions_[i]))
- return true;
- }
- }
- return false;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
deleted file mode 100644
index 2e5db8b..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/IFilter.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.common;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface IFilter
-{
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName();
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription();
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts(Object object);
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
deleted file mode 100644
index 5115a85..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/common/UIUtils.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.common;
-
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-public class UIUtils
-{
- String infoPopid_;
- MessageUtils msgUtils_;
-
- public UIUtils( MessageUtils msgUtils, String infoPopid )
- {
- msgUtils_ = msgUtils;
- infoPopid_ = infoPopid;
- }
-
- public Button createRadioButton( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.RADIO, parent, labelName, tooltip, infopop );
- }
-
- public Button createCheckbox( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.CHECK, parent, labelName, tooltip, infopop );
- }
-
- public Button createPushButton( Composite parent, String labelName, String tooltip, String infopop )
- {
- return createButton( SWT.NONE, parent, labelName, tooltip, infopop );
- }
-
- public Button createButton( int kind, Composite parent, String labelName, String tooltip, String infopop )
- {
- Button button = new Button( parent, kind );
-
- tooltip = tooltip == null ? labelName : tooltip;
- button.setText( msgUtils_.getMessage( labelName ) );
- button.setToolTipText( msgUtils_.getMessage( tooltip ) );
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( button, infoPopid_ + "." + infopop );
-
- return button;
- }
-
- public Combo createCombo( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( msgUtils_.getMessage( labelName ) );
- label.setToolTipText( msgUtils_.getMessage( tooltip ) );
- }
-
- Combo combo = new Combo( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- combo.setLayoutData( griddata );
- combo.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( combo, infoPopid_ + "." + infopop );
-
- return combo;
- }
-
- public Text createText( Composite parent, String labelName, String tooltip, String infopop, int style )
- {
- tooltip = tooltip == null ? labelName : tooltip;
-
- if( labelName != null )
- {
- Label label = new Label( parent, SWT.WRAP);
- label.setText( msgUtils_.getMessage( labelName ) );
- label.setToolTipText( msgUtils_.getMessage( tooltip ) );
- }
-
- Text text = new Text( parent, style );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
-
- text.setLayoutData( griddata );
- text.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( text, infoPopid_ + "." + infopop );
-
- return text;
- }
-
- public Composite createComposite( Composite parent, int columns )
- {
- return createComposite( parent, columns, -1, -1 );
- }
-
- public Composite createComposite( Composite parent, int columns, int marginHeight, int marginWidth )
- {
- Composite composite = new Composite( parent, SWT.NONE );
-
- GridLayout gridlayout = new GridLayout();
- gridlayout.numColumns = columns;
-
- if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
- if( marginWidth >= 0 ) gridlayout.marginWidth = marginWidth;
-
- composite.setLayout( gridlayout );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- composite.setLayoutData( griddata );
-
- return composite;
-
- }
- public Group createGroup( Composite parent, String groupName, String tooltip, String infopop )
- {
- return createGroup( parent, groupName, tooltip, infopop, 1, -1, -1 );
- }
-
- public Group createGroup( Composite parent, String groupName, String tooltip, String infopop, int columns, int marginHeight, int marginWidth )
- {
- Group newGroup = new Group( parent, SWT.NONE );
- GridData griddata = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- GridLayout gridlayout = new GridLayout();
-
- gridlayout.numColumns = columns;
-
- if( marginHeight >= 0 ) gridlayout.marginHeight = marginHeight;
- if( marginWidth >= 0 ) gridlayout.marginWidth = marginWidth;
-
- tooltip = tooltip == null ? groupName : tooltip;
- newGroup.setLayout( gridlayout );
- newGroup.setText( msgUtils_.getMessage( groupName ) );
- newGroup.setLayoutData( griddata );
- newGroup.setToolTipText( msgUtils_.getMessage( tooltip ));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp(newGroup, infoPopid_ + "." + infopop);
-
- return newGroup;
- }
-
- public Tree createTree( Composite parent, String tooltip, String infopop, int style )
- {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Tree tree = new Tree( parent, style );
-
- tree.setLayoutData( createFillAll() );
- tree.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( tree, infoPopid_ + "." + infopop );
-
- return tree;
-
- }
-
- public Table createTable( Composite parent, String tooltip, String infopop, int style )
- {
-
- tooltip = tooltip == null ? "" : tooltip;
-
- Table table = new Table( parent, style );
-
- //table.setLayoutData( createFillAll() );
- table.setToolTipText( msgUtils_.getMessage(tooltip));
-
- if( infopop != null ) PlatformUI.getWorkbench().getHelpSystem().setHelp( table, infoPopid_ + "." + infopop );
-
- return table;
-
- }
-
- public Label createHorizontalSeparator( Composite parent, int spacing )
- {
- Composite composite = createComposite( parent, 1, spacing, -1 );
-
- Label separator = new Label( composite, SWT.SEPARATOR | SWT.HORIZONTAL );
-
- GridData griddata = new GridData( GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL );
- separator.setLayoutData( griddata );
-
- return separator;
- }
-
- public GridData createFillAll()
- {
- GridData data = new GridData( GridData.HORIZONTAL_ALIGN_FILL |
- GridData.GRAB_HORIZONTAL |
- GridData.VERTICAL_ALIGN_FILL |
- GridData.GRAB_VERTICAL );
- return data;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
deleted file mode 100644
index 84eaf01..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/DialogUtils.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.dialog;
-
-import java.util.Vector;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.search.IJavaSearchScope;
-import org.eclipse.jdt.core.search.SearchEngine;
-import org.eclipse.jdt.ui.IJavaElementSearchConstants;
-import org.eclipse.jdt.ui.JavaUI;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.wizard.IWizardContainer;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.dialogs.ContainerSelectionDialog;
-import org.eclipse.ui.dialogs.SelectionDialog;
-
-
-/**
-* Contains utility methods for launching various common dialogs.
-*/
-public final class DialogUtils
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- * Raises a dialog for browsing containers.
- * @param parentShell The parent shell, optionally null.
- * @param initialPathname The initial selection.
- * @return The selected container or null if the dialog
- * is cancelled, or there is no selection, or the selection
- * is not a project or a folder.
- */
- public static String browseContainers ( Shell parentShell, String initialPathname )
- {
- String selectedPathname = null;
- IPath initialPath = new Path(initialPathname);
- IResource initialResource = ResourceUtils.getWorkspaceRoot().findMember(initialPath);
- if (initialResource == null)
- {
- if (initialPath.segmentCount() == 1)
- {
- initialResource = ResourceUtils.getWorkspaceRoot().getProject(initialPath.segment(0));
- }
- else if (initialPath.segmentCount() > 1)
- {
- initialResource = ResourceUtils.getWorkspaceRoot().getFolder(initialPath);
- }
- }
- else
- {
- if (initialResource.getType() == IResource.FILE)
- {
- initialResource = initialResource.getParent();
- }
- }
- ContainerSelectionDialog dialog = new ContainerSelectionDialog(parentShell,(IContainer)initialResource,true,null);
- dialog.open();
- Object[] result = dialog.getResult();
- if (result != null && result.length > 0)
- {
- if (result[0] instanceof IPath)
- {
- IPath path = (IPath)result[0];
- selectedPathname = path.toString();
- }
- }
- return selectedPathname;
- }
-
- /**
- * Raises a dialog for browsing resources.
- * @param parentShell The parent shell, optionally null.
- * @param topResource The resource under which to browse.
- * If null, all resources in the workspace are browsed.
- * @param initialSelection The initial selection, or null for none.
- * If the initial selection is not null and exists in the set of
- * resources found by the browser, that resource is selected by default.
- * @param filter The resource filter object.
- * @return The selected resource.
- */
- public static IResource browseResources ( Shell parentShell, IResource topResource, IResource initialSelection, Filter filter)
- {
- ResourceSelectionDialog rds = new ResourceSelectionDialog(parentShell,topResource,initialSelection,filter);
- rds.setMultipleSelectionEnabled(false);
- if (rds.open() == Dialog.OK)
- {
- IResource[] resources = rds.getResult();
- if (resources != null && resources.length > 0)
- {
- return resources[0];
- }
- }
- return null;
- }
-
- /**
- * <b>Implementation remains TBD.</b><br>
- * Raises a dialog for browsing classes on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @return The qualified name of the selected java class.
- */
- public static String browseClasses ( Shell parentShell, IProject project )
- {
- return browseClasses(parentShell, project, (IRunnableContext)null);
- }
-
- public static String browseClasses ( Shell parentShell, IProject project, IWizardContainer container)
- {
- return browseClasses(parentShell, project, (IRunnableContext)container);
- }
-
- /**
- * Raises a dialog for browsing classes on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @param container The container of the launching wizard.
- * @return The qualified name of the selected java class.
- */
- public static String browseClasses ( Shell parentShell,
- IProject project,
- IRunnableContext ctxt)
- {
- return browseClasses(parentShell, new IResource[] {project}, ctxt);
- }
-
- public static String browseClasses(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
- {
- IType itype = browseClassesAsIType(parentShell, resources, ctxt);
- if (itype != null)
- return itype.getFullyQualifiedName();
- else
- return null;
- }
-
- public static IType browseClassesAsIType(Shell parentShell, IResource[] resources, IRunnableContext ctxt)
- {
- Vector javaElements = new Vector();
- for (int i = 0; i < resources.length; i++)
- {
- IJavaElement javaElement = JavaCore.create(resources[i]);
- if (javaElement != null)
- javaElements.add(javaElement);
- }
- IJavaElement[] elements = (IJavaElement[])javaElements.toArray(new IJavaElement[0]);
-
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
- scope.setIncludesClasspaths(true);
- scope.setIncludesBinaries(true);
-
- //Creating and opening a TypeSelectionDialog
- try
- {
- SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, ctxt, scope, IJavaElementSearchConstants.CONSIDER_CLASSES, false);
- dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));
- dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_CLASS_BROWSE"));
- dialog.open();
-
- //Getting the result and returning it
- Object[] results = dialog.getResult();
- if (results != null && results.length > 0)
- {
- if (results[0] instanceof IType)
- {
- return (IType)results[0];
- }
- }
- }
- catch (JavaModelException jme)
- {
- }
- return null;
- }
-
- /**
- * Raises a dialog for browsing interfaces on a project's class path.
- * @param parentShell The parent shell, optionally null.
- * @param project The project.
- * @param container The container of the launching wizard.
- * @return The qualified name of the selected java interface.
- */
- public static String browseInterfaces( Shell parentShell,
- IProject project,
- IWizardContainer container)
-
- {
- String interfaceName = null;
-
- //Limiting search scope to the project
- IResource[] resources = new IResource[1];
- resources[0]=project;
- IJavaElement[] elements = new IJavaElement[1];
- elements[0] = JavaCore.create(resources[0]);
- IJavaSearchScope scope = SearchEngine.createJavaSearchScope(elements);
- scope.setIncludesClasspaths(true);
- scope.setIncludesBinaries(true);
-
- //Creating and opening a TypeSelectionDialog
- try
- {
- SelectionDialog dialog = JavaUI.createTypeDialog(parentShell, container, scope, IJavaElementSearchConstants.CONSIDER_TYPES, false);
- dialog.setTitle(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));
- dialog.setMessage(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_INTERFACE_BROWSE"));
- dialog.open();
-
- //Getting the result and returning it
- Object[] results = dialog.getResult();
- if (results != null && results.length > 0)
- {
- if (results[0] instanceof IType)
- {
- IType resultInterface = (IType)results[0];
- interfaceName = resultInterface.getFullyQualifiedName();
- }
- }
- }
- catch (JavaModelException jme)
- {
- }
-
- return interfaceName;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
deleted file mode 100644
index a7478be..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/dialog/ResourceSelectionDialog.java
+++ /dev/null
@@ -1,325 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.dialog;
-
-import java.util.Iterator;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jface.dialogs.Dialog;
-import org.eclipse.jface.viewers.DecoratingLabelProvider;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jface.viewers.ViewerFilter;
-import org.eclipse.jst.ws.internal.common.AnyFilter;
-import org.eclipse.jst.ws.internal.common.Filter;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Tree;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.model.WorkbenchContentProvider;
-import org.eclipse.ui.model.WorkbenchLabelProvider;
-
-
-/**
-* This class provides a dialog for browsing workspace resources.
-* See also {@link DialogUtils#browseResources}.
-*/
-public class ResourceSelectionDialog extends Dialog implements Listener
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- //
- // Dialog controls.
- //
- private Label filterLabel_;
- private Combo filterCombo_;
- /*CONTEXT_ID DRES0001 for the Resource Type combo box of the Resource Selection Dialog*/
- private static final String INFOPOP_DRES_COMBO_RESOURCE_TYPE = WebServiceUIPlugin.ID + ".DRES0001";
- private static final String TOOLTIP_DRES_COMBO_RESOURCE_TYPE = "%TOOLTIP_DRES_COMBO_RESOURCE_TYPE";
- //
- private Tree resourceTree_;
- private TreeViewer fileViewer_;
- /*CONTEXT_ID DRES0002 for the Resource tree of the Resource Selection Dialog*/
- private static final String INFOPOP_DRES_TREE_RESOURCE = WebServiceUIPlugin.ID + ".DRES0002";
- private static final String TOOLTIP_DRES_TREE_RESOURCE = "%TOOLTIP_DRES_TREE_RESOURCE";
-
- //
- // Essential goodies.
- //
- private Shell shell_;
- private IResource root_;
- private IResource initialSelection_;
- private Filter[] filters_;
- private Filter currentFilter_;
- private IResource[] selection_;
- private boolean multipleSelectionEnabled_;
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code>.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection )
- {
- this(parent,root,initialSelection,new Filter[] {new AnyFilter()});
- }
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code> that
- * are accepted by the given filter.
- * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell},
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- * @param filter The {@link org.eclipse.jst.ws.internal.common.Filter},
- * or null to default to all resources under the <code>root</code>.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter filter )
- {
- this(parent,root,initialSelection,new Filter[] {filter});
- }
-
- /**
- * Constructs a new <code>ResourceSelectionDialog</code>
- * under the given <code>parent Shell</code>.
- * The dialog renders all resources including and
- * under the given <code>root IResource</code> that
- * are accepted by the given filters.
- * See {@link org.eclipse.jst.ws.internal.common.Filter#accepts}.
- * @param parent The parent {@link org.eclipse.swt.widgets.Shell}.
- * or null to create a top-level shell.
- * @param root The root {@link org.eclipse.core.resources.IResource},
- * or null to begin with the workspace root.
- * @param initialSelection The initially selected object or null if none.
- * @param filters An array of {@link org.eclipse.jst.ws.internal.common.Filter}
- * objects.
- * If the array is null or of length zero, then all resources are accepted
- * (ie. equivalent to <code>ResourceSelectionDialog(parent,root)</code>.
- * If the array is of length one, then the dialog will consist of a single
- * control showing a list of all filtered resources.
- * If the array is of length greater than one, then the dialog will
- * consist of a combo box containing the names of the filters and with the
- * first filter (ie. <code>filters[0]</code>) selected by default, followed
- * by a control showing a list of all resources filtered by the selected filter.
- */
- public ResourceSelectionDialog ( Shell parent, IResource root, IResource initialSelection, Filter[] filters )
- {
- super(parent);
- shell_ = parent;
- root_ = root == null ? ResourceUtils.getWorkspaceRoot() : root;
- initialSelection_ = initialSelection;
- filters_ = (filters == null || filters.length == 0) ? new Filter[] {new AnyFilter()} : filters;
- currentFilter_ = filters_[0];
- multipleSelectionEnabled_ = false;
- setShellStyle(SWT.DIALOG_TRIM | SWT.RESIZE | SWT.APPLICATION_MODAL);
- }
-
- /**
- * Enables or disables multiple selection in the tree view.
- * Multiple selection is disabled by default.
- * @param multipleSelectionEnabled True to enabled or false to disable.
- */
- public void setMultipleSelectionEnabled ( boolean multipleSelectionEnabled )
- {
- multipleSelectionEnabled_ = multipleSelectionEnabled;
- }
-
- /**
- * Returns the selections made in the dialog if OK was pressed,
- * or null if Cancel was pressed. Returns null if the dialog
- * has never been opened.
- * @return An array of selected resources, possibly empty, possibly null.
- */
- public IResource[] getResult ()
- {
- return selection_;
- }
-
- /**
- * Called when the Cancel button is pressed.
- * Insures that {@link #getResult} will return null.
- */
- protected void cancelPressed ()
- {
- selection_ = null;
- setReturnCode(Dialog.CANCEL);
- super.cancelPressed();
- }
-
- /**
- * Called when the OK button is pressed.
- * Squirrels away the list of zero or more selected
- * <code>IResource</code>s to be returned by {@link #getResult}.
- */
- protected void okPressed ()
- {
- ISelection selection = fileViewer_.getSelection();
- if (selection instanceof IStructuredSelection)
- {
- IStructuredSelection structuredSelection = (IStructuredSelection)selection;
- selection_ = new IResource[structuredSelection.size()];
- int i=0;
- Iterator iter = structuredSelection.iterator();
- while (iter.hasNext())
- {
- Object object = iter.next();
- if (object instanceof IResource)
- {
- selection_[i++] = (IResource)object;
- }
- }
- }
- setReturnCode(Dialog.OK);
- super.okPressed();
- }
-
- /**
- * See {@link org.eclipse.jface.window.Window#configureShell}.
- * @param shell The shell.
- */
- protected void configureShell ( Shell shell )
- {
- super.configureShell(shell);
- shell.setText(WebServiceUIPlugin.getMessage("%DIALOG_TITLE_RESOURCE_BROWSE"));
- }
-
- /**
- * Creates the dialog area.
- * @param parent The parent composite.
- * @return The control area.
- */
- protected Control createDialogArea ( Composite parent )
- {
- GridLayout gl;
- GridData gd;
-
- Composite composite = (Composite)super.createDialogArea(parent);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.widthHint = 400;
- gd.heightHint = 300;
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- composite.setLayoutData(gd);
-
- if (filters_.length > 1)
- {
- Composite f = new Composite(composite,SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- f.setLayout(gl);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- f.setLayoutData(gd);
-
- filterLabel_ = new Label(f,SWT.WRAP);
- filterLabel_.setText(WebServiceUIPlugin.getMessage("%LABEL_RESOURCE_FILTER"));
- filterLabel_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
-
- filterCombo_ = new Combo(f,SWT.DROP_DOWN | SWT.READ_ONLY);
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
- filterCombo_.setLayoutData(gd);
- filterCombo_.addListener(SWT.Selection,this);
- filterCombo_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_COMBO_RESOURCE_TYPE));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(filterCombo_,INFOPOP_DRES_COMBO_RESOURCE_TYPE);
- }
-
- if (multipleSelectionEnabled_)
- {
- resourceTree_ = new Tree(composite,SWT.MULTI | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- else
- {
- resourceTree_ = new Tree(composite,SWT.SINGLE | SWT.BORDER | SWT.V_SCROLL | SWT.H_SCROLL);
- }
- gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL | GridData.VERTICAL_ALIGN_FILL | GridData.GRAB_VERTICAL);
- gd.grabExcessVerticalSpace = true;
- gd.grabExcessHorizontalSpace = true;
- resourceTree_.setLayoutData(gd);
-// resourceTree_.addListener(SWT.Selection,this);
- resourceTree_.setToolTipText(WebServiceUIPlugin.getMessage(TOOLTIP_DRES_TREE_RESOURCE));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(resourceTree_,INFOPOP_DRES_TREE_RESOURCE);
-
- fileViewer_ = new TreeViewer(resourceTree_);
- fileViewer_.setContentProvider(new WorkbenchContentProvider());
- fileViewer_.setLabelProvider(
- new DecoratingLabelProvider(
- new WorkbenchLabelProvider(),
- WebServiceUIPlugin.getInstance().getWorkbench().getDecoratorManager().getLabelDecorator()));
- fileViewer_.addFilter(
- new ViewerFilter ()
- {
- public boolean select ( Viewer viewer, Object parentObject, Object object )
- {
- return
- (
- ((object instanceof IResource) && ((IResource)object).getType() != IResource.FILE)
- || (ResourceSelectionDialog.this.currentFilter_.accepts(object))
- );
- }
- }
- );
- fileViewer_.setInput(root_);
- fileViewer_.addSelectionChangedListener(
- new ISelectionChangedListener ()
- {
- public void selectionChanged ( SelectionChangedEvent event )
- {
-// ResourceSelectionDialog.this.validatePageToStatus();
- }
- }
- );
- if (initialSelection_ != null)
- {
- fileViewer_.setSelection(new StructuredSelection(ResourceSelectionDialog.this.initialSelection_),true);
- }
-
- return composite;
- }
-
- /**
- * Called when an event occurs on the page.
- * Handles the event and revalidates the page.
- * @param event The event that occured.
- */
- public void handleEvent ( Event event )
- {
-// validatePageToStatus();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
deleted file mode 100644
index 7462e17..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/plugin/WebServiceUIPlugin.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.plugin;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.MessageFormat;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jst.ws.internal.ui.preferences.PersistentActionDialogsContext;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the graphic user interface to the
-* Web Services runtime found in org.eclipse.jst.ws.
-*/
-public class WebServiceUIPlugin extends AbstractUIPlugin
-{
- // Copyright
- public static final String copyright =
- "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws.ui";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServiceUIPlugin instance_;
-
- private PersistentActionDialogsContext actionDialogsContext_;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServiceUIPlugin() {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin. Equivalent to calling
- * (WebServiceUIPlugin)Platform.getPlugin("org.eclipse.jst.ws.ui");
- * @return The WebServiceUIPlugin singleton.
- */
- static public WebServiceUIPlugin getInstance() {
- return instance_;
- }
-
-
- public PersistentActionDialogsContext getActionDialogsContext()
- {
- if (actionDialogsContext_ == null)
- {
- actionDialogsContext_ = new PersistentActionDialogsContext();
- actionDialogsContext_.load();
- }
- return actionDialogsContext_;
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @return The locale-specific message.
- */
- public static String getMessage(String key)
- {
- MessageUtils msgUtils = new MessageUtils( "org.eclipse.jst.ws.ui.plugin", instance_ );
-
- if( key.startsWith("%"))
- {
- key = key.substring( 1, key.length() );
- }
-
- return msgUtils.getMessage(key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * the plugin.properties file for the appropriate locale.
- * Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See java.text.MessageFormat for
- * further details on substitution.
- * @param key The message key string prefixed by a "%" symbol.
- * That is, the string passed in must be of the form "%KEY"
- * where the plugin.properties file contains a line of the
- * form: "KEY = value".
- * @param args The substitution values for the message
- * as required by the message in plugin.properties and
- * by the rules of class java.text.MessageFormat.
- * @return The locale-specific message.
- */
- public static String getMessage(String key, Object[] args) {
- return MessageFormat.format(getMessage(key), args);
- }
-
- /**
- * Returns an image descriptor for the named resource
- * as relative to the plugin install location.
- * @return An image descriptor, possibly null.
- */
- public static ImageDescriptor getImageDescriptor(String name) {
- try {
- URL installURL = instance_.getBundle().getEntry("/");
- URL imageURL = new URL(installURL, name);
- return ImageDescriptor.createFromURL(imageURL);
- } catch (MalformedURLException e) {
- return null;
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
deleted file mode 100644
index 7e2ba9c..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-public class ActionDialogPreferenceType {
-
- private String id_;
- public void setId (String id) {
- id_ = id;
- }
- public String getId() {
- return id_;
- }
-
- private String name_;
- public void setName(String name) {
- name_ = name;
- }
- public String getName() {
- return name_;
- }
-
- private String infopop_;
- public void setInfopop (String infopop) {
- infopop_ = infopop;
- }
- public String getInfopop () {
- return infopop_;
- }
-
- private String tooltip_;
- public void setTooltip (String tooltip) {
- tooltip_= tooltip;
- }
- public String getTooltip () {
- return tooltip_;
- }
-
- }
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
deleted file mode 100644
index e6a3a3f..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogPreferenceTypeRegistry.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ActionDialogPreferenceTypeRegistry
-{
- private static ActionDialogPreferenceTypeRegistry instance_;
-
- private Hashtable typesByName_;
-
- //
- // Loads WebServiceType objects into this registry.
- // This is done by querying the plugin registry for all extensions
- // hanging on the webServiceType extension point. Extensions
- // must implement the org.eclipse.jst.ws.ui.wizard.WebServiceType
- // interface.
- //
- private void loadDialogsPreferences ()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.ui",
- "actionDialogPreferenceType");
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- try
- {
- Object actionDialogPreferenceType = elem.createExecutableExtension("class");
- if (actionDialogPreferenceType instanceof ActionDialogPreferenceType)
- {
- ActionDialogPreferenceType dialog = (ActionDialogPreferenceType) actionDialogPreferenceType;
- dialog.setId((String)elem.getAttribute("id"));
- dialog.setName((String)elem.getAttribute("name"));
- dialog.setInfopop((String)elem.getAttribute("infopop"));
- dialog.setTooltip((String)elem.getAttribute("tooltip"));
- add(dialog);
- }
- } catch (CoreException e)
- {
- }
- }
- }
-
- //
- // Loads actionDialogPreferenceType objects into this registry.
- // See method getInstance().
- //
- private void load ()
- {
- typesByName_ = new Hashtable();
- loadDialogsPreferences();
- }
-
- //
- // Add the given WebServiceType to this registry.
- // See method load().
- //
- private void add ( ActionDialogPreferenceType dialog )
- {
- typesByName_.put(dialog.getId(),dialog);
- }
-
- /**
- * Returns a singleton instance of this class.
- * @return A singleton WebServiceTypeRegistry object.
- */
- public static ActionDialogPreferenceTypeRegistry getInstance ()
- {
- if (instance_ == null)
- {
- instance_ = new ActionDialogPreferenceTypeRegistry();
- instance_.load();
- }
- return instance_;
- }
-
- /**
- * Returns all registered <code>WebServiceType</code> objects.
- * @return All registered <code>WebServiceType</code> objects.
- */
- public ActionDialogPreferenceType[] getActionDialogsPrefrences ()
- {
- ActionDialogPreferenceType[] dialogs = new ActionDialogPreferenceType[typesByName_.size()];
- Enumeration e = typesByName_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- dialogs[i] = (ActionDialogPreferenceType)e.nextElement();
- }
- return dialogs;
- }
-
- public ActionDialogPreferenceType getActionDialogPrefrenceTypeByName (String name)
- {
- return (name == null ? null : (ActionDialogPreferenceType)typesByName_.get(name));
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
deleted file mode 100644
index fa7bc4a..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ActionDialogsPreferencePage.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Enumeration;
-import java.util.Hashtable;
-
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-
-;
-
-public class ActionDialogsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, Listener
-{
- /*CONTEXT_ID PPAD0001 for the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_PAGE = WebServiceUIPlugin.ID + ".PPAD0001";
- //
- private Button showAll;
- /*CONTEXT_ID PPAD0002 for the show all check box on the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_BUTTON_SHOW_ALL = WebServiceUIPlugin.ID + ".PPAD0002";
- //
- private Button hideAll;
- /*CONTEXT_ID PPAD0003 for the hide all check box on the Action Dialogs Preference Page*/
- private String INFOPOP_PPAD_BUTTON_HIDE_ALL = WebServiceUIPlugin.ID + ".PPAD0003";
-
- private Hashtable checkBoxes_;
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- checkBoxes_ = new Hashtable();
- addOptionalDialogsCheckBoxes (superparent);
- new Label(superparent, SWT.HORIZONTAL);
-
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 2;
- parent.setLayout( layout );
- parent.setToolTipText(getMessage("%TOOLTIP_PPAD_PAGE"));
- helpSystem.setHelp(parent,INFOPOP_PPAD_PAGE);
-
- showAll = new Button(parent, SWT.NONE);
- showAll.setText(getMessage("%BUTTON_SHOW_ALL_DIALOGS"));
- showAll.addListener(SWT.Selection, this);
- showAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_SHOW_ALL"));
- helpSystem.setHelp(showAll,INFOPOP_PPAD_BUTTON_SHOW_ALL);
-
- hideAll = new Button(parent, SWT.NONE);
- hideAll.setText(getMessage("%BUTTON_HIDE_ALL_DIALOGS"));
- hideAll.addListener ( SWT.Selection, this);
- hideAll.setToolTipText(getMessage("%TOOLTIP_PPAD_BUTTON_HIDE_ALL"));
- helpSystem.setHelp(hideAll,INFOPOP_PPAD_BUTTON_HIDE_ALL);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- public void handleEvent (Event event)
- {
- if (showAll == event.widget)
- handleShowAllEvent();
-
- else if ( hideAll == event.widget)
- handleHideAllEvent();
- }
-
- private void handleShowAllEvent ()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection( true );
- }
- }
-
- private void handleHideAllEvent ()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection( false );
- }
- }
-
- private void addOptionalDialogsCheckBoxes ( Composite parent)
- {
- PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
- ActionDialogPreferenceType[] dialogs = context.getDialogs();
- for (int i = 0; i < dialogs.length; i++) {
- Button checkBox = createCheckBox(parent , dialogs[i].getName());
- checkBox.setToolTipText(getMessage(dialogs[i].getTooltip()));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(checkBox,dialogs[i].getInfopop());
- checkBoxes_.put(dialogs[i].getId(), checkBox);
- }
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * The proxy information is stored in the preference store.
- */
- public IPreferenceStore getPreferenceStore()
- {
- return WebServiceUIPlugin.getInstance().getPreferenceStore();
- }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- Enumeration e = checkBoxes_.elements();
- for (int i=0; e.hasMoreElements(); i++)
- {
- Button dialog = (Button) e.nextElement();
- dialog.setSelection(true);
- }
- }
-
- /**
- * Initializes states of the controls from the preferences.
- */
- private void initializeValues()
- {
- PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- Button button = (Button) checkBoxes_.get(id);
- button.setSelection(context.isActionDialogEnabled(id));
- }
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- PersistentActionDialogsContext context = WebServiceUIPlugin.getInstance().getActionDialogsContext();
-
- Enumeration e = checkBoxes_.keys();
- for (int i=0; e.hasMoreElements(); i++)
- {
- String id = (String) e.nextElement();
- context.setActionDialogEnabled(id, ((Button)checkBoxes_.get(id)).getSelection());
- }
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
deleted file mode 100644
index cabefe4..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/PersistentActionDialogsContext.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentActionDialogsContext extends PersistentContext
-{
- private ActionDialogPreferenceType [] dialogs_;
-
-public PersistentActionDialogsContext ()
-{
- super( WebServiceUIPlugin.getInstance());
-}
-public void load()
-{
- ActionDialogPreferenceTypeRegistry reg = ActionDialogPreferenceTypeRegistry.getInstance();
- dialogs_ = reg.getActionDialogsPrefrences();
- for (int i = 0; i < dialogs_.length; i++) {
- setDefault(dialogs_[i].getId(), true);
- }
-}
-
-public ActionDialogPreferenceType[] getDialogs()
-{
- return dialogs_;
-}
-
-public void setActionDialogEnabled ( String id, boolean value)
-{
- setValue (id, value);
-}
-
-public boolean isActionDialogEnabled( String id)
-{
- if (id == null )
- return true;
- return getValueAsBoolean(id);
-}
-
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
deleted file mode 100644
index d9b6486..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ProjectTopologyPreferencePage.java
+++ /dev/null
@@ -1,313 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyDefaults;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-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.Control;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ProjectTopologyPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
- /*CONTEXT_ID PPSD0001 for the Project Topology Preference Page*/
- private String INFOPOP_PTPP_PAGE = WebServiceUIPlugin.ID + ".PPTP0001";
-
- private TableViewer clientTypeViewer_;
- private Button moveUp_;
- private Button moveDown_;
- private Vector clientTypes_;
- /* CONTEXT_ID PTPP0002 for the client type table viewer on the Project Topology Preference Page */
- private final String INFOPOP_PTPP_CLIENT_TYPE = WebServiceUIPlugin.ID + ".PTPP0002";
- /* CONTEXT_ID PTPP0003 for the move up button on the Project Topology Preference Page */
- private final String INFOPOP_PTPP_MOVE_UP = WebServiceUIPlugin.ID + ".PTPP0003";
- /* CONTEXT_ID PTPP0004 for the move down button on the Project Topology Preference Page */
- private final String INFOPOP_PTPP_MOVE_DOWN = WebServiceUIPlugin.ID + ".PTPP0004";
-
- private Button twoEAR_;
- /* CONTEXT_ID PTPP0005 for the enable 2 EARs checkbox on the Project Topology Preference Page */
- private final String INFOPOP_PTPP_TWO_EAR_CHECKBOX = WebServiceUIPlugin.ID + ".PTPP0005";
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(getMessage("%TOOLTIP_PTPP_PAGE"));
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PTPP_PAGE);
-
- Text clientTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
- clientTypeLabel.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
-
- Composite clientTypeComposite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- clientTypeComposite.setLayout(gl);
-
- Table table= new Table(clientTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.widthHint = 256;
- table.setLayoutData(gd);
- table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
- clientTypes_ = new Vector();
- clientTypeViewer_ = new TableViewer(table);
- clientTypeViewer_.setContentProvider(new ClientTypeContentProvider());
- clientTypeViewer_.setLabelProvider(new ClientTypeLabelProvider());
- clientTypeViewer_.setInput(clientTypes_);
-
- TableLayout tableLayout = new TableLayout();
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE"));
- ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
- tableLayout.addColumnData(columnData);
- table.setLayout(tableLayout);
-
- Composite c = new Composite(clientTypeComposite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- c.setLayout(gl);
-
- moveUp_ = new Button(c, SWT.PUSH);
- moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
- moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveUp_.addSelectionListener(this);
- moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
- moveDown_ = new Button(c, SWT.PUSH);
- moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
- moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveDown_.addSelectionListener(this);
- moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
- twoEAR_ = new Button(parent, SWT.CHECK);
- twoEAR_.setText(getMessage("%LABEL_ENABLE_TWO_EARS"));
- twoEAR_.setToolTipText(getMessage("%TOOLTIP_ENABLE_TWO_EARS"));
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls to their burned-in defaults.
- */
- private void initializeDefaults()
- {
- clientTypes_.clear();
- String[] types = ProjectTopologyDefaults.getClientTypes();
- for (int i = 0; i < types.length; i++)
- clientTypes_.add(types[i]);
- clientTypeViewer_.refresh();
- twoEAR_.setSelection(true);
- }
-
- /**
- * Initializes states of the controls from the preference helper.
- */
- private void initializeValues()
- {
- ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
- String[] types = context.getClientTypes();
- for (int i = 0; i < types.length; i++)
- clientTypes_.add(types[i]);
- // check whether we missed any types from the default list
- boolean missed = false;
- types = ProjectTopologyDefaults.getClientTypes();
- for (int i = 0; i < types.length; i++)
- {
- if (clientTypes_.indexOf(types[i]) == -1)
- {
- clientTypes_.add(types[i]);
- missed = true;
- }
- }
- if (missed)
- {
- types = new String[clientTypes_.size()];
- clientTypes_.copyInto(types);
- context.setClientTypes(types);
- }
- // refresh viewer
- clientTypeViewer_.refresh();
- twoEAR_.setSelection(context.isUseTwoEARs());
- }
-
- /**
- * Stores the values of the controls back to the preference helper.
- */
- private void storeValues()
- {
- ProjectTopologyContext context = WebServicePlugin.getInstance().getProjectTopologyContext();
- String[] types = new String[clientTypes_.size()];
- clientTypes_.copyInto(types);
- context.setClientTypes(types);
- context.setUseTwoEARs(twoEAR_.getSelection());
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- int index = clientTypeViewer_.getTable().getSelectionIndex();
- if (index != -1)
- {
- if (e.widget == moveUp_ && index > 0)
- {
- Object object = clientTypes_.remove(index);
- clientTypes_.insertElementAt(object, index-1);
- clientTypeViewer_.refresh();
- }
- else if (e.widget == moveDown_ && index < clientTypes_.size()-1)
- {
- Object object = clientTypes_.remove(index);
- clientTypes_.insertElementAt(object, index+1);
- clientTypeViewer_.refresh();
- }
- }
- }
-
- private class ClientTypeContentProvider implements IStructuredContentProvider
- {
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object value)
- {
- return ((Vector)value).toArray(new String[0]);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose()
- {
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer arg0, Object arg1, Object arg2)
- {
- }
- }
-
- private class ClientTypeLabelProvider extends LabelProvider
- {
- private IConfigurationElement[] configElements_;
-
- public ClientTypeLabelProvider()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- configElements_ = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
- }
-
- private IConfigurationElement getElementByAttribute(String name, String value)
- {
- for (int i = 0; i < configElements_.length; i++)
- if (configElements_[i].getAttribute(name).equals(value))
- return configElements_[i];
- return null;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
- */
- public Image getImage(Object arg0)
- {
- return null;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
- */
- public String getText(Object value)
- {
- return getElementByAttribute("id", value.toString()).getAttribute("label");
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
deleted file mode 100644
index deb26ba..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ResourceManagmentPreferencePage.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceDefaults;
-
-
-
-public class ResourceManagmentPreferencePage extends PreferencePage implements IWorkbenchPreferencePage
-{
- /*CONTEXT_ID PPRM0001 for the Resource Managment Preference Page*/
- private String INFOPOP_PPRM_PAGE = WebServiceUIPlugin.ID + ".PPRM0001";
- //
- private Button overWriteFiles;
- /*CONTEXT_ID PPRM0002 for the file overwrite check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES = WebServiceUIPlugin.ID + ".PPRM0002";
- //
- private Button createFolders;
- /*CONTEXT_ID PPRM0003 for the create folders check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS = WebServiceUIPlugin.ID + ".PPRM0003";
- //
- private Button checkoutFiles;
- /*CONTEXT_ID PPRM0004 for the checkout files check box on the Resource Management Preference Page*/
- private String INFOPOP_PPRM_CHECKBOX_CHECK_OUT = WebServiceUIPlugin.ID + ".PPRM0004";
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
- IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(getMessage("%TOOLTIP_PPRM_PAGE"));
- helpSystem.setHelp(parent, INFOPOP_PPRM_PAGE);
-
- overWriteFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_OVERWRITE_FILES" ));
- overWriteFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES"));
- helpSystem.setHelp(overWriteFiles, INFOPOP_PPRM_CHECKBOX_OVERWRITE_FILES);
-
- createFolders = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CREATE_FOLDERS" ));
- createFolders.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS"));
- helpSystem.setHelp(createFolders, INFOPOP_PPRM_CHECKBOX_CREATE_FOLDERS);
-
- checkoutFiles = createCheckBox(parent, WebServiceUIPlugin.getMessage("%BUTTON_CHECKOUT_FILES" ));
- checkoutFiles.setToolTipText(getMessage("%TOOLTIP_PPRM_CHECKBOX_CHECK_OUT"));
- helpSystem.setHelp(checkoutFiles, INFOPOP_PPRM_CHECKBOX_CHECK_OUT);
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- storeValues();
- return true;
- }
-
- protected void performApply()
- {
- performOk();
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls using default values
- * in the preference store.
- */
- private void initializeDefaults()
- {
- overWriteFiles.setSelection( ResourceDefaults.getOverwriteFilesDefault());
- createFolders.setSelection( ResourceDefaults.getCreateFoldersDefault());
- checkoutFiles.setSelection( ResourceDefaults.getCheckoutFilesDefault());
- }
-
- /**
- * Initializes states of the controls from the preference store.
- */
- private void initializeValues()
- {
- // get the persistent context from the plugin
- ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
- overWriteFiles.setSelection( context.isOverwriteFilesEnabled());
- createFolders.setSelection( context.isCreateFoldersEnabled());
- checkoutFiles.setSelection( context.isCheckoutFilesEnabled());
- }
-
- /**
- * Stores the values of the controls back to the preference store.
- */
- private void storeValues()
- {
- // get the persistent context from the plugin
- ResourceContext context = WebServicePlugin.getInstance().getResourceContext();
- context.setOverwriteFilesEnabled( overWriteFiles.getSelection() );
- context.setCreateFoldersEnabled( createFolders.getSelection() );
- context.setCheckoutFilesEnabled( checkoutFiles.getSelection() );
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
deleted file mode 100644
index e6d9d30..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/preferences/ScenarioDefaultsPreferencePage.java
+++ /dev/null
@@ -1,332 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.preferences;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jface.preference.PreferencePage;
-import org.eclipse.jface.viewers.ColumnWeightData;
-import org.eclipse.jface.viewers.IStructuredContentProvider;
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.jface.viewers.TableLayout;
-import org.eclipse.jface.viewers.TableViewer;
-import org.eclipse.jface.viewers.Viewer;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.ScenarioDefaults;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.internal.ui.plugin.WebServiceUIPlugin;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Table;
-import org.eclipse.swt.widgets.TableColumn;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPreferencePage;
-import org.eclipse.ui.PlatformUI;
-
-
-
-public class ScenarioDefaultsPreferencePage extends PreferencePage implements IWorkbenchPreferencePage, SelectionListener
-{
-
- private TableViewer webServiceTestTypeViewer_;
- private Button moveUp_;
- private Button moveDown_;
- private Vector webServiceTestTypes_;
-
- /*CONTEXT_ID PPSD0001 for the Scenario Defaults Preference Page*/
- private String INFOPOP_PPSD_PAGE = WebServiceUIPlugin.ID + ".PPSD0001";
- //
- private Button launchSample;
- /*CONTEXT_ID PPSD0002 for the launch sample check box on the Scenario Defaults Preference Page*/
- private final String INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE = WebServiceUIPlugin.ID + ".PPSD0002";
- //
- private Label sampleGenerationLabel_;
- private Combo sampleGenerationTypes_;
- /*CONTEXT_ID PPSD0004 for the sample JSP type combo box on the Scenario Defaults Preference Page*/
- private final String INFOPOP_PPSD_COMBO_SAMPLE_GEN = WebServiceUIPlugin.ID + ".PPSD0004";
-
- private Label wsexplorerTypesLabel_;
- private Combo wsexplorerTypes_;
- /*CONTEXT_ID PPSD0003 for the web explorer type combo box on the Scenario Defaults Preference Page*/
- private final String INFOPOP_PPSD_COMBO_EXPLORER = WebServiceUIPlugin.ID + ".PPSD0003";
-
- /**
- * Creates preference page controls on demand.
- * @param parent the parent for the preference page
- */
- protected Control createContents(Composite superparent)
- {
-
- Composite parent = new Composite( superparent, SWT.NONE );
- GridLayout layout = new GridLayout();
- layout.numColumns = 1;
- parent.setLayout( layout );
- parent.setToolTipText(getMessage("%TOOLTIP_PPSD_PAGE"));
- parent.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
- PlatformUI.getWorkbench().getHelpSystem().setHelp(parent,INFOPOP_PPSD_PAGE);
-
- launchSample = createCheckBox(parent, getMessage("%BUTTON_LAUNCH_SAMPLE"));
- launchSample.setToolTipText(getMessage("%TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE"));
- PlatformUI.getWorkbench().getHelpSystem().setHelp(launchSample, INFOPOP_PPSD_CHECKBOX_LAUNCH_SAMPLE);
-
-
- Text testServiceTypeLabel = new Text(parent, SWT.READ_ONLY | SWT.WRAP);
- testServiceTypeLabel.setText(getMessage("%LABEL_SAMPLE_TYPES"));
-
- Composite webServiceTestTypeComposite = new Composite(parent, SWT.NONE);
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- webServiceTestTypeComposite.setLayout(gl);
-
- Table table= new Table(webServiceTestTypeComposite, SWT.BORDER | SWT.SINGLE | SWT.FULL_SELECTION | SWT.H_SCROLL | SWT.V_SCROLL);
- GridData gd = new GridData(GridData.FILL_HORIZONTAL | GridData.FILL_VERTICAL);
- gd.widthHint = 256;
- table.setLayoutData(gd);
- table.setToolTipText(getMessage("%TOOLTIP_CLIENT_TYPE_TABLE_VIEWER"));
-
- webServiceTestTypes_ = new Vector();
- webServiceTestTypeViewer_ = new TableViewer(table);
- webServiceTestTypeViewer_.setContentProvider(new WebServiceTestTypeContentProvider());
- webServiceTestTypeViewer_.setLabelProvider(new WebServiceTestTypeLabelProvider());
- webServiceTestTypeViewer_.setInput(webServiceTestTypes_);
-
- TableLayout tableLayout = new TableLayout();
- TableColumn tableColumn = new TableColumn(table, SWT.NONE);
- tableColumn.setText(getMessage("%LABEL_CLIENT_TYPE_NAME"));
- ColumnWeightData columnData = new ColumnWeightData(256, 256, false);
- tableLayout.addColumnData(columnData);
- table.setLayout(tableLayout);
-
- Composite c = new Composite(webServiceTestTypeComposite, SWT.NONE);
- gl = new GridLayout();
- gl.numColumns = 1;
- gl.marginHeight = 0;
- gl.marginWidth = 0;
- c.setLayout(gl);
-
- moveUp_ = new Button(c, SWT.PUSH);
- moveUp_.setText(getMessage("%LABEL_MOVE_UP"));
- moveUp_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveUp_.addSelectionListener(this);
- moveUp_.setToolTipText(getMessage("%TOOLTIP_MOVE_UP"));
-
- moveDown_ = new Button(c, SWT.PUSH);
- moveDown_.setText(getMessage("%LABEL_MOVE_DOWN"));
- moveDown_.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_FILL));
- moveDown_.addSelectionListener(this);
- moveDown_.setToolTipText(getMessage("%TOOLTIP_MOVE_DOWN"));
-
- initializeValues();
- org.eclipse.jface.dialogs.Dialog.applyDialogFont(superparent);
-
- return parent;
- }
-
- private String getMessage(String key)
- {
- return WebServiceUIPlugin.getMessage(key);
- }
-
- private Button createCheckBox( Composite parent, String text )
- {
- Button button = new Button( parent, SWT.CHECK );
- button.setText( text );
- return button;
- }
-
- /**
- * Does anything necessary because the default button has been pressed.
- */
- protected void performDefaults()
- {
- super.performDefaults();
- initializeDefaults();
- }
-
- /**
- * Do anything necessary because the OK button has been pressed.
- * @return whether it is okay to close the preference page
- */
- public boolean performOk()
- {
- try{
- storeValues();
- }catch (Exception exc){
- exc.printStackTrace();}
- return true;
- }
-
- protected void performApply()
- {
- try{
- performOk();
- }catch(NullPointerException exc){
- exc.printStackTrace();
- }
- }
-
- /**
- * @see IWorkbenchPreferencePage
- */
- public void init(IWorkbench workbench) { }
-
- /**
- * Initializes states of the controls to their burned-in defaults.
- */
- private void initializeDefaults()
- {
- ScenarioDefaults defaults = new ScenarioDefaults();
- //pgm launchSample.setSelection( defaults.getLaunchSampleDefault());
-
- webServiceTestTypes_.clear();
- String[] types = defaults.getWebServiceTestTypes();
- for (int i = 0; i < types.length; i++)
- webServiceTestTypes_.add(types[i]);
- webServiceTestTypeViewer_.refresh();
- }
-
- /**
- * Initializes states of the controls from the preference helper.
- */
- private void initializeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
- ScenarioDefaults defaults = new ScenarioDefaults();
- //pgm launchSample.setSelection( context.isLaunchSampleEnabled());
-
- String[] types = context.getWebServiceTestTypes();
- for (int i = 0; i < types.length; i++)
- webServiceTestTypes_.add(types[i]);
- // check whether we missed any types from the default list
- boolean missed = false;
- types = defaults.getWebServiceTestTypes();
- for (int i = 0; i < types.length; i++)
- {
- if (webServiceTestTypes_.indexOf(types[i]) == -1)
- {
- webServiceTestTypes_.add(types[i]);
- missed = true;
- }
- }
- if (missed)
- {
- types = new String[webServiceTestTypes_.size()];
- webServiceTestTypes_.copyInto(types);
- context.setWebServiceTestTypes(types);
- }
- // refresh viewer
- webServiceTestTypeViewer_.refresh();
- }
-
- /**
- * Stores the values of the controls back to the preference helper.
- */
- private void storeValues()
- {
- ScenarioContext context = WebServicePlugin.getInstance().getScenarioContext();
- String[] types = new String[webServiceTestTypes_.size()];
- webServiceTestTypes_.copyInto(types);
- context.setWebServiceTestTypes(types);
-
- //pgm context.setLaunchSampleEnabled(launchSample.getSelection());
- }
-
- public void widgetDefaultSelected(SelectionEvent e)
- {
- }
-
- public void widgetSelected(SelectionEvent e)
- {
- int index = webServiceTestTypeViewer_.getTable().getSelectionIndex();
- if (index != -1)
- {
- if (e.widget == moveUp_ && index > 0)
- {
- Object object = webServiceTestTypes_.remove(index);
- webServiceTestTypes_.insertElementAt(object, index-1);
- webServiceTestTypeViewer_.refresh();
- }
- else if (e.widget == moveDown_ && index < webServiceTestTypes_.size()-1)
- {
- Object object = webServiceTestTypes_.remove(index);
- webServiceTestTypes_.insertElementAt(object, index+1);
- webServiceTestTypeViewer_.refresh();
- }
- }
- }
-
- private class WebServiceTestTypeContentProvider implements IStructuredContentProvider
- {
- /**
- * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(Object)
- */
- public Object[] getElements(Object value)
- {
- return ((Vector)value).toArray(new String[0]);
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
- public void dispose()
- {
- }
-
- /**
- * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(Viewer, Object, Object)
- */
- public void inputChanged(Viewer arg0, Object arg1, Object arg2)
- {
- }
- }
-
- private class WebServiceTestTypeLabelProvider extends LabelProvider
- {
- private IConfigurationElement[] configElements_;
-
- public WebServiceTestTypeLabelProvider()
- {
- WebServiceTestRegistry wstr = WebServiceTestRegistry.getInstance();
- configElements_ = wstr.getConfigElements();
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getImage(Object)
- */
- public Image getImage(Object arg0)
- {
- return null;
- }
-
- /**
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(Object)
- */
- public String getText(Object value)
- {
- //return getElementByAttribute("id", value.toString()).getAttribute("label");
- return value.toString();
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
deleted file mode 100644
index e37abc3..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/uddi/PrivateUDDIRegistryType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.ui.uddi;
-
-import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding;
-
-public interface PrivateUDDIRegistryType
-{
- public boolean isPrivateUDDIRegistryInstalled();
- public String[] getPrivateUDDIRegistryInquiryAPI();
- public String[] getPrivateUDDIRegistryPublishAPI();
- public CommandWidgetBinding getBinding();
-}
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
deleted file mode 100644
index 76e4e9a..0000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/ui/plugin.properties
+++ /dev/null
@@ -1,143 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services Graphical User Interface
-PLUGIN_VENDOR=International Business Machines Corp.
-PLUGIN_DESC=\
-The Web services GUI plugin delivers the graphical \
-user interface to the Web services function of the \
-Web services plugin.
-
-PLUGIN_NEW_CATEGORY_NAME_WS=Web Services
-
-#
-# Web Services Preferance Pages
-#
-# Categories
-PREFERENCE_CATEGORY_RESOURCE_MANAGEMENT=Resource Management
-PREFERENCE_CATEGORY_CODE_GENERATION=Code Generation
-PREFERENCE_CATEGORY_SCENARIO_DEFAULTS=Scenario Defaults
-PREFERENCE_CATEGORY_PROJECT_TOPOLOGY=Project Topology
-PREFERENCE_CATEGORY_DRIVER_JARS=JDBC drivers
-
-
-#
-#Scenario Defaults
-BUTTON_LAUNCH_SAMPLE=Launch the sample when generated
-LABEL_UDDI_CAT_DATA_COLUMN_DELIM=User defined UDDI Category data column delimiter:
-LABEL_UDDI_CAT_DATA_STRING_DELIM=User defined UDDI Category data string delimiter:
-MSG_ERROR_COLUMN_STRING_DELIMS_IDENTICAL=IWAB0481E UDDI column and string delimiters must not be identical.
-LABEL_MOVE_UP=Move up
-LABEL_MOVE_DOWN=Move down
-
-#
-# Preferences Tooltips
-#
-
-#Scenario Defaults
-TOOLTIP_PPSD_PAGE=Set the defaults for the Web service scenarios.
-TOOLTIP_PPSD_CHECKBOX_LAUNCH_SAMPLE=Launch the sample application after generation.
-TOOLTIP_PPSD_COMBO_SAMPLE_GEN=Select the type of sample JSP to be generated.
-TOOLTIP_PPSD_COMBO_EXPLORER=Select the type of the Web services explorer to be used.
-TOOLTIP_PPSD_UDDI_CAT_DATA_COLUMN_DELIM=column delimiter for user defined UDDI category data
-TOOLTIP_PPSD_UDDI_CAT_DATA_STRING_DELIM=string delimiter for user defined UDDI category data
-TOOLTIP_CLIENT_TYPE_TABLE_VIEWER=Preferred order of the list of client types
-TOOLTIP_MOVE_UP=Move the selected client type up the list
-TOOLTIP_MOVE_DOWN=Move the selected client type down the list
-
-#
-# Resource Managment
-TOOLTIP_PPRM_PAGE=Set preferences that control resources used/generated by the Web service.
-TOOLTIP_PPRM_CHECKBOX_OVERWRITE_FILES=Overwrite files without warning.
-TOOLTIP_PPRM_CHECKBOX_CREATE_FOLDERS=Create folders when necessary.
-TOOLTIP_PPRM_CHECKBOX_CHECK_OUT=Check out files without warning.
-BUTTON_CREATE_FOLDERS=Create folders when necessary
-BUTTON_OVERWRITE_FILES=Overwrite files without warning
-BUTTON_CHECKOUT_FILES=Check out files without warning
-
-#
-# General messages.
-#
-ISTATUS_WITHOUT_EXCEPTION={0}
-ISTATUS_WITH_EXCEPTION={0}\nException: {1}
-MSG_INFO_SAVED_STATUS=IWAB0297I Press the Details button to see informational messages.
-
-#
-# TypeSelectionDialog
-#
-DIALOG_TITLE_CLASS_BROWSE=Browse Classes
-DIALOG_TITLE_INTERFACE_BROWSE=Browse Interfaces
-
-#
-# Common wizard strings.
-#
-LABEL_WSEXPLORER_TYPES=Web Services Explorer
-LABEL_SAMPLE_TYPES=Java proxy sample
-
-#
-# ResourceSelectionDialog
-#
-DIALOG_TITLE_RESOURCE_BROWSE=Browse Files
-LABEL_RESOURCE_FILTER=Filter:
-
-#
-# Tooltips for dialog.ResourceSelectionDialog
-# DRES=Dialog/RESources
-#
-TOOLTIP_DRES_COMBO_RESOURCE_TYPE=Type of resources to browse.
-TOOLTIP_DRES_TREE_RESOURCE=Resources available for selection.
-
-
-
-#
-# HTTP Basic Authentication
-#
-PREFERENCE_CATEGORY_HTTP_BASIC_AUTH=HTTP Basic Auth
-CHECKBOX_PREFERENCE_ENABLE_HTTP_BASIC_AUTH=Enable HTTP basic authentication
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_USERNAME=HTTP basic auth user name:
-LABEL_PREFERENCE_HTTP_BASIC_AUTH_PASSWORD=HTTP basic auth password:
-
-TOOLTIP_ENABLE_HTTP_BASIC_AUTH=Specify HTTP basic authentication setting for Web services toolings.
-TOOLTIP_HTTP_BASIC_AUTH_USERNAME=User name for HTTP basic authentication.
-TOOLTIP_HTTP_BASIC_AUTH_PASSWORD=Password for HTTP basic authentication.
-
-
-#
-# Messages for project topology preference page
-#
-TOOLTIP_PTPP_PAGE=Preference that control the project topology of your Web service and client scenarios.
-TOOLTIP_ENABLE_TWO_EARS=Enable this option if you want to generate your Web service and Web service client in different EAR projects.
-
-LABEL_ENABLE_TWO_EARS=Generate Web service and Web service client in different EAR projects
-LABEL_CLIENT_TYPE_NAME=Client type:
-
-
-#
-# ActionDialogs Page
-#
-PREFERENCE_CATEGORY_DIALOGS=Dialogs
-
-#
-# Resource Browser
-#
-DIALOG_TITLE_RESOURCE_BROWSER=Resource browser
-TOOLTIP_RESOURCE_TREE=Choose a resource.
-
-
-
-
-
-
-
-
diff --git a/bundles/org.eclipse.jst.ws/.classpath b/bundles/org.eclipse.jst.ws/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/bundles/org.eclipse.jst.ws/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/bundles/org.eclipse.jst.ws/.cvsignore b/bundles/org.eclipse.jst.ws/.cvsignore
deleted file mode 100644
index b4e57fb..0000000
--- a/bundles/org.eclipse.jst.ws/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-ws.jar
diff --git a/bundles/org.eclipse.jst.ws/.project b/bundles/org.eclipse.jst.ws/.project
deleted file mode 100644
index b309184..0000000
--- a/bundles/org.eclipse.jst.ws/.project
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws</name>
- <comment></comment>
- <projects>
- <project>org.eclipse.wst.command.env</project>
- <project>org.eclipse.wst.command.env.core</project>
- <project>org.eclipse.wst.wsdl</project>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.PluginNature</nature>
- </natures>
-</projectDescription>
diff --git a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF b/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
deleted file mode 100644
index 0da02f8..0000000
--- a/bundles/org.eclipse.jst.ws/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,48 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %PLUGIN_NAME
-Bundle-SymbolicName: org.eclipse.jst.ws
-Bundle-Version: 0.7.0
-Bundle-ClassPath: ws.jar
-Bundle-Activator: org.eclipse.jst.ws.internal.plugin.WebServicePlugin
-Bundle-Vendor: %PLUGIN_PROVIDER
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws,
- org.eclipse.jst.ws.internal.command,
- org.eclipse.jst.ws.internal.common,
- org.eclipse.jst.ws.internal.context,
- org.eclipse.jst.ws.internal.data,
- org.eclipse.jst.ws.internal.dialog,
- org.eclipse.jst.ws.internal.ext,
- org.eclipse.jst.ws.internal.ext.test,
- org.eclipse.jst.ws.internal.plugin
-Require-Bundle: org.eclipse.wst.command.env,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core,
- org.eclipse.jem.util,
- org.eclipse.jem.workbench,
- org.eclipse.jem,
- org.eclipse.jdt.core,
- org.eclipse.emf.common,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.jface,
- org.eclipse.emf.ecore,
- org.eclipse.debug.core,
- org.eclipse.jem.workbench,
- org.eclipse.wst.server.core,
- org.eclipse.wst.server.ui,
- org.eclipse.wst.wsdl,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.web,
- org.eclipse.wst.common.modulecore,
- org.uddi4j,
- org.eclipse.wst.common.frameworks,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
diff --git a/bundles/org.eclipse.jst.ws/about.html b/bundles/org.eclipse.jst.ws/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/bundles/org.eclipse.jst.ws/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/build.properties b/bundles/org.eclipse.jst.ws/build.properties
deleted file mode 100644
index 32c0168..0000000
--- a/bundles/org.eclipse.jst.ws/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-src.includes = component.xml
-bin.includes = plugin.properties,\
- plugin.xml,\
- ws.jar,\
- META-INF/,\
- about.html
-source.ws.jar = src/
diff --git a/bundles/org.eclipse.jst.ws/component.xml b/bundles/org.eclipse.jst.ws/component.xml
deleted file mode 100644
index a90bf17..0000000
--- a/bundles/org.eclipse.jst.ws/component.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component xmlns="http://eclipse.org/wtp/releng/tools/component-model" name="org.eclipse.jst.ws">
- <component-depends unrestricted="true">
- </component-depends>
- <plugin id="org.eclipse.jst.ws" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.consumption.core" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.consumption.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.axis.creation.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.consumption" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.consumption.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.creation.ejb.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.creation.ui" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.uddiregistry" fragment="false"/>
- <plugin id="org.eclipse.jst.ws.ui" fragment="false"/>
-</component>
diff --git a/bundles/org.eclipse.jst.ws/plugin.properties b/bundles/org.eclipse.jst.ws/plugin.properties
deleted file mode 100644
index 505a8be..0000000
--- a/bundles/org.eclipse.jst.ws/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2000, 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-PLUGIN_NAME=Web Services
-PLUGIN_PROVIDER=Eclipse.org
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
deleted file mode 100644
index fb2cbc2..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/NullStatusMonitor.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A NullStatusRenderer throws away IStatus information.
-*/
-public class NullStatusMonitor implements StatusMonitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- protected boolean result;
-
- /**
- * Default constructor.
- */
- public NullStatusMonitor () {}
- /**
- * Does nothing.
- */
- public int reportStatus(IStatus status, Vector options) { return 0; }
- public boolean reportStatus(IStatus status)
- {
- switch (status.getSeverity())
- {
- case IStatus.ERROR:
- case IStatus.WARNING:
- result = false;
- break;
- case IStatus.INFO:
- default: //IStatus.OK
- result = true;
- break;
- }
- return result;
- }
- public void dumpSavedStatus() { }
- public boolean canContinue()
- {
- return result;
- }
-
- public void reset () {
- result = true;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
deleted file mode 100644
index cfe91de..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusMonitor.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusMonitor reports IStatus information to a display system.
-*/
-public interface StatusMonitor
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * reports the contents of the given status object.
- * Subclasses must implement this method to report
- * IStatus information to a given display system,
- * such as SWT, the command line, or a trace file.
- */
- public int reportStatus(IStatus status, Vector options);
- public boolean reportStatus(IStatus status);
- public void dumpSavedStatus();
- public boolean canContinue();
- public void reset();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
deleted file mode 100644
index 0cff3a6..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/command/StatusRenderer.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.command;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* A StatusRenderer renders IStatus information to a display system.
-*/
-public interface StatusRenderer
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Renders the contents of the given status object.
- * Subclasses must implement this method to render
- * IStatus information to a given display system,
- * such as SWT, the command line, or a trace file.
- */
- public void render ( IStatus status );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
deleted file mode 100644
index ba00a10..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/AnyFilter.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-/**
-* This is a kind of {@link Filter} that accepts all objects,
-* and is a suitable base class for new <code>Filters</code>.
-*/
-public class AnyFilter implements Filter
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Constructs a new <code>AnyFilter</code>.
- */
- public AnyFilter ()
- {
- }
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ()
- {
- return WebServicePlugin.getMessage("%ANY_FILTER_NAME");
- }
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ()
- {
- return WebServicePlugin.getMessage("%ANY_FILTER_DESC");
- }
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * See {@link Filter#statusOf} for general comments.
- * The default implementation of <code>AnyFilter</code>
- * returns a status with severity <code>IStatus.OK</code>.
- * Subclasses may override.
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}.
- */
- public IStatus statusOf ( Object object )
- {
- return new Status(IStatus.OK,WebServicePlugin.ID,0,"",null);
- }
-
- /**
- * Returns true if and only if {@link #statusOf} returns
- * an {@link org.eclipse.core.runtime.IStatus} with a
- * severity of less than <code>IStatus.ERROR</code>.
- * Subclasses may override to provide a higher-performance
- * implementation.
- * @param object The object to filter.
- * @return True if and only if {@link #statusOf} returns
- * an {@link org.eclipse.core.runtime.IStatus} with a
- * severity of less than <code>IStatus.ERROR</code>.
- */
- public boolean accepts ( Object object )
- {
- return !statusOf(object).matches(IStatus.ERROR);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/EnvironmentUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/EnvironmentUtils.java
deleted file mode 100644
index 977a585..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/EnvironmentUtils.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.ProgressMonitor;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext;
-
-
-
-/**
- *
- */
-public final class EnvironmentUtils
-{
- /**
- * @param env
- * @return IProgressMonitor
- */
- public static IProgressMonitor getIProgressMonitor(Environment env)
- {
- ProgressMonitor monitor = env.getProgressMonitor();
- IProgressMonitor eclipseMonitor = null;
- if (monitor instanceof EclipseProgressMonitor)
- {
- eclipseMonitor = ((EclipseProgressMonitor)monitor).getMonitor();
- }
- return eclipseMonitor;
- }
-
-
-
- /**
- *
- * @param env This should be an EclipseEnvironment.
- * @return Returns a ResourceContext.
- */
- public static ResourceContext getResourceContext( Environment env )
- {
- ResourceContext context = null;
-
- if( env instanceof EclipseEnvironment )
- {
- context = ((EclipseEnvironment)env).getResourceContext();
- }
- else
- {
- context = new TransientResourceContext();
- }
-
- return context;
- }
-
- /**
- * @param istatus
- * @return Status
- */
-
- /**
- * TODO: Delete. There's a replacement in the env plugin.
- */
- public static Status convertIStatusToStatus(IStatus istatus)
- {
- Status status;
- String message = istatus.getMessage();
- IStatus[] children = istatus.getChildren();
- int noOfChildren = children.length;
- if (noOfChildren > 0)
- {
- Status[] statusChildren = new Status[noOfChildren];
- for (int i=0;i<noOfChildren;i++)
- {
- statusChildren[i] = convertIStatusToStatus(children[i]);
- }
-
- status = new SimpleStatus("",message,statusChildren);
- }
- else
- {
- int severity = istatus.getSeverity();
- int statusSeverity = Status.OK;
- switch (severity)
- {
- case IStatus.ERROR:
- statusSeverity = Status.ERROR;
- break;
- case IStatus.WARNING:
- statusSeverity = Status.WARNING;
- break;
- case IStatus.INFO :
- statusSeverity = Status.INFO;
- break;
- case IStatus.OK:
- statusSeverity = Status.OK;
- break;
- default:
- }
- Throwable e = istatus.getException();
- status = new SimpleStatus("",message,statusSeverity,e);
- }
-
- return status;
- }
-
- /**
- * TODO: Delete. There's a replacement in the env plugin.
- */
- public static IStatus convertStatusToIStatus(Status status, String pluginId)
- {
- IStatus istatus;
- String message = status.getMessage();
- Throwable throwable = status.getThrowable();
- if (status.hasChildren())
- {
- Status[] children = status.getChildren();
- int noOfChildren = children.length;
- IStatus[] istatusChildren = new IStatus[noOfChildren];
- for (int i=0;i<noOfChildren;i++)
- {
- istatusChildren[i] = convertStatusToIStatus(children[i], pluginId);
- }
-
- istatus = new MultiStatus(pluginId,0,istatusChildren,message,throwable);
- }
- else
- {
- int severity = status.getSeverity();
- int istatusSeverity = IStatus.OK;
- switch (severity)
- {
- case Status.ERROR:
- istatusSeverity = IStatus.ERROR;
- break;
- case Status.WARNING:
- istatusSeverity = IStatus.WARNING;
- break;
- case Status.INFO:
- istatusSeverity = IStatus.INFO;
- break;
- case Status.OK:
- istatusSeverity = IStatus.OK;
- break;
- default:
- }
- istatus = new org.eclipse.core.runtime.Status(istatusSeverity,pluginId,0,message,throwable);
- }
-
- return istatus;
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
deleted file mode 100644
index 91f0bf8..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/Filter.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
-* This is the interface for a class of objects that filter
-* other objects for inclusion or exclusion by some consumer.
-*/
-public interface Filter
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * Returns the locale-specific name of this filter.
- * @return The locale-specific name of this filter.
- */
- public String getName ();
-
- /**
- * Returns the locale-specific description of this filter.
- * @return The locale-specific description of this filter.
- */
- public String getDescription ();
-
- /**
- * Returns an {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- * The severity of the
- * returned <code>IStatus</code> is as follows:
- * <ul>
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#OK}
- * if the <code>Filter</code> accepts the <code>object</code>
- * with no further information for the caller (meaning the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods
- * are ignored).
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#INFO}
- * if the <code>Filter</code> accepts the <code>object</code>
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#WARNING}
- * if the <code>Filter</code> accepts the <code>object</code>.
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * <li>
- * {@link org.eclipse.core.runtime.IStatus#ERROR}
- * if the <code>Filter</code> does not accept the <code>object</code>.
- * Additional information may be available from the
- * {@link org.eclipse.core.runtime.IStatus#getMessage} and
- * {@link org.eclipse.core.runtime.IStatus#getException} methods.
- * </ul>
- * @param object The object to filter.
- * @return An {@link org.eclipse.core.runtime.IStatus}
- * describing the <code>Filter</code>'s assessment of
- * the given <code>object</code>.
- */
- public IStatus statusOf ( Object object );
-
- /**
- * Returns true if and only if this <code>Filter</code>
- * accepts the given <code>object</code>. This method
- * must return true if and only if {@link #statusOf}
- * returns an <code>IStatus</code> with a severity of
- * less than <code>IStatus.ERROR</code>.
- * @param object The object to filter.
- * @return True if and only if this <code>Filter</code>
- * accepts the given <code>object</code>.
- */
- public boolean accepts ( Object object );
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
deleted file mode 100644
index 2804c0d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/IProjectToStringTransformer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-
-/**
- * Transfroms a org.eclipse.core.runtime.IProject to java.lang.String
- */
-public class IProjectToStringTransformer implements Transformer {
-
- public Object transform(Object value)
- {
- IProject project = (IProject)value;
- return project.getName();
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
deleted file mode 100644
index 1998dbe..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEActionAdapterFactory.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/*
- * Created on May 8, 2004
- */
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef;
-import org.eclipse.wst.wsdl.Definition;
-import org.eclipse.wst.wsdl.internal.impl.ServiceImpl;
-import org.eclipse.wst.wsdl.util.WSDLResourceImpl;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-
-/**
- * @author gilberta
- */
-public class J2EEActionAdapterFactory {
-
-
- public static String getWSDLURI(ServiceImpl serviceImpl)
- {
- Definition definition = serviceImpl.getEnclosingDefinition();
- String location = definition.getLocation();
-
- return location;
- }
-
- //has to be under the webcontent
- public static String WEB_CONTENT = "WebContent";
- public static String getWSDLURI(ServiceRef serviceImpl)
- {
- IProject project = ProjectUtilities.getProject(serviceImpl);
- IPath path = project.getLocation().addTrailingSeparator();
- path = path.append(WEB_CONTENT).addTrailingSeparator();
- path = path.append(serviceImpl.getWsdlFile());
- File file = new File(path.toString());
- try{
- URL url = file.toURL();
- return url.toString();
- }catch(MalformedURLException e){return null;}
-
- }
-
- public static String getWSDLURI(WSDLResourceImpl wsdlRI)
- {
- Definition definition = wsdlRI.getDefinition();
- String location = definition.getLocation();
-
- return location;
- }
-
- public static String getWSILPath(WSDLResourceImpl wsdlRI)
- {
- return convertToRelative(getWSDLURI(wsdlRI));
- }
-
- public static String getWSILPath(ServiceRef serviceImpl)
- {
- return convertToRelative(getWSDLURI(serviceImpl));
- }
-
- public static String getWSILPath(ServiceImpl serviceImpl)
- {
- return convertToRelative(getWSDLURI(serviceImpl));
- }
-
- public static String FILE="file:/";
- public static String FILEL="file:";
- public static String convertToRelative(String uri)
- {
- //remove file:
- String root = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString();
- root = FILE + root;
- String rootL = FILEL + root;
- if(uri.startsWith(root) || uri.startsWith(rootL)){
- return uri.substring(root.length());
- }
- return uri;
- }
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
deleted file mode 100644
index bc572b9..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/J2EEUtils.java
+++ /dev/null
@@ -1,1969 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Vector;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.ejb.SessionType;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.earcreation.AddModuleToEARProjectCommand;
-import org.eclipse.jst.j2ee.internal.earcreation.EARNatureRuntime;
-import org.eclipse.jst.j2ee.internal.earcreation.IEARNatureConstants;
-import org.eclipse.jst.j2ee.internal.ejb.project.EJBNatureRuntime;
-import org.eclipse.jst.j2ee.internal.project.IEJBNatureConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EENature;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.operations.J2EEWebNatureRuntime;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
-import org.eclipse.wst.common.componentcore.resources.IFlexibleProject;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-/**
- * This class contains some useful J2EE utilities for Web services internal use.
- */
-public final class J2EEUtils {
-
- public final static int WEB = 1;
- public final static int EJB = 2;
- public final static int APPCLIENT = 4;
- public final static int EAR = 8;
-
- /**
- * Returns an IVirtualComponent
- * @param project
- * @param componentName
- * @return
- */
- public static IVirtualComponent getVirtualComponent(IProject project, String componentName){
- return ComponentCore.createComponent(project, componentName);
- }
-
- /**
- *
- * @param projectName
- * @param componentName
- * @return
- */
- public static IVirtualComponent getVirtualComponent(String projectName, String componentName){
- IProject project = null;
- if (projectName!=null && projectName.length() > 0 )
- project = ProjectUtilities.getProject(projectName);
-
- return ComponentCore.createComponent(project, componentName);
- }
-
- /**
- * Returns the J2EE version id (defined in J2EEVersionConstants) of the
- * project. If the project does not have a J2EENature, -1 is returned.
- *
- * @param p
- * @return the J2EE version id (defined in J2EEVersionConstants), -1 if p
- * does not have a J2EENature.
- *
- * @deprecated use getJ2EEVersion(IProject, String)
- */
- public static int getJ2EEVersion(IProject p) {
- J2EENature nature = J2EENature.getRegisteredRuntime(p);
- if (nature != null)
- {
- return nature.getJ2EEVersion();
- }
- return -1;
- }
-
- /**
- * Returns the J2EE version
- * @param p project
- * @param component name
- * @return int
- */
- public static int getJ2EEVersion(IProject p, String componentName){
- int j2eeVer = -1;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(p, componentName);
- if (vc!=null){
- j2eeVer = getJ2EEVersion(vc);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return j2eeVer;
- }
-
- public static int getJ2EEVersion(IVirtualComponent ch){
- int j2eeVer = -1;
- //check type
- if (ch!=null) {
- if (isWebComponent(ch))
- j2eeVer = getWebComponentJ2EEVersion(ch);
- else if (isAppClientComponent(ch))
- j2eeVer = getAppClientComponentJ2EEVersion(ch);
- else if (isEJBComponent(ch))
- j2eeVer = getEJBComponentJ2EEVersion(ch);
- else if (isEARComponent(ch))
- j2eeVer = getEARComponentJ2EEVersion(ch);
-
- }
- return j2eeVer;
- }
-
- /**
- * Return's the EAR module's J2EEVersion
- * @param wbc
- * @return
- */
- private static int getEARComponentJ2EEVersion(IVirtualComponent ch){
- EARArtifactEdit edit = null;
- int nVersion = 12;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(ch);
- if (edit != null) {
- nVersion = edit.getJ2EEVersion();
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return nVersion;
- }
-
-
- /**
- *
- * @param p
- * @return
- * @deprecated
- */
- public static String getJ2EEVersionAsString(IProject p){
- int j2eeVer = getJ2EEVersion(p);
- if (j2eeVer!=-1){
- return String.valueOf(j2eeVer);
- }
- else
- return null;
- }
-
- /**
- * Returns the J2EEVersion
- * @param p IProject
- * @param compName
- * @return String
- */
- public static String getJ2EEVersionAsString(IProject p, String compName){
- int j2eeVer = getJ2EEVersion(p, compName);
- if (j2eeVer!=-1){
- return J2EEVersionUtil.getJ2EETextVersion(j2eeVer);
- }
- else
- return null;
- }
-
- /**
- * Returns the Web Module's J2EE version
- * @param wbModule
- * @return the J2EE version id
- */
- private static int getWebComponentJ2EEVersion(IVirtualComponent ch) {
- WebArtifactEdit webEdit = null;
- int nVersion = 12;
- try {
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(ch);
- if (webEdit != null) {
- nVersion = webEdit.getJ2EEVersion();
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (webEdit != null)
- webEdit.dispose();
- }
- return nVersion;
- }
-
- /**
- * Returns Application client's J2EE version
- * @param wbc
- * @return
- */
- private static int getAppClientComponentJ2EEVersion(IVirtualComponent ch){
- AppClientArtifactEdit edit = null;
- int nVersion = 12;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(ch);
- if (edit != null) {
- nVersion = edit.getJ2EEVersion();
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return nVersion;
- }
-
- /**
- * Returns EJB component's J2EE version
- * @param wbc
- * @return
- */
- private static int getEJBComponentJ2EEVersion(IVirtualComponent ch){
- EJBArtifactEdit edit = null;
- int nVersion = 12;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ch);
- if (edit != null) {
- nVersion = edit.getJ2EEVersion();
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (edit != null)
- edit.dispose();
- }
- return nVersion;
- }
-
- /**
- * This method returns all of the EAR projects that reference the specified
- * project.
- *
- * @deprecated
- */
- public static EARNatureRuntime[] getEARProjects(IProject project) {
-
- EARNatureRuntime[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
- return ears;
- }
-
- public static IVirtualComponent[] getAllComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- IFlexibleProject fp = ComponentCore.createFlexibleProject(projects[i]);
- IVirtualComponent[] vcs = fp.getComponents();
- for (int j=0;j<vcs.length;j++){
- v.add(vcs[j]);
- }
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns all the EAR components in the workspace
- * @return IVirtualComponent[]; empty if none
- */
- public static IVirtualComponent[] getAllEARComponents() {
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getEARComponentsFromProject(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static IVirtualComponent[] getAllWebComponents(){
- List v = new ArrayList();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
- IVirtualComponent[] components = getWebComponents(projects[i]);
- for (int j=0; j<components.length; j++) {
- if (components[j]!=null)
- v.add(components[j]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns the EAR components in a given IProject
- * @param project
- * @return empty if no EAR components; must not return null
- */
- public static IVirtualComponent[] getEARComponentsFromProject(IProject project){
- //get all components in the project
- List v = new ArrayList();
- try {
- IFlexibleProject flex = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] components = flex.getComponents();
- for (int i=0;i<components.length;i++){
- if (isEARComponent(project, components[i].getName())){
- v.add(components[i]);
- }
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns Web components in a project
- * @param project
- * @return empty array if no web components; must not return null
- */
- public static IVirtualComponent[] getWebComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IFlexibleProject flex = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] components = flex.getComponents();
- for (int i=0;i<components.length;i++){
- if (isWebComponent(project, components[i].getName())){
- v.add(components[i]);
- }
- }
-
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static String[] getWebComponentNames(IProject project){
- IVirtualComponent[] vcs = getWebComponents(project);
- return toComponentNamesArray(vcs);
- }
-
- public static String[] getEARComponentNames(IProject project){
- IVirtualComponent[] vcs = getEARComponentsFromProject(project);
- return toComponentNamesArray(vcs);
- }
-
- /**
- * Returns all components of type, componentType in the project.
- * @param project
- * @param componentType i.e. J2EEUtils.WEB
- * @return
- */
- public static IVirtualComponent[] getComponentsByType(IProject project, int componentType){
-
- List v = new ArrayList();
- if ( (WEB & componentType)==WEB ){
- IVirtualComponent[] webVC = getWebComponents(project);
- addToArrayListHelper(webVC, v);
- }
- if ( (EJB & componentType)==EJB ){
- IVirtualComponent[] ejbVC = getEJBComponents(project);
- addToArrayListHelper(ejbVC, v);
- }
- if ( (APPCLIENT & componentType)==APPCLIENT ) {
- IVirtualComponent[] appClientVC = getAppClientComponents(project);
- addToArrayListHelper(appClientVC, v);
- }
- if ( (EAR & componentType)==EAR ) {
- IVirtualComponent[] earVC = getEARComponentsFromProject(project);
- addToArrayListHelper(earVC, v);
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Returns all components of type, componentType in the project.
- * @param project
- * @param componentTypeId as defined in IModuleConstants.
- * @return
- */
- public static IVirtualComponent[] getComponentsByType(IProject project, String componentTypeId){
-
- //get all components in the project of type componentTypeId
- List v = new ArrayList();
- try {
- IFlexibleProject flex = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] components = flex.getComponents();
- for (int i=0;i<components.length;i++){
- IVirtualComponent vc = ComponentCore.createComponent(project, components[i].getName());
- if ( vc.getComponentTypeId().equals(componentTypeId))
- {
- v.add(components[i]);
- }
- //if (isWebComponent(project, components[i].getName())){
- //v.add(components[i]);
- //}
- }
-
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- public static String[] getProjectsContainingComponentOfType(String componentTypeId)
- {
- Vector v = new Vector();
- IVirtualComponent[] comps = getAllComponents();
- for (int i = 0; i < comps.length; i++) {
- if (comps[i].getComponentTypeId().equals(componentTypeId))
- {
- //Add the project name to the vector if it has not been added already
- String name = comps[i].getProject().getName();
- if (!v.contains(name))
- {
- v.add(name);
- }
- }
-
- }
-
- return (String[])v.toArray(new String[0]);
- }
-
- /**
- * Helper method for getComponentsByType
- * @param vcs
- * @param vect
- */
- private static void addToArrayListHelper(IVirtualComponent[] vcs, List al){
- for (int i=0;i<vcs.length;i++){
- al.add(vcs[i]);
- }
- }
-
-
- /**
- * Essentially, returns all projects in the workspace
- * @return
- */
- public static IProject[] getAllFlexibleProjects(){
-
- List v = new ArrayList();
- try {
- IProject[] projects = ProjectUtilities.getAllProjects();
- for(int i=0; i<projects.length;i++) {
- if (ModuleCoreNature.getModuleCoreNature(projects[i])!=null){
- v.add(projects[i]);
- }
- }
- }
- catch(Exception e){
- }
-
- return (IProject[])v.toArray(new IProject[0]);
- }
-
-
- /**
- * True if there exists a underlying resource backing up the component and project
- * @param projectName
- * @param componentName
- * @return
- */
- public static boolean exists(String projectName, String componentName){
- IProject project = null;
- if (projectName!=null && projectName.length() > 0 ) {
- project = ProjectUtilities.getProject(projectName);
- }
- else
- return false;
-
- return exists(project, componentName);
- }
-
- /**
- * True if there exists a underlying resource backing up the component and project
- * @param project
- * @param componentName
- * @return
- */
- public static boolean exists(IProject project, String componentName){
- if (project!=null && componentName!=null && componentName.length() > 0) {
- if (!project.exists())
- return false;
-
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return vc.exists();
- }
- else
- return false;
-
- }
-
- /**
- *
- * @param project
- * @return
- *
- * @deprecated -- use getEARComponentNames(IProject)
- */
- public static String[] getEARProjectNamesForWebProject(IProject project) {
- List EARNames = new ArrayList();
- if (project != null) {
- EARNatureRuntime[] ears = getEARProjects(project);
- for (int i = 0; i < ears.length; i++) {
- EARNames.add(ears[i].getProject().getName());
- }
- }
- return EARNames.isEmpty() ? null : (String[]) EARNames
- .toArray(new String[0]);
- }
-
- /**
- * Returns an array of EAR components which are referenced by the component
- * @param project
- * @param componentName
- * @return
- */
- public static IVirtualComponent[] getReferencingEARComponents(IProject project, String componentName){
- List ears = new ArrayList();
- try{
- IVirtualComponent targetVC = ComponentCore.createComponent(project, componentName);
-
- IVirtualComponent[] earVC = getAllEARComponents();
- for (int i=0; i<earVC.length;i++) {
- IVirtualReference[] refs = earVC[i].getReferences();
- for (int k=0;k<refs.length;k++) {
- if (targetVC.equals(refs[k].getReferencedComponent())){
- ears.add(refs[k].getEnclosingComponent());
- }
- }
- }
-
- }
- catch (Exception e){
- }
-
- return (IVirtualComponent[])ears.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- * This method returns all of the EAR projects that reference the specified
- * ejb project.
- *
- * @deprecated - use getEARProjects(IProject)
- */
- public static EARNatureRuntime[] getEJBEARProjects(IProject project) {
- EARNatureRuntime[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
- return ears;
- }
-
- /**
- *
- * @param project
- * @return
- * @deprecated use getEARProjectNames (not used; to be deleted)
- */
- public static String[] getEARProjectNamesForEJBProject(IProject project) {
- List EARNames = new ArrayList();
- if (project != null) {
- EARNatureRuntime[] ears = getEJBEARProjects(project);
- for (int i = 0; i < ears.length; i++) {
- EARNames.add(ears[i].getProject().getName());
- }
- }
- return EARNames.isEmpty() ? null : (String[]) EARNames
- .toArray(new String[0]);
- }
-
- /**
- *
- * @param project
- * @return
- * @deprecated not used; to be deleted
- */
- public static EARNatureRuntime[] getAppClientEARProjects(IProject project) {
- EARNatureRuntime[] ears = J2EEProjectUtilities.getReferencingEARProjects(project);
- return ears;
- }
-
- /**
- * Returns the EAR nature runtime from an EAR project
- *
- * @param IProject
- * the EAR project
- * @return EARNatureRuntime of the project
- *
- * @deprecated not used; to be deleted
- */
- public static EARNatureRuntime getEARNatureRuntimeFromProject(
- IProject project) {
- return EARNatureRuntime.getRuntime(project);
- }
-
- /**
- * This method returns a list of EAR names that are referenced by the
- * specified web project.
- *
- * @deprecated not used; to be deleted
- */
- public static String[] getEARNames(IProject project) {
- EARNatureRuntime[] ears = getEARProjects(project);
- String[] earNames = new String[ears == null ? 0 : ears.length];
-
- for (int index = 0; index < earNames.length; index++) {
- earNames[index] = ears[index].getProject().getName();
- }
-
- return earNames;
- }
-
- /**
- * Find all EJB projects for a particular EAR Nature.
- *
- * @return a Vector of EJBNatureRuntimes.
- * @deprecated use getReferencingEJBComponents(IProject, String)
- */
- public static Vector getEJBProjects(EARNatureRuntime ear) {
- Vector ejbs = new Vector();
- Iterator earProjects = ear.getModuleProjects().values().iterator();
-
- while (earProjects.hasNext()) {
- Object object = earProjects.next();
-
- if (object != null) {
- J2EENature j2eeNature = (J2EENature) object;
-
- if (j2eeNature instanceof EJBNatureRuntime) {
- ejbs.add(j2eeNature);
- }
- }
- }
-
- return ejbs;
- }
-
- /**
- * Returns the EJB Components referenced by the ear
- * @param project
- * @param componentName
- * @return
- */
- public static IVirtualComponent[] getReferencingEJBComponentsFromEAR(IProject project, String earComponentName){
-
- List ejbComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0;i<refs.length;i++){
- if (isEJBComponent(refs[i].getReferencedComponent())){
- ejbComps.add(refs[i].getReferencedComponent());
- }
- }
- }
- catch(Exception e){
- }
-
- return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Find all Web projects for a particular EAR Nature.
- *
- * @return a vector of J2EEWebNatureRuntimes.
- *
- * @deprecated use getWebProjectsFromEAR(IProject, String)
- * !! not used; to be deleted
- */
- public static Vector getWebProjects(EARNatureRuntime ear) {
- Vector webProjects = new Vector();
- Iterator earProjects = ear.getModuleProjects().values().iterator();
-
- while (earProjects.hasNext()) {
- Object object = earProjects.next();
-
- if (object != null) {
- J2EENature j2eeNature = (J2EENature) object;
-
- if (j2eeNature instanceof J2EEWebNatureRuntime) {
- webProjects.add(j2eeNature);
- }
- }
- }
-
- return webProjects;
- }
-
-
- /**
- * @return returns a list of projects names for a given ear.
- * @deprecated use getEJBProjectFromEAR(IProject, String)
- * !! not used; to be deleted
- */
- public static String[] getEJBProjectNames(EARNatureRuntime ear) {
- Vector ejbNatures = getEJBProjects(ear);
- String[] ejbProjectNames = new String[ejbNatures.size()];
-
- for (int index = 0; index < ejbProjectNames.length; index++) {
- ejbProjectNames[index] = ((EJBNatureRuntime) (ejbNatures
- .elementAt(index))).getProject().getName();
- }
-
- return ejbProjectNames;
- }
-
-
-
- /**
- *
- * @param jar
- * @return Vector of bean String names.
- */
- public static Vector getBeanNames(EJBJar jar) {
- // We currently only support Stateless session beans.
- // List cmpBeans = jar.getBeanManagedBeans();
- // List bmpBeans = jar.getContainerManagedBeans();
- List sessionBeans = jar.getSessionBeans();
-
- Vector names = new Vector();
-
- // getBeanNames( names, cmpBeans );
- // getBeanNames( names, bmpBeans );
- getBeanNames(names, sessionBeans);
-
- return names;
- }
-
- /**
- * @param names
- * specifies that vector of strings that will be used to add bean
- * names to.
- * @param beans
- * specifies a list of beans.
- */
- private static void getBeanNames(Vector names, List beans) {
- Iterator iterator = beans.iterator();
-
- while (iterator.hasNext()) {
- EnterpriseBean bean = (EnterpriseBean) (iterator.next());
-
- if (bean.isSession()) {
- Session sessionBean = (Session) bean;
-
- if (sessionBean.getSessionType().getValue() == SessionType.STATELESS) {
- names.add(bean.getName());
- }
- }
- }
- }
-
- /**
- * Uses jem ProjectUtilities to get the project
- * @param ejb eObject
- * @return IProject
- */
- public static IProject getProjectFromEJB(EnterpriseBean ejb) {
- return ProjectUtilities.getProject(ejb);
- }
-
- /**
- * Get an array of IProject, given a Vector of J2EENature's
- *
- * @deprecated pls request a new method if necessary
- */
- public static IProject[] getIProjectsFromJ2EENatures(Vector j2eenatureVector) {
- IProject[] projects = new IProject[j2eenatureVector == null
- ? 0
- : j2eenatureVector.size()];
- Enumeration e = j2eenatureVector.elements();
- int i = 0;
- while (e.hasMoreElements()) {
- J2EENature nature = (J2EENature) e.nextElement();
- IProject project = nature.getProject();
- projects[i] = project;
- i++;
- }
-
- return projects;
- }
-
- /**
- * Get a J2EE 1.2 EAR Project. Returns null if no J2EE 1.2 EAR Projects
- * exist
- *
- * @deprecated use getDefault12EARProject()
- */
- public static EARNatureRuntime get12EAR() {
- try {
- IProject[] allEARs = getEARProjects();
- for (int i = 0; i < allEARs.length; i++) {
- // return the first 1.2 EAR encountered
- EARNatureRuntime thisEAR = (EARNatureRuntime) (allEARs[i]
- .getNature(IEARNatureConstants.NATURE_ID));
- if (thisEAR.getJ2EEVersion() == J2EEVersionConstants.J2EE_1_2_ID) {
- return thisEAR;
- }
- }
- } catch (CoreException ce) {
- // handle exception
- }
- return null;
-
- }
-
- /**
- * Returns the first j2ee 1.2 EAR project in the workspace
- * @return null if no 1.2 EAR projects
- *
- * @deprecated - if not used; to be deleted
- */
- public static IProject getDefault12EARProject(){
- try{
- IProject[] allEARs = ResourceUtils.getWorkspaceRoot().getProjects(); // getEARProjects();
- for (int i=0;i<allEARs.length;i++){
- // return the first 1.2 EAR project
- IProject ear = allEARs[i];
- if (getJ2EEVersionAsString(ear).equals(IModuleConstants.J2EE_VERSION_1_2)){
- return ear;
- }
- }
- }
- catch(Exception e){
- e.printStackTrace();
- //handle exception
- }
- return null;
- }
-
-
- /**
- * Get a J2EE 1.3 EAR Project. Returns null if no J2EE 1.3 EAR Projects
- * exist
- *
- * @deprecated use getDefault13EARComponent()
- *
- */
- public static EARNatureRuntime get13EAR() {
- try {
- IProject[] allEARs = getEARProjects();
- for (int i = 0; i < allEARs.length; i++) {
- // return the first 1.3 EAR encountered
- EARNatureRuntime thisEAR = (EARNatureRuntime) (allEARs[i]
- .getNature(IEARNatureConstants.NATURE_ID));
- if (thisEAR.getJ2EEVersion() == J2EEVersionConstants.J2EE_1_3_ID) {
- return thisEAR;
- }
- }
- } catch (CoreException ce) {
- return null;
- }
- return null;
-
- }
-
- /**
- * Returns a default J2EE 1.3 EAR component in the workspace
- * @return EAR component name
- */
- public static IVirtualComponent getDefault13EARComponent(){
- IVirtualComponent[] allEARComponents = getAllEARComponents();
- for (int j=0;j<allEARComponents.length;j++){
- int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_3_ID)
- return allEARComponents[j];
- }
- return null;
- }
-
- /**
- * Returns a default J2EE 1.4 EAR component in the workspace
- * @return EAR component name
- */
- public static IVirtualComponent getDefault14EARComponent(){
- IVirtualComponent[] allEARComponents = getAllEARComponents();
- for (int j=0;j<allEARComponents.length;j++){
- int j2eeVersion = getJ2EEVersion(allEARComponents[j]);
- if (j2eeVersion == J2EEVersionConstants.J2EE_1_4_ID)
- return allEARComponents[j];
- }
- return null;
- }
-
- /**
- *
- * @param versionId
- * @return
- *
- * @deprecated use getEARProjectOfVersion(int)
- */
- public static EARNatureRuntime getEAR(int versionId) {
- try {
- IProject[] allEARs = getEARProjects();
- for (int i = 0; i < allEARs.length; i++) {
- EARNatureRuntime thisEAR = (EARNatureRuntime) (allEARs[i]
- .getNature(IEARNatureConstants.NATURE_ID));
- if (thisEAR.getJ2EEVersion() == versionId) {
- return thisEAR;
- }
- }
- } catch (CoreException ce) {
- // handle exception
- }
- return null;
- }
-
- /**
- * Returns the first EAR component of the J2EE version
- * @param versionId
- * @return
- */
- public static IVirtualComponent getEARComponentofJ2EEVersion(int versionId){
- IVirtualComponent[] components = getAllEARComponents();
- for (int i=0; i<components.length; i++){
- if (getJ2EEVersion(components[i]) == versionId)
- return components[i];
- }
- return null;
- }
-
- /**
- * Returns the first EAR project of a given version id
- * @param versionId
- * @return
- * @deprecated // use getEARComponentofJ2EEVersion
- */
-// public static IProject getEARProjectOfVersion(int versionId){
-// try {
-// IProject[] allEARs = getEARProjects();
-// for (int i = 0; i < allEARs.length; i++) {
-// IProject ear = allEARs[i];
-// if (getJ2EEVersion(ear) == versionId) {
-// return ear;
-// }
-// }
-// } catch (Exception e) {
-// e.printStackTrace();
-// }
-// return null;
-// }
-
-
- /**
- *
- * @param j2eeVersionInt
- * @return
- */
- public static String getLabelFromJ2EEVersion(String j2eeVersionInt) {
- if (j2eeVersionInt == null || j2eeVersionInt.length() == 0)
- return "";
-
- int j2eeVersion = Integer.parseInt(j2eeVersionInt);
- switch (j2eeVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID :
- return J2EEVersionConstants.VERSION_1_2_TEXT;
- case J2EEVersionConstants.J2EE_1_3_ID :
- return J2EEVersionConstants.VERSION_1_3_TEXT;
- case J2EEVersionConstants.J2EE_1_4_ID :
- return J2EEVersionConstants.VERSION_1_4_TEXT;
- default :
- return "";
- }
- }
-
- public static String getJ2EEVersionFromLabel(String j2eeLabel) {
- String j2ee12String = String.valueOf(J2EEVersionConstants.J2EE_1_2_ID);
- String j2ee13String = String.valueOf(J2EEVersionConstants.J2EE_1_3_ID);
- String j2ee14String = String.valueOf(J2EEVersionConstants.J2EE_1_4_ID);
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return j2ee12String;
-
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return j2ee13String;
-
- if (j2eeLabel.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return j2ee14String;
-
- return "";
-
- }
-
- /**
- * Returns String representations of J2EE versions
- * @param aVersion
- * @return
- */
- public static String getJ2EEIntVersionAsString(String aVersion) {
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_4_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_3_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString();
- if (aVersion.equals(J2EEVersionConstants.VERSION_1_2_TEXT))
- return new Integer(J2EEVersionConstants.J2EE_1_2_ID).toString();
- // default
- return new Integer(J2EEVersionConstants.J2EE_1_4_ID).toString();
- }
-
- // ----------------------------------------------------------------------
-
- /**
- * Return all the ear projects in which this project is a nested module;
- *
- * @param project
- * The project
- * @return EARs EAR projects, possibly null
- *
- * @deprecated
- * This method has too much complexity; to be simplified
- */
- public static EARNatureRuntime[] getEARProjects(IProject serviceProject,
- IServer server) {
-
-
- EARNatureRuntime[] earProjects = null;
- EARNatureRuntime ear = null;
- IProject earProject = null;
-
- if (serviceProject != null && serviceProject.exists()) {
- try {
-
- EARNatureRuntime[] ears = null;
- boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
- || ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
- || ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
- if (!isWebEJBOrAppClient) {
- return null;
- }
-
- ears = J2EEProjectUtilities.getReferencingEARProjects(serviceProject);
-
- // separate EARs which are already deployed to the existing
- // server
- if (ears != null && ears.length >= 1) {
- ArrayList preferredEARList = new ArrayList();
- ArrayList secondaryEARList = new ArrayList();
- for (int i = 0; i < ears.length; i++) {
- ear = ears[i];
- earProject = ear.getProject();
- IModule module = ResourceUtils.getModule(earProject);
- if (module != null) {
- if (server != null
- || ServerUtil.containsModule(server,
- module, new NullProgressMonitor())) {
- preferredEARList.add(ear);
- } else {
- secondaryEARList.add(ear);
- }
- }
- }
- // add secondaryEARList items to end of primary list
- for (int j = 0; j < secondaryEARList.size(); j++) {
- preferredEARList.add(secondaryEARList.get(j));
- }
- // toArray
- if (preferredEARList != null) {
- earProjects = (EARNatureRuntime[]) preferredEARList
- .toArray(new EARNatureRuntime[0]);
- }
- }
- } catch (Exception ce) {
- Log log = new EclipseLog();
- log.log(Log.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
- }
- }
- return earProjects;
- }
-
- /**
- *
- * @return
- *
- * @deprecated // use getALLEARComponents
- */
- public static IProject[] getEARProjects() {
- Vector v = new Vector();
- IProject[] projects = ResourceUtils.getWorkspaceRoot().getProjects();
- for (int i = 0; i < projects.length; i++) {
- try {
-// if (projects[i].hasNature(IEARNatureConstants.NATURE_ID)) {
- if (ResourceUtils.isEARProject(projects[i])) {
- v.add(projects[i]);
- }
- } catch (Exception e) {
- e.printStackTrace();
- //handle exception
- }
-
- }
-
- return (IProject[])v.toArray(new IProject[0]);
- }
-
-
- /**
- * Returns the first EAR project associated with the project and server
- * @param serviceProject
- * @param server
- * @return
- *
- * @deprecated // to be simplified
- */
- public static IProject getDefaultEARProject(IProject serviceProject, IServer server) {
-
- IProject[] earProjects = null;
- IProject ear = null;
-
- if (serviceProject != null && serviceProject.exists()) {
- try {
-
- boolean isWebEJBOrAppClient = ResourceUtils.isWebProject(serviceProject) //serviceProject.hasNature(IWebNatureConstants.J2EE_NATURE_ID)
- || ResourceUtils.isEJBProject(serviceProject) //serviceProject.hasNature(IEJBNatureConstants.NATURE_ID)
- || ResourceUtils.isAppClientProject(serviceProject);//serviceProject.hasNature(IApplicationClientNatureConstants.NATURE_ID);
- if (!isWebEJBOrAppClient) {
- return null;
- }
-
- IProject[] ears = getEARProjects();
-
- // separate EARs which are already deployed to the existing
- // server
- if (ears != null && ears.length >= 1) {
- ArrayList preferredEARList = new ArrayList();
- ArrayList secondaryEARList = new ArrayList();
- for (int i = 0; i < ears.length; i++) {
- ear = ears[i];
- IModule module = ResourceUtils.getModule(ear);
- if (module != null) {
- if (server != null
- || ServerUtil.containsModule(server,
- module, new NullProgressMonitor())) {
- preferredEARList.add(ear);
- } else {
- secondaryEARList.add(ear);
- }
- }
- }
- // add secondaryEARList items to end of primary list
- for (int j = 0; j < secondaryEARList.size(); j++) {
- preferredEARList.add(secondaryEARList.get(j));
- }
- // toArray
- if (preferredEARList != null) {
- earProjects = (IProject[]) preferredEARList.toArray(new IProject[0]);
- }
- }
- } catch (Exception ce) {
- Log log = new EclipseLog();
- log.log(Log.ERROR, 5039, J2EEUtils.class, "getEARProjects", ce);
-
- }
- }
- return earProjects[0];
- }
-
- /**
- * Returns EJB projects in the ears
- *
- * @param earProjects
- * @return projects EJB projects
- *
- * @deprecated use getEJB20ComponentsFromEars
- */
- public static IProject[] getEJB2_0ProjectsFromEARS(EARNatureRuntime[] earProjects) {
- if (earProjects == null)
- return null;
-
- ArrayList ejbProjects = new ArrayList();
- for (int i = 0; i < earProjects.length; i++) {
- if (earProjects[i] instanceof EARNatureRuntime) {
- EARNatureRuntime ear = (EARNatureRuntime) earProjects[i];
- Map projectsInEAR = ear.getModuleProjects();
- if (projectsInEAR != null && !projectsInEAR.isEmpty()) {
- Iterator iter = projectsInEAR.values().iterator();
- while (iter.hasNext()) {
- Object MOFObject = iter.next();
- if (MOFObject instanceof EJBNatureRuntime) {
- if (((EJBNatureRuntime) MOFObject)
- .getModuleVersion() >= J2EEVersionConstants.EJB_2_0_ID) {
- IProject project = ((EJBNatureRuntime) MOFObject)
- .getProject();
- if (project != null) {
- ejbProjects.add(project);
- }
- }
- }
- }
- }
- }
- } // end for earProjects loop
-
- return (IProject[]) ejbProjects.toArray(new IProject[0]);
- }
-
- /**
- * Returns EJB projects in the ears
- *
- * @param earProjects
- * @return projects EJB projects
- *
- * @deprecated
- */
- public static IProject[] getEJBProjectsFromEARS(
- EARNatureRuntime[] earProjects) {
- if (earProjects == null)
- return null;
-
- ArrayList ejbProjects = new ArrayList();
- for (int i = 0; i < earProjects.length; i++) {
- if (earProjects[i] instanceof EARNatureRuntime) {
- EARNatureRuntime ear = (EARNatureRuntime) earProjects[i];
- Map projectsInEAR = ear.getModuleProjects();
- if (projectsInEAR != null && !projectsInEAR.isEmpty()) {
- Iterator iter = projectsInEAR.values().iterator();
- while (iter.hasNext()) {
- Object MOFObject = iter.next();
- if (MOFObject instanceof EJBNatureRuntime) {
-
- IProject project = ((EJBNatureRuntime) MOFObject)
- .getProject();
- if (project != null) {
- ejbProjects.add(project);
- }
-
- }
- }
- }
- }
- } // end for earProjects loop
-
- return (IProject[]) ejbProjects.toArray(new IProject[0]);
- }
-
- /**
- * Gets the EJB Components in the project
- * @param project
- * @return
- */
- public static IVirtualComponent[] getEJBComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IFlexibleProject flex = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] comps = flex.getComponents();
- for (int i=0;i<comps.length;i++){
- if (isEJBComponent(comps[i]))
- v.add(comps[i]);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- * Gets the Application Client components in a project.
- * @param project
- * @return
- */
- public static IVirtualComponent[] getAppClientComponents(IProject project){
-
- //get all components in the project
- List v = new ArrayList();
- try {
- IFlexibleProject flex = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] comps = flex.getComponents();
- for (int i=0;i<comps.length;i++){
- if (isAppClientComponent(comps[i]))
- v.add(comps[i]);
- }
- }
- catch (Exception e){
- //handle exception
- }
-
- return (IVirtualComponent[])v.toArray(new IVirtualComponent[0]);
- }
-
- /**
- *
- * @param project
- * @param earComponentName
- * @return
- */
- public static IVirtualComponent[] getReferencingEJB20ComponentsFromEAR(IProject project, String earComponentName){
-
- List ejbComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0; i<refs.length;i++) {
- if (isEJB20Component(refs[i].getReferencedComponent()))
- ejbComps.add(refs[i].getReferencedComponent());
- }
- }
- catch (Exception e){
- }
-
- return (IVirtualComponent[])ejbComps.toArray(new IVirtualComponent[0]);
- }
-
-
- /**
- * Utility method to combine two IProject[]
- * @param projectArray1
- * @param projectArray2
- * @return
- */
- public static IProject[] combineProjectArrays(IProject[] projectArray1,
- IProject[] projectArray2) {
-
- // check if either or both arrays are null.
- if (projectArray1 == null && projectArray2 == null)
- return null;
- else if (projectArray1 != null && projectArray2 == null)
- return projectArray1;
- else if (projectArray1 == null && projectArray2 != null)
- return projectArray2;
-
- IProject[] combinedProjects = new IProject[projectArray1.length
- + projectArray2.length];
-
- System.arraycopy(projectArray1, 0, combinedProjects, 0,
- projectArray1.length);
- if (projectArray2.length > 0) {
- System.arraycopy(projectArray2, 0, combinedProjects,
- projectArray1.length, projectArray2.length);
- }
-
- return combinedProjects;
- }
-
- /**
- * Returns all Web projects in the ear(s)
- *
- * @param earProjects
- * @return projects Web projects
- * @deprecated use getReferencingWebComponentsForEar
- */
- public static IProject[] getWebProjectsFromEARS(
- EARNatureRuntime[] earProjects) {
- if (earProjects == null)
- return null;
-
- ArrayList webProjects = new ArrayList();
- for (int i = 0; i < earProjects.length; i++) {
- if (earProjects[i] instanceof EARNatureRuntime) {
- EARNatureRuntime ear = (EARNatureRuntime) earProjects[i];
- Map projectsInEAR = ear.getModuleProjects();
- if (projectsInEAR != null && !projectsInEAR.isEmpty()) {
- Iterator iter = projectsInEAR.values().iterator();
- while (iter.hasNext()) {
- // IProjectNature nature =
- // iter.next().getNature(IWebNatureConstants.J2EE_NATURE_ID);
- Object MOFObject = iter.next();
- if (MOFObject instanceof J2EEWebNatureRuntime) {
- IProject project = ((J2EEWebNatureRuntime) MOFObject)
- .getProject();
- if (project != null) {
- webProjects.add(project);
- }
-
- }
- }
- }
- }
- } // end for earProjects loop
-
- return (IProject[]) webProjects.toArray(new IProject[0]);
- }
-
- /**
- *
- * @param earComponents
- * @return
- */
- public static IVirtualComponent[] getReferencingWebComponentsFromEAR(IProject project, String earComponentName){
- List webComps = new ArrayList();
- try{
- IVirtualComponent vc = ComponentCore.createComponent(project, earComponentName);
- IVirtualReference[] refs = vc.getReferences();
- for (int i=0; i<refs.length;i++) {
- if (isWebComponent(refs[i].getReferencedComponent()))
- webComps.add(refs[i].getReferencedComponent());
- }
- }
- catch(Exception e){
- }
-
- return (IVirtualComponent[])webComps.toArray(new IVirtualComponent[0]);
- }
-
- /**
- *
- * @param project
- * @return
- *
- * @deprecated // use isEJB20Component
- */
- public static boolean isEJB2_0Project(IProject project) {
-
- if (ResourceUtils.isEJBProject(project)) {
- try {
-
- if (project.hasNature(IEJBNatureConstants.NATURE_ID)
- && EJBNatureRuntime.getRuntime(project)
- .getModuleVersion() >= J2EEVersionConstants.EJB_2_0_ID) {
- return true;
- }
- } catch (CoreException e) {
- }
- }
- return false;
- }
-
- /**
- *
- * @param ejbComponent
- * @return
- */
- public static boolean isEJB20Component(IVirtualComponent ejbComponent){
- return isEJB20Component(ejbComponent.getProject(), ejbComponent.getName());
- }
-
- /**
- *
- * @param project
- * @param componentName
- * @return
- */
- public static boolean isEJB20Component(IProject project, String componentName){
- boolean isEJB = false;
- try {
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- if (EJBArtifactEdit.isValidEJBModule(vc)) {
- EJBArtifactEdit ejbEdit = null;
- try {
- ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(vc);
- EJBResource ejbRes = ejbEdit.getEJBJarXmiResource();
- if (ejbRes.getModuleVersionID()== J2EEVersionConstants.EJB_2_0_ID) {
- return true;
- }
- }
- finally {
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
-
- return isEJB;
- }
-
- /**
- * Returns true if the given <code>project</code> is an EAR 1.2 or EAR 1.3
- * Project.
- *
- * @param project
- * The project.
- * @return True if the project is an EAR 1.2 or an EAR 1.3 Project.
- *
- * @deprecated // use isEARComponent
- */
- public static boolean isEARProject(IProject project) {
- try {
- if (project.hasNature(IEARNatureConstants.NATURE_ID))
- return true;
- } catch (CoreException e) {
- }
- return false;
- }
-
- /**
- *
- * @param module
- * @param EAR
- * @return
- *
- * @deprecated use isComponentAssociated
- */
- public static boolean isEARAssociated(IProject module, IProject earProject) {
-
- EARNatureRuntime[] ears = getEARProjects(module);
- if (ears != null && ears.length != 0) {
- Vector EARNames = new Vector();
- for (int i = 0; i < ears.length; i++) {
- EARNames.add(ears[i].getProject().getName());
- }
- String[] earNames = (String[]) EARNames.toArray(new String[0]);
- if (Arrays.binarySearch(earNames, earProject.getName()) >= 0) {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Checks if the component at compName is referenced by the ear at earCompName
- * @param earProject
- * @param earCompName
- * @param project
- * @param compName
- * @return
- */
- public static boolean isComponentAssociated(IProject earProject, String earCompName,
- IProject project, String compName) {
- IVirtualComponent vc1 = ComponentCore.createComponent(earProject, earCompName);
- IVirtualComponent vc2 = ComponentCore.createComponent(project, compName);
- return isComponentAssociated(vc1, vc2);
- }
-
- /**
- * Checks if the component is referenced by the ear
- * @param ear
- * @param component
- * @return
- */
- private static boolean isComponentAssociated(IVirtualComponent ear, IVirtualComponent component){
- boolean isAssociated = false;
-
- // Note: not implemented by J2EE yet.. to be used later.
- IVirtualReference[] compRefs = ear.getReferences();
- if (compRefs!= null) {
- for (int i=0;i<compRefs.length;i++){
- IVirtualReference vref = compRefs[i];
- if (component.equals(vref.getReferencedComponent()))
- isAssociated = true;
- }
- }
- return isAssociated;
- }
-
- /**
- *
- * @param project
- * @param componentName
- * @param earProject
- * @param earComponentName
- */
- public static void associateComponentToEAR(IProject project, String componentName,
- IProject earProject, String earComponentName) {
-
- IFlexibleProject flexearProj = ComponentCore.createFlexibleProject(earProject);
- ComponentHandle earHandle = flexearProj.getComponent(componentName).getComponentHandle();
- IFlexibleProject flexcompProj = ComponentCore.createFlexibleProject(project);
- ComponentHandle compHandle = flexcompProj.getComponent(componentName).getComponentHandle();
- IDataModel addComponentToEARDataModel = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT_HANDLE, earHandle);
-
- List modList = (List) addComponentToEARDataModel.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_HANDLE_LIST);
- modList.add(compHandle);
- addComponentToEARDataModel.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_HANDLE_LIST, modList);
-
- try {
- addComponentToEARDataModel.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- Logger.getLogger().log(e);
- }
-
- }
-
-
-
- /**
- *
- * @param module
- * @param EARProject
- *
- * @deprecated
- */
- public static void associateWebProject(IProject module, IProject EARProject) {
- String uri = module.getName() + ".war";
- String contextRoot = module.getName();
- AddModuleToEARProjectCommand amiec = new AddModuleToEARProjectCommand(
- module, EARProject, uri, contextRoot, null);
- if (amiec.canExecute())
- amiec.execute();
- }
-
- /**
- *
- * @param ejbProject
- * @param EARProject
- *
- * @deprecated to be determined
- */
-// public static void associateEJBProject(IProject ejbProject,
-// IProject EARProject) {
-// try {
-// String uri = ejbProject.getName() + ".jar";
-// String contextRoot = ejbProject.getName();
-// AddModuleToEARProjectCommand amiec = new AddModuleToEARProjectCommand(
-// ejbProject, EARProject, uri, contextRoot, null);
-// if (amiec.canExecute())
-// amiec.execute();
-//
-// } catch (Exception e) {
-//
-// }
-//
-// }
-
- /**
- * Returns the first Module's WEB-INF directory
- * @param project
- * @return
- *
- * @deprecated use getWebInfPath(project, compName) instead
- */
-// public static IPath getFirstWebInfPath(IProject project){
-// IPath modulePath = null;
-// StructureEdit mc = null;
-// try {
-// mc = StructureEdit.getStructureEditForRead(project);
-// WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
-//
-// if (wbcs.length!=0) {
-// WebArtifactEdit webEdit = null;
-// try {
-// webEdit = WebArtifactEdit.getWebArtifactEditForRead(wbcs[0]);
-// if (webEdit!=null){
-// IPath webXMLPath = webEdit.getDeploymentDescriptorPath();
-// modulePath = webXMLPath.removeLastSegments(1);
-// System.out.println("WebModulePath/DDPath = "+modulePath);
-// }
-// }
-// finally{
-// if (webEdit!=null)
-// webEdit.dispose();
-// }
-// IVirtualComponent component = ComponentCore.createComponent(project, wbcs[0].getName());
-// IVirtualFolder webInfDir = component.getFolder(new Path("/WEB-INF"));
-// modulePath = webInfDir.getWorkspaceRelativePath();
-// System.out.println("FirstWebInfPath = " +modulePath);
-// }
-// }
-// catch(Exception ex){}
-// finally{
-// if (mc!=null)
-// mc.dispose();
-// }
-//
-// return modulePath;
-// }
-
- /**
- * @param project
- * @param componentName
- * @return
- */
- public static IPath getWebInfPath(IProject project, String componentName){
-
- IVirtualComponent component = ComponentCore.createComponent(project, componentName);
- IVirtualFolder webInfDir = component.getRootFolder().getFolder(new Path("/WEB-INF"));
- IPath modulePath = webInfDir.getWorkspaceRelativePath();
-
- return modulePath;
- }
-
-
- /**
- *
- * @param project
- * @return
- *
- */
- public static IPath getFirstWebContentPath(IProject project){
-
- IPath modulePath = null;
- try {
- IFlexibleProject fp = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] vcs = fp.getComponents();
- if (vcs.length!=0) {
- modulePath = vcs[0].getRootFolder().getWorkspaceRelativePath();
- }
- }
- catch(Exception ex){}
-
- return modulePath;
- }
-
- /**
- * @param project
- * @param componentName
- * @return
- */
- public static IPath getWebContentPath(IProject project, String componentName){
- IVirtualComponent component = ComponentCore.createComponent(project, componentName);
- IPath modulePath = component.getRootFolder().getWorkspaceRelativePath();
- return modulePath;
- }
-
- /**
- *
- * @param project
- * @return
- *
- */
- public static IContainer getFirstWebContentContainer(IProject project){
- IContainer container = null;
- IPath modulePath = getFirstWebContentPath(project);
- IResource res = ResourceUtils.findResource(modulePath);
- if (res!=null){
- container = res.getParent();
- }
-
- return container;
- }
-
- /**
- * @param project
- * @param componentName
- * @return
- */
- public static IContainer getWebContentContainer(IProject project, String componentName){
- IContainer container = null;
- IPath modulePath = getWebContentPath(project, componentName);
- IResource res = ResourceUtils.findResource(modulePath);
- if (res instanceof IContainer){
- container = (IContainer)res;
- }
- return container;
- }
-
-
- /**
- * Returns the first Module name
- * @param project
- * @return
- *
- */
- public static String getFirstWebModuleName(IProject project){
- String moduleName = null;
- try {
- IFlexibleProject fp = ComponentCore.createFlexibleProject(project);
- IVirtualComponent[] vcs = fp.getComponents();
- if (vcs.length!=0)
- moduleName = vcs[0].getName();
- }
- catch(Exception ex){}
-
- return moduleName;
- }
-
-
- /**
- * True if the component is a valid Web component
- * @param project
- * @param componentName
- * @return
- */
- public static boolean isWebComponent(IProject project, String componentName) {
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return isWebComponent(vc);
- }
-
- public static boolean isWebComponent(IVirtualComponent comp){
- if ( comp.getComponentTypeId().equals(IModuleConstants.JST_WEB_MODULE)){
- return true;
- }
- return false;
- }
-
- /**
- * True is the component is a valid EAR component
- * @param project
- * @param componentName
- * @return
- */
- public static boolean isEARComponent(IProject project, String componentName){
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return isEARComponent(vc);
- }
-
- public static boolean isEARComponent(IVirtualComponent comp){
- if (comp.getComponentTypeId().equals(IModuleConstants.JST_EAR_MODULE)){
- return true;
- }
- return false;
- }
-
- /**
- * True if the component is a valid EJB component
- * @param project
- * @param componentName
- * @return
- */
- public static boolean isEJBComponent(IProject project, String componentName) {
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return isEJBComponent(vc);
- }
-
- public static boolean isEJBComponent(IVirtualComponent comp){
- if (comp.getComponentTypeId().equals(IModuleConstants.JST_EJB_MODULE)){
- return true;
- }
- return false;
- }
-
- /**
- * True if the component is a true Application client component
- * @param project
- * @param componentName
- * @return
- */
- public static boolean isAppClientComponent(IProject project, String componentName) {
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return isAppClientComponent(vc);
- }
-
- public static boolean isAppClientComponent(IVirtualComponent comp){
- if (comp.getComponentTypeId().equals(IModuleConstants.JST_APPCLIENT_MODULE)){
- return true;
- }
- return false;
- }
-
- /**
- * True if the component is a valid Java component
- * @param project
- * @param componentName
- * @return
- */
- public static boolean isJavaComponent(IProject project, String componentName) {
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return isJavaComponent(vc);
- }
-
- public static boolean isJavaComponent(IVirtualComponent comp){
- if (comp.getComponentTypeId().equals(IModuleConstants.JST_UTILITY_MODULE)){
- return true;
- }
- return false;
- }
-
- public static String getComponentTypeId(IProject project, String componentName)
- {
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- return vc.getComponentTypeId();
- }
-
- public static String[] toComponentNamesArray(IVirtualComponent[] components){
- String[] ecNames = new String[components.length];
- for(int i=0; i<components.length; i++){
- ecNames[i] = components[i].getName();
- }
- return ecNames;
- }
-
- public static IProject[] toProjectArray(IVirtualComponent[] components){
- IProject[] projects = new IProject[components.length];
- for (int i=0; i<components.length; i++){
- projects[i] = components[i].getProject();
- }
- return projects;
- }
-
- /**
- * Given a J2EE level, this method returns the highest supported servlet level
- * @param j2eeLevel
- * @return web app version
- */
- public static Integer getServletVersionForJ2EEVersion(String j2eeLevel){
- int aVersion = Integer.valueOf(j2eeLevel).intValue();
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return new Integer(J2EEVersionConstants.WEB_2_2_ID);
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return new Integer(J2EEVersionConstants.WEB_2_4_ID);
-
- default:
- return new Integer(J2EEVersionConstants.WEB_2_3_ID);
- }
- }
-
- /**
- * Given a J2EE level, this method returns the highest supported EJB version
- * @param j2eeLevel
- * @return ejb spec version
- */
- public static Integer getEJBVersionForJ2EEVersion(String j2eeLevel){
- int aVersion = Integer.valueOf(j2eeLevel).intValue();
- switch (aVersion) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- return new Integer(J2EEVersionConstants.EJB_1_1_ID);
-
- case J2EEVersionConstants.J2EE_1_3_ID:
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
-
- case J2EEVersionConstants.J2EE_1_4_ID:
- return new Integer(J2EEVersionConstants.EJB_2_1_ID);
-
- default:
- return new Integer(J2EEVersionConstants.EJB_2_0_ID);
- }
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
deleted file mode 100644
index aa8cdbd..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/JavaMOFUtils.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.plugin.JavaEMFNature;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaVisibilityKind;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.impl.JavaClassImpl;
-
-/**
-* This class contains some useful utilities for dealing with the JavaMOF
-*/
-
-public final class JavaMOFUtils
-{
- /**
- * Determine whether this class of the given name is loadable in the given
- * project.
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable and no exceptions are thrown.
- */
- public static boolean isClassLoadable(String className, IProject project) throws CoreException
- {
- return isClassLoadable(getJavaClass(className,project));
- }
-
- public static boolean isClassLoadable(JavaClass javaClass)
- {
- return javaClass.isExistingType();
- }
-
- /**
- * Determine whether the specified class has a public constructor
- * with an empty parameter list.
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable from the project and the
- * class has a public constructor with an empty parameter list
- */
- public static boolean hasPublicDefaultCtor(String className, IProject project) throws CoreException
- {
- return hasPublicDefaultCtor(getJavaClass(className, project));
- }
-
-
- public static boolean hasPublicDefaultCtor(JavaClass javaClass)
- {
-
- List methodList = javaClass.getMethods();
- if (methodList==null)
- return true;
-
- Iterator iMethods = methodList.iterator();
- boolean userDefinedCtor = false;
- while (iMethods.hasNext())
- {
- Method thisMethod = (Method)iMethods.next();
-
- if (thisMethod.isConstructor())
- {
- userDefinedCtor = true;
-
- //Since the user has defined a ctor, the default ctor is no longer available.
- //We must ensure that the user has provided a public ctor with no parameters.
-
- //check if public
- if (thisMethod.getJavaVisibility().getValue() == JavaVisibilityKind.PUBLIC)
- {
- //see if parameter list is empty
- List paramList = thisMethod.getParameters();
- if (paramList.isEmpty() )
- {
- return true;
- }
- }
- }
-
- }
-
- if (userDefinedCtor)
- {
- return false; //if the user defined a ctor and we still haven't
- //returned true, none of them were public with no parameters.
- }
- else
- {
- return true;
- }
-
- }
- /**
- * Determine whether the specified class implements the specified interface.
- * @param className The fully qualified name of the class
- * @param interfaceName The fully qualified name of the interface
- * @param project The project
- * @return True if the class and interface are loadable from the project and
- * the class implements the interface.
- */
- public static boolean implementsInterface(String className, String interfaceName, IProject project)
- throws CoreException
- {
- return implementsInterface(getJavaClass(className, project), getJavaClass(interfaceName, project));
- }
-
-public static boolean implementsInterface(JavaClass javaClass, JavaClass interfaceClass)
- {
-
- if (!javaClass.isExistingType()) return false;
-
- if (!interfaceClass.isExistingType()) return false;
-
- return javaClass.implementsInterface(interfaceClass);
- }
-
- /**
- * Determine whether the specified class extends the specified superclass
- * @param className The fully qualified name of the class
- * @param superClassName The fully qualified name of the superclass
- * @param project The project
- * @return True if the class and superClass are loadable from the project and
- * the class extends the superClass
- */
- public static boolean extendsClass(String className, String superClassName, IProject project)
- throws CoreException
- {
- return extendsClass(getJavaClass(className,project), getJavaClass(superClassName, project));
- }
-
- public static boolean extendsClass(JavaClass javaClass, JavaClass superClass)
- {
- return superClass.isAssignableFrom(javaClass);
- }
-
- /**
- * Determine whether the specified class is actually an interface
- * @param className The fully qualified name of the class
- * @param project The project
- * @return True if the class is loadable from the project and is
- * actually an interface
- */
- public static boolean isInterface(String className, IProject project) throws CoreException
- {
- return isInterface(getJavaClass(className, project));
- }
-
- public static boolean isInterface(JavaClass javaClass)
- {
- return javaClass.isInterface();
- }
- public static boolean hasAbstractMethods (String className, IProject project) throws CoreException
- {
- return hasAbstractMethods(getJavaClass(className, project));
- }
-
- public static boolean hasAbstractMethods (JavaClass javaClass)
- {
- List methodList = javaClass.getMethods();
- if (methodList==null)
- return false;
-
- Iterator iMethods = methodList.iterator();
- while (iMethods.hasNext())
- {
- Method thisMethod = (Method)iMethods.next();
- if ( thisMethod.isAbstract()) return true;
- }
- return false;
- }
-
- public static JavaClass getJavaClass(String className , IProject project) throws CoreException
- {
- JavaEMFNature jMOF = (JavaEMFNature)JavaEMFNature.createRuntime(project);
- return (JavaClass)JavaClassImpl.reflect(className, jMOF.getResourceSet());
- }
-
- public static boolean isValidSEIFile(JavaClass beanClass, JavaClass seiClass)
- {
- if (!seiClass.isInterface())
- return false;
-
- Vector beanMethodsList = new Vector();
- List beanMethods = beanClass.getMethods();
- Iterator beanMethodsIterator = beanMethods.iterator();
- while (beanMethodsIterator.hasNext())
- {
- Method thisMethod = (Method)beanMethodsIterator.next();
- beanMethodsList.add(thisMethod.getMethodElementSignature());
- }
-
- List seiMethods = seiClass.getMethods();
- if (beanMethods == null ) {
- if ( seiMethods == null) return true;
- else return false;
- }
- if (seiMethods == null) return false;
-
- Iterator seiMethodsIterator = seiMethods.iterator();
- while (seiMethodsIterator.hasNext())
- {
- Method thisMethod = (Method)seiMethodsIterator.next();
- if ( !beanMethodsList.contains(thisMethod.getMethodElementSignature())) {
- return false;
- }
- }
- return true;
-
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
deleted file mode 100644
index e9d68c9..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ResourceUtils.java
+++ /dev/null
@@ -1,1843 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaElement;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaConventions;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Eclipse resources.
- */
-public final class ResourceUtils {
-
- // Keeps the IWorkspaceRoot hanging around. See getWorkspaceRoot().
- private static IWorkspaceRoot root_ = null;
-
- // Keeps the IWorkspace hanging around. See getWorkspace().
-
- private static IWorkspace workspace_ = null;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has no Java or Web nature.
- */
- public static byte PROJECT_TYPE_NONE = 0;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has a Java project nature.
- */
- public static byte PROJECT_TYPE_JAVA = 1;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has a Web project nature.
- */
- public static byte PROJECT_TYPE_WEB = 2;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has an EJB project nature.
- */
- public static byte PROJECT_TYPE_EJB = 4;
-
- /**
- * As returned by {@link #getProjectType getProjectType()}, indicates that
- * the given project has an Application client project nature.
- */
- public static byte PROJECT_TYPE_APPCLIENT = 8;
-
- /**
- * The SOAP rpcrouter servlet extension to be added to web project URL
- */
- public static String SERVLET_EXT = "/servlet/rpcrouter";
-
- private static final String DEFAULT_CLIENT_WEB_PROJECT_EXT = "Client";
- private static final String DEFAULT_CLIENT_EJB_PROJECT_EXT = "EJBClient";
- private static final String DEFAULT_EJB_PROJECT_NAME = "WebServiceEJBProject";
- private static final String DEFAULT_EJB_COMPONENT_NAME = "WebServiceEJB";
- private static final String DEFAULT_WEB_PROJECT_NAME = "WebServiceProject";
- private static final String DEFAULT_WEB_COMPONENT_NAME = "WebServiceWeb";
- private static final String DEFAULT_ROUTER_PROJECT_EXT = "Router";
-
- private static final String DEFAULT_SERVICE_EAR_PROJECT_NAME = "WebServiceEARProject";
- private static final String DEFAULT_SERVICE_EAR_COMPONENT_NAME = "WebServiceEAR";
- private static final String DEFAULT_CLIENT_EAR_PROJECT_NAME = "WebServiceClientEARProject";
- private static final String DEFAULT_CLIENT_EAR_COMPONENT_NAME = "WebServiceClientEAR";
-
- /**
- * Returns the IWorkspaceRoot object.
- * @return The IWorkspaceRoot object.
- */
- public static IWorkspaceRoot getWorkspaceRoot() {
- if (root_ == null) {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- return root_;
- }
-
- /**
- * Returns the IWorkspace object.
- * @return The IWorkspace object.
- */
- public static IWorkspace getWorkspace() {
- if (workspace_ == null) {
- if (root_ == null) {
- root_ = ResourcesPlugin.getWorkspace().getRoot();
- }
- workspace_ = root_.getWorkspace();
- }
- return workspace_;
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given absolute pathname or null if no such resource exists.
- *
- * @param absolutePathname
- * The absolute path of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource(String absolutePathname) {
- if (absolutePathname == null) {
- return null;
- }
- return findResource(new Path(absolutePathname));
- }
-
- /**
- * Returns an {@link org.eclipse.core.resources.IResource IResource}of the
- * given absolute path or null if no such resource exists.
- *
- * @param absolutePath
- * The absolute <code>IPath</code> of the resource.
- * @return The <code>IResource</code>.
- */
- public static IResource findResource(IPath absolutePath) {
- if (absolutePath == null) {
- return null;
- }
- return ResourceUtils.getWorkspaceRoot().findMember(absolutePath);
- }
-
- /**
- * Validates the given string as a name for a resource of the given type(s).
- * This method obeys the contract of
- * {@link org.eclipse.core.resources.IWorkspace#validateName IWorkspace.validateName()}.
- *
- * @param segment
- * The path to validate.
- * @param typeMask
- * The <code>IResource</code> type or types.
- * @return The status with a value if <code>IStatus.OK</code> if the path
- * is valid, or with appropriate severity and message information if
- * the path is not valid.
- *
- * @deprecated not used
- */
- public static IStatus validateName(String segment, int typeMask) {
- return getWorkspace().validateName(segment, typeMask);
- }
-
- /**
- * Validates the given string as the path of a resource of the given
- * type(s). This method obeys the contract of
- * {@link org.eclipse.core.resources.IWorkspace#validatePath IWorkspace.validatePath()}.
- *
- * @param path
- * The path to validate.
- * @param typeMask
- * The <code>IResource</code> type or types.
- * @return The status with a value if <code>IStatus.OK</code> if the path
- * is valid, or with appropriate severity and message information if
- * the path is not valid.
- * @deprecated not used
- */
- public static IStatus validatePath(String path, int typeMask) {
- return getWorkspace().validatePath(path, typeMask);
- }
-
- /**
- * Validates the given Java type name.
- *
- * @param typeName
- * The Java type name.
- * @return The status with a value of <code>IStatus.OK</code> if the name
- * is valid, or with appropriate severity and message information if
- * name is not valid. The primitive types (boolean, char, byte,
- * short, int, long, float, double) are valid. Arrays of valid types
- * are themselves valid.
- * @deprecated use JavaConventions in the jdt core
- */
- public static IStatus validateJavaTypeName(String typeName) {
- //
- // Strip off the trailing array bits, if any.
- //
- int a = typeName.indexOf('[');
- if (a > 0) {
- typeName = typeName.substring(0, a);
- }
- //
- // Allow primitives.
- //
- if (isPrimitiveJavaType(typeName)) {
- return new Status(IStatus.OK, WebServicePlugin.ID, 0, "", null);
- }
- //
- // Defer to JavaConventions.
- //
- return JavaConventions.validateJavaTypeName(typeName);
- }
-
- /**
- * Returns true if the given <code>typeName</code> is a Java primitive
- * (boolean, char, byte, short, int, long, float, double).
- *
- * @return True if the type name is a Java primitive.
- *
- * @deprecated
- */
- public static boolean isPrimitiveJavaType(String typeName) {
- return (typeName.equals("boolean") || typeName.equals("char")
- || typeName.equals("byte") || typeName.equals("short")
- || typeName.equals("int") || typeName.equals("long")
- || typeName.equals("float") || typeName.equals("double"));
- }
-
- /**
- * Returns the handle of the IProject at the beginning of the given
- * <code>absolutePath</code>. Neither the given path nor the project need
- * exist in the workspace. The path must be absolute, and must consist of at
- * least one segment.
- *
- * @return An IProject handle for the project at the beginning of the given
- * <code>absolutePath</code>, or null if the path does not
- * specify a project.
- */
- public static IProject getProjectOf(IPath absolutePath) {
- if (absolutePath.isAbsolute()) {
- String projectName = absolutePath.segment(0);
- if (projectName != null) {
- return getWorkspaceRoot().getProject(projectName);
- }
- }
- return null;
- }
-
- /**
- *
- * @param absolutePath
- * @return
- */
- public static IVirtualComponent getComponentOf(IPath absolutePath){
- if (absolutePath.isAbsolute()) {
- String componentName = absolutePath.segment(1);
- if (componentName != null) {
- String projectName = absolutePath.segment(0);
- IProject project = getWorkspaceRoot().getProject(projectName);
- if (projectName != null) {
- return ComponentCore.createComponent(project, componentName);
- }
- }
- }
- return null;
- }
-
- public static IVirtualComponent getComponentOf(IResource res)
- {
- IVirtualResource[] vresources = ComponentCore.createResources(res);
- IVirtualComponent vcomp = null;
- if (vresources != null && vresources.length>0)
- {
- IVirtualResource vres = vresources[0];
- vcomp = vres.getComponent();
- }
- return vcomp;
- }
-
-
- /**
- * Returns true if the given <code>project</code> is a Java Project.
- *
- * @param project
- * The project.
- * @return True if the project is a Java Project.
- */
- public static boolean isJavaProject(IProject project) {
- return (JavaCore.create(project) != null);
- }
-
- /**
- * Returns true if the given <code>project</code> is a Java Project.
- *
- * @param project
- * The project.
- * @return True if the project is a Java Project.
- */
- public static boolean isTrueJavaProject(IProject project) {
- return (!isWebProject(project) && !isAppClientProject(project) && !isEARProject(project)
- && !isEJBProject(project) && isJavaProject(project));
- /*
- * try { String[] natures = project.getDescription().getNatureIds();
- * return (natures.length == 1 &&
- * natures[0].equals(JavaCore.NATURE_ID)); } catch (CoreException e) { }
- * return false;
- */
- }
-
- /**
- * Returns true if the given <code>project</code> is a Web Project.
- * Note: For components; use J2EEUtils.isWebComponent()
- * @param project
- * The project.
- * @return True if the project is a Web Project.
- *
- * @deprecated
- */
- public static boolean isWebProject(IProject project) {
- boolean isWeb = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- //isWeb = WebArtifactEdit.isValidWebModule(wbcs[0]);
- }
- }
- catch(Exception ex){
- // handle exception
- }
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isWeb;
- }
-
- /**
- * Note: for components; use J2EEUtils.isEARComponent()
- * @param project
- * @return
- *
- * @deprecated
- */
- public static boolean isEARProject(IProject project){
- boolean isEAR = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- EARArtifactEdit earEdit = null;
- try {
- //earEdit = EARArtifactEdit.getEARArtifactEditForRead(wbcs[0]);
- if (earEdit!=null){
- isEAR = true;
- }
- }
- finally{
- if (earEdit!=null)
- earEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isEAR;
- }
- /**
- * Returns true if the given <code>project</code> is an EJB 1.1 or EJB 2.0
- * Project.
- * Note: for components, use J2EEUtils.isEJBComponent
- * @param project
- * The project.
- * @return True if the project is an EJB 1.1 or an EJB 2.0 Project.
- *
- * @deprecated
- *
- */
- public static boolean isEJBProject(IProject project) {
- boolean isEJB = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- EJBArtifactEdit ejbEdit = null;
- try {
- //ejbEdit = EJBArtifactEdit.getEJBArtifactEditForRead(wbcs[0]);
- if (ejbEdit!=null){
- isEJB = true;
- }
- }
- finally{
- if (ejbEdit!=null)
- ejbEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isEJB;
- }
-
- /**
- * Returns true if the given <code>project</code> is an Application Client
- * Project.
- * Note: for components, use J2EEUtils.isAppClientComponent()
- * @param project
- * The project.
- * @return True if the project is an Application Client Project
- *
- * @deprecated
- */
- public static boolean isAppClientProject(IProject project) {
- boolean isAppClient = false;
- StructureEdit mc = null;
- try {
- mc = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent[] wbcs = mc.getWorkbenchModules();
- if (wbcs.length!=0) {
- AppClientArtifactEdit appClientEdit = null;
- try {
- //appClientEdit = AppClientArtifactEdit.getAppClientArtifactEditForRead(wbcs[0]);
- if (appClientEdit!=null){
- isAppClient = true;
- }
- }
- finally{
- if (appClientEdit!=null)
- appClientEdit.dispose();
- }
- }
- }
- catch(Exception ex){}
- finally{
- if (mc!=null)
- mc.dispose();
- }
-
- return isAppClient;
- }
-
- /**
- * Returns the type of the given <code>project</code> as a bitmask.
- * Relevant bitmask values are:
- * <ol>
- * <li>{@link #PROJECT_TYPE_JAVA PROJECT_TYPE_JAVA}
- * <li>{@link #PROJECT_TYPE_WEB PROJECT_TYPE_WEB}
- * <li>{@link #PROJECT_TYPE_EJB PROJECT_TYPE_EJB}
- * <li>{@link #PROJECT_TYPE_NONE PROJECT_TYPE_NONE}
- * </ol>
- *
- * @param project
- * The project.
- * @return The type bitmask of the project.
- *
- * @deprecated use getComponentType
- */
- public static byte getProjectType(IProject project) {
- byte projectType = PROJECT_TYPE_NONE;
- if (ResourceUtils.isJavaProject(project)) {
- projectType |= PROJECT_TYPE_JAVA;
- }
- if (ResourceUtils.isWebProject(project)) {
- projectType |= PROJECT_TYPE_WEB;
- }
- if (ResourceUtils.isEJBProject(project)) {
- projectType |= PROJECT_TYPE_EJB;
- }
- return projectType;
- }
-
- /**
- * Returns the component type id as defined in IModuleConstants
- * i.e. IModuleConstants.JST_WEB_MODULE = "jst.web"
- * @param project
- * @param componentName
- * @return
- */
- public static String getComponentType(IProject project, String componentName){
- IVirtualComponent comp = ComponentCore.createComponent(project, componentName);
- return getComponentType(comp);
- }
-
- /**
- * Returns the component type
- * @param component
- * @return
- */
- public static String getComponentType(IVirtualComponent component){
- return component.getComponentTypeId();
- }
-
- /**
- *
- * @param project
- * @return
- *
- * @deprecated not used
- */
- public static String getProjectTypeAsString(IProject project) {
- if (ResourceUtils.isEJBProject(project))
- return WebServicePlugin.getMessage("%LABEL_EJB");
- else if (ResourceUtils.isWebProject(project))
- return WebServicePlugin.getMessage("%LABEL_WEB");
- else if (ResourceUtils.isJavaProject(project))
- return WebServicePlugin.getMessage("%LABEL_JAVA");
- else
- return "";
- }
-
-
- /**
- * Returns WebModule Deployable of the <code>project</code> as an
- * <code>IDeployable</code>, or null if the project has no Web nature.
- *
- * @param project
- * The project.
- * @return WebModule Deployable of the <code>project</code> or null if the
- * project has no Web nature.
- * @deprecated see ServerUtils.getModule(IProject, String)
- */
- public static IModule getModule(IProject project) {
- IModule[] modules = ServerUtil.getModules(project);
- if (modules!=null && modules.length!=0) {
- return modules[0];
- }
- return null;
- }
-
- /**
- * Returns the build output location of the <code>project</code> as an
- * <code>IPath</code>, or null if the project has no Java nature.
- * i.e. WP\.deployables\webModule\WEB-INF\classes
- * @param project
- * The project.
- * @return The build output location of the <code>project</code> or null
- * if the project has no Java nature.
- * @deprecated not used
- */
- public static IPath getJavaOutputLocation(IProject project) {
- IPath outputLocation = null;
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- outputLocation = javaProject.getOutputLocation();
- }
- } catch (JavaModelException e) {
- }
- Log log = new EclipseLog();
- log.log(Log.INFO, 5032, ResourceUtils.class, "getJavaOutputLocation",
- "project=" + project + ",outputLocation=" + outputLocation);
-
- return outputLocation;
- }
-
- /**
- * Returns a build source location of the <code>project</code> as an
- * <code>IPath</code>, or null if the project either has no Java nature
- * or if the project's build classpath contains no folders local to the
- * project. If the project has more than one of its own folders on the build
- * classpath, then one of them is chosen arbitrarily as the build source
- * location. To work with all entries on the build classpath, use
- * {@link #getJavaPackageFragmentRoots getJavaPackageFragmentRoots()}or
- * {@link #getJavaClasspath getJavaClasspath()}.
- *
- * @param project
- * The project.
- * @return A build source location of the <code>project</code> or null if
- * the project has no Java nature or if the project's build
- * classpath contains no folders local to the project.
- * @deprecated use getJavaSourceLocation(IProject project, String compName)
- */
- public static IPath getJavaSourceLocation(IProject project) {
- IPath sourceLocation = null;
- IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
- for (int i = 0; i < fragmentRoots.length && sourceLocation == null; i++) {
- try {
- IResource fragmentRoot = fragmentRoots[i]
- .getCorrespondingResource();
- if (fragmentRoot != null
- && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- sourceLocation = fragmentRoot.getFullPath();
- }
- } catch (JavaModelException e) {
- }
- }
-
- Log log = new EclipseLog();
- log.log(Log.INFO, 5030, ResourceUtils.class, "getJavaSourceLocation",
- "project=" + project + ",sourceLocation=" + sourceLocation);
-
- return sourceLocation;
- }
-
- /**
- * Returns the "JavaSource" folder
- * @param project
- * @param compName
- * @return
- */
- public static IPath getJavaSourceLocation(IProject project, String compName){
- IVirtualComponent component = ComponentCore.createComponent(project, compName);
- return getJavaSourceLocation(component);
- }
-
- /**
- * Returns the JavaSource location folder
- * @param comp
- * @return
- */
- public static IPath getJavaSourceLocation(IVirtualComponent comp){
- if (comp!=null){
- IVirtualFolder folder = comp.getRootFolder().getFolder(new Path("/WEB-INF/classes"));
- return folder.getWorkspaceRelativePath();
- }
- return null;
- }
-
- /**
- * Returns the JavaSource locations in each project
- * @param project
- * @return
- */
- public static IPath[] getAllJavaSourceLocations(IProject project) {
- Vector pathVector = new Vector();
- IPackageFragmentRoot[] fragmentRoots = getJavaPackageFragmentRoots(project);
-
- for (int i = 0; i < fragmentRoots.length; i++) {
- try {
- IResource fragmentRoot = fragmentRoots[i].getCorrespondingResource();
- if (fragmentRoot != null && (fragmentRoot.getProject().equals(project))
- && (fragmentRoot.getType() != IResource.FILE)) {
- pathVector.add(fragmentRoot.getFullPath());
- }
- } catch (JavaModelException e) {
- }
- }
- return (IPath[]) pathVector.toArray(new Path[pathVector.size()]);
- }
-
- public static IPath[] getAllJavaSourceLocations(IVirtualComponent[] components) {
-
- if (components!=null){
- List javaSourcePaths = new ArrayList();
- for (int i=0;i<components.length;i++){
- IPath path = getJavaSourceLocation(components[i]);
- javaSourcePaths.add(path);
- }
- return (IPath[])javaSourcePaths.toArray(new IPath[0]);
- }
- return null;
- }
-
- /**
- * Returns a build source package fragment root of the <code>project</code>
- * as an <code>IPackageFragmentRoot</code>, or null if the project either
- * has no Java nature or if the project's build classpath contains no
- * folders local to the project. If the project has more than one of its own
- * folders on the build classpath, then one of them is chosen arbitrarily as
- * the build source location.
- *
- * @param project
- * The project.
- * @return A build source package fragment root of the <code>project</code>
- * or null if the project has no Java nature or if the project's
- * build classpath contains no folders local to the project.
- *
- * @deprecated not used
- */
- public static IPackageFragmentRoot getJavaSourcePackageFragmentRoot(IProject project) {
- IPackageFragmentRoot packageFragmentRoot = null;
- IPath javaSourceLocation = getJavaSourceLocation(project);
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- packageFragmentRoot = javaProject.findPackageFragmentRoot(javaSourceLocation);
- }
- } catch (JavaModelException e) {
- }
- return packageFragmentRoot;
- }
-
- /**
- * Returns the package fragment roots of the <code>project</code> as an
- * array of <code>IPackageFragmentRoot</code> objects. If the project has
- * no Java nature then the returned array will be of length zero.
- *
- * @param project
- * The project.
- * @return The package fragment roots of the <code>project</code>.
- */
- public static IPackageFragmentRoot[] getJavaPackageFragmentRoots(IProject project) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragmentRoot[] packageFragmentRoots = javaProject
- .getPackageFragmentRoots();
- return packageFragmentRoots;
- }
- } catch (JavaModelException e) {
- }
- return new IPackageFragmentRoot[0];
- }
-
- /**
- * Returns the build classpath entries of the <code>project</code> as an
- * array of <code>IClasspathEntry</code> objects. If the project has no
- * Java nature then the returned array will be of length zero.
- *
- * @param project
- * The project.
- * @return The classpath entries of the <code>project</code>.
- *
- * @deprecated not used
- */
- public static IClasspathEntry[] getJavaClasspath(IProject project) {
- try {
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
- return classpathEntries;
- }
- } catch (JavaModelException e) {
- }
- return new IClasspathEntry[0];
- }
-
- /**
- *
- * @param project
- * @param componentName
- * @return
- */
- public static IFolder getWebComponentServerRoot(IProject project, String componentName){
-
- IFolder webModuleServerRoot = null;
- IVirtualComponent vc = ComponentCore.createComponent(project, componentName);
- if (vc.exists())
- webModuleServerRoot = StructureEdit.getOutputContainerRoot(vc);
-
- return webModuleServerRoot;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated use getWebComponentURL(..) which belongs in ServerUtils
- */
- public static String getWebProjectURL(IProject project,
- String serverFactoryId, IServer server) {
-
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module,
- serverFactoryId, server, true, new NullProgressMonitor());
- if (serverInstance != null) {
-// URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
- URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s
- .length() - 1) : s);
- }
- }
- }
-
- Log log = new EclipseLog();
- log.log(Log.INFO, 5036, ResourceUtils.class, "getWebProjectURL",
- "project=" + project + ",webProjectURL=" + webProjectURL);
-
- return webProjectURL;
- }
-
- /**
- * Returns the forged URL string corresponding to the web server module root
- * of the project in a server instance or null if the project has no Web
- * nature or has no association to a server instance.
- *
- * @param project
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated not used
- */
-// public static String getForgedWebProjectURL(IProject project, String serverFactoryId, IServer server){
-//
-// String webProjectURL = null;
-// IModule module = getModule(project);
-// if (module != null)
-// {
-// //IServer serverInstance = ServerUtils.getServerForModule(module,
-// // serverFactoryId, server, true, new NullProgressMonitor());
-// if (server != null)
-// {
-// String hostname = server.getHost();
-//
-// // get ServerPort
-// int portNumber = 0;
-//
-// ServerPort[] ports = server.getServerPorts(null);
-// ServerPort port = null;
-// for (int it = 0; it<ports.length; it++)
-// {
-// ServerPort p = ports[it];
-// String protocol = p.getProtocol();
-// if (protocol != null && protocol.trim().toLowerCase().equals("http"))
-// {
-// port = p;
-// portNumber = p.getPort();
-// break;
-// }
-// }
-//
-//
-//
-// URL url = null;
-// try {
-// url = new URL("http", hostname, portNumber, "");
-// }
-// catch(Exception e){
-// e.printStackTrace();
-// }
-//
-//
-// //URL url = ((IURLProvider) serverInstance.getDelegate()).getModuleRootURL(module);
-//
-// if (url != null)
-// {
-// String s = url.toString();
-// webProjectURL = s + "/"+project.getName();
-// //webProjectURL = (s.endsWith("/") ? s.substring(0,s.length()-1) : s);
-// }
-// }
-// }
-// Log log = new EclipseLog();
-// log.log(Log.INFO, 5036, ResourceUtils.class, "getWebProjectURL", "project="+project+",webProjectURL="+webProjectURL);
-// return webProjectURL;
-// }
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- * @deprecated belongs in ServerUtils
- *
- */
- public static String getWebProjectURL(IProject project) {
- String webProjectURL = null;
- IModule module = getModule(project);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module);
- if (serverInstance != null) {
- URL url = ((IURLProvider)serverInstance.getAdapter(IURLProvider.class)).getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s
- .length() - 1) : s);
- }
- }
- }
- Log log = new EclipseLog();
- log.log(Log.INFO, 5037, ResourceUtils.class, "getWebProjectURL",
- "project=" + project + ",webProjectURL=" + webProjectURL);
-
- return webProjectURL;
- }
-
- /**
- *
- * @param project
- * @return
- *
- * @deprecated should be in ServerUtils
- */
- public static String getEncodedWebProjectURL(IProject project) {
- String url = getWebProjectURL(project);
- if (url != null) {
- int index = url.lastIndexOf('/');
- if (index != -1) {
- StringBuffer encodedURL = new StringBuffer();
- encodedURL.append(url.substring(0, index + 1));
- try {
- String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
- int plusIndex = ctxtRoot.indexOf('+');
- while (plusIndex != -1) {
- StringBuffer sb = new StringBuffer();
- sb.append(ctxtRoot.substring(0, plusIndex));
- sb.append("%20");
- sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
- .length()));
- ctxtRoot = sb.toString();
- plusIndex = ctxtRoot.indexOf('+');
- }
- encodedURL.append(ctxtRoot);
- }catch (IOException io){
- //handler exception
- }
- url = encodedURL.toString();
- }
- }
- return url;
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * package name of the resource or null if the resource is not properly
- * located in a project or folder on the build classpath or that is the
- * build output path.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return the package name of the Java resource.
- */
- public static String getJavaResourcePackageName(IPath absolutePath) {
- try {
- IPath javaFolderPath = absolutePath.removeLastSegments(1);
- IProject project = getProjectOf(absolutePath);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragment fragment = javaProject
- .findPackageFragment(javaFolderPath);
- if (fragment != null) {
- return fragment.getElementName();
- }
- IPath outputPath = getJavaOutputLocation(project);
- if (outputPath.isPrefixOf(javaFolderPath)) {
- IPath javaPackagePath = javaFolderPath
- .removeFirstSegments(outputPath.segmentCount());
- return javaPackagePath.isEmpty() ? null : javaPackagePath
- .toString().replace(IPath.SEPARATOR, '.');
- }
- }
- } catch (JavaModelException e) {
- }
- return null;
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * package name of the resource as a relative pathname or null if the
- * resource is not properly located in a project or folder on the build
- * classpath.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return the package name of the Java resource as a relative path.
- */
- public static IPath getJavaResourcePackagePath(IPath absolutePath) {
- String packageName = ResourceUtils
- .getJavaResourcePackageName(absolutePath);
- return (packageName == null ? null : new Path(packageName.replace('.',
- IPath.SEPARATOR)));
- }
-
- /**
- * Given the <code>absolutePath</code> of a Java resource, returns the
- * absolute path of the project or folder that is on the build classpath or
- * is the build output path and that contains the fully qualified Java
- * resource, or null if no such project or folder exists.
- *
- * @param absolutePath
- * The absolute path of the Java resource.
- * @return The absolute path of the project or folder containing the fully
- * qualified Java resource.
- * @deprecated not used
- */
- public static IPath getJavaResourceRootPath(IPath absolutePath) {
- try {
- IProject project = getProjectOf(absolutePath);
- IJavaProject javaProject = JavaCore.create(project);
- if (javaProject != null) {
- IPackageFragmentRoot[] pfrs = javaProject
- .getPackageFragmentRoots();
- for (int i = 0; i < pfrs.length; i++) {
- IResource fragmentRoot = pfrs[i].getCorrespondingResource();
- if (fragmentRoot != null) {
- IPath fragmentPath = fragmentRoot.getFullPath();
- if (fragmentPath.isPrefixOf(absolutePath)) {
- return fragmentPath;
- }
- }
- }
- IPath outputPath = getJavaOutputLocation(project);
- if (outputPath.isPrefixOf(absolutePath)) {
- return outputPath;
- }
- }
- } catch (JavaModelException e) {
- }
- return null;
- }
-
- /**
- * Determines an URL (HTTP or FILE) to an Eclipse resource, returning the
- * URL string if successful and false otherwise. A value of null will
- * definitely be returned if any of the following conditions are not met:
- * <ol>
- * <li>The absolute path begins with a Web Project.
- * <li>The leading portion of the absolute path matches the path of the
- * container returned by {#link #getWebModuleServerRoot
- * getWebModuleServerRoot} for the project.
- * <li>The path does not lead to the WEB-INF folder or any descendent
- * thereof.
- * <li>The Web Project is associated with an explicit or default server
- * instance.
- * </ol>
- *
- * @param absolutePath
- * The absolute path of the resource.
- * @return The URL of the file, or null if no URL can be determined.
- * @deprecated not used
- */
-// public static String getURLFromPath(IPath absolutePath,
-// String serverFactoryId, IServer server) {
-// return getURLFromPath(absolutePath, getWebProjectURL(
-// getProjectOf(absolutePath), serverFactoryId, server));
-// }
-
- /**
- *
- * @param absolutePath
- * @param webProjectURL
- * @return
- * @deprecated not used
- */
-// public static String getURLFromPath(IPath absolutePath, String webProjectURL) {
-// StringBuffer url = new StringBuffer();
-// IProject project = getProjectOf(absolutePath);
-// IContainer webModuleServerRoot = getWebModuleServerRoot(project);
-// if (webModuleServerRoot != null) {
-// IPath webModuleServerRootPath = webModuleServerRoot.getFullPath();
-// if (webModuleServerRootPath.isPrefixOf(absolutePath)) {
-// int numSegment = webModuleServerRootPath.segmentCount();
-// int numSegmentFromPath = absolutePath.segmentCount();
-// if (numSegmentFromPath > numSegment) {
-// String nextSegment = absolutePath.segment(numSegment);
-// // check if the segment after the WebModuleServerRoot is
-// // WEB-INF (ignoring case)
-// if (nextSegment != null && !nextSegment.equalsIgnoreCase("WEB-INF")) {
-// IPath relativePath = absolutePath.removeFirstSegments(numSegment);
-// if (webProjectURL != null)
-// url.append(webProjectURL).append(IPath.SEPARATOR).append(relativePath.toString());
-// }
-// } else if (numSegmentFromPath == numSegment)
-// url.append(webProjectURL);
-// }
-// }
-// if (url.length() < 1) {
-// IWorkspaceRoot workspace = getWorkspaceRoot();
-// url.append(getResourceURI(workspace.getFile(absolutePath)));
-// }
-// Log log = new EclipseLog();
-// log.log(Log.INFO, 5038, ResourceUtils.class, "getURLFromPath",
-// "absolutePath=" + absolutePath + ",url=" + url);
-//
-// return url.toString();
-// }
-
- /**
- * Copies a set of files from a plugin's installation location to a native
- * directory. The files are named in an index file located relative to the
- * plugin's installation location.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param indexPathname
- * A file containing a whitespace-delimitted list of pathnames of
- * the files to copy. The pathnames are relative to the
- * <code>plugin sourcePath</code>. Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the files
- * will be copied. The relative pathnames of the files named in
- * the <code>indexPathname</code> file are preserved. Must not
- * be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyIndexedFilesToOS(Plugin plugin, IPath sourcePath,
- IPath indexPathname, IPath targetPath,
- IProgressMonitor progressMonitor) throws IOException {
- InputStream input = plugin.openStream(indexPathname);
- Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
- copyEnumeratedFilesToOS(plugin, sourcePath, filenames, targetPath,
- progressMonitor);
- }
-
- /**
- * Copies a set of files from a plugin's installation location to a native
- * directory. The files are named in an enumeration.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param pathnames
- * An enumeration of pathnames of the files to copy. The
- * pathnames are relative to the <code>plugin sourcePath</code>.
- * Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the files
- * will be copied. The relative pathnames of the files named in
- * the <code>pathnames</code> enumeration are preserved. Must
- * not be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyEnumeratedFilesToOS(Plugin plugin, IPath sourcePath,
- Enumeration pathnames, IPath targetPath,
- IProgressMonitor progressMonitor) throws IOException {
- while (pathnames.hasMoreElements()) {
- String filename = (String) pathnames.nextElement();
- copyFileToOS(plugin, sourcePath, new Path(filename), targetPath,
- progressMonitor);
- }
- }
-
- /**
- * Copies a file from a plugin's installation location to a native
- * directory.
- *
- * @param plugin
- * The plugin containing the files to copy. Must not be null.
- * @param sourcePath
- * The path, relative to the <code>plugin</code> install
- * location, containing the files to copy. If null, then the
- * plugin install location is the source path (ie. null is
- * equivalent to ".").
- * @param pathname
- * The pathname of the file to copy. The pathname is relative to
- * the <code>plugin sourcePath</code>. Must not be null.
- * @param targetPath
- * The absolute path of the native directory to which the file
- * will be copied. The relative pathname of the file is
- * preserved. Must not be null.
- * @param progressMonitor
- * The progress monitor for the operation, or null.
- * @throws IOException
- * An exception indicating an IO error has occured.
- */
- static public void copyFileToOS(Plugin plugin, IPath sourcePath,
- IPath pathname, IPath targetPath, IProgressMonitor progressMonitor)
- throws IOException {
- IPath target = targetPath.append(pathname);
- IPath source = sourcePath == null ? pathname : sourcePath
- .append(pathname);
- InputStream input = plugin.openStream(source);
- OutputStream output = new FileOutputStream(target.toOSString());
- copyStream(input, output);
- input.close();
- output.close();
- }
-
- /**
- * Copies data from one stream to another.
- *
- * @param input
- * The input stream.
- * @param output
- * The output stream.
- * @return The number of bytes copied.
- * @throws IOException
- * An exception if an error occurs while processing either of
- * the streams.
- */
- static public int copyStream(InputStream input, OutputStream output)
- throws IOException {
- int t = 0;
- byte[] buffer = new byte[1024];
- int n = input.read(buffer);
- while (n >= 0) {
- output.write(buffer, 0, n);
- t += n;
- n = input.read(buffer);
- }
- return t;
- }
-
- /**
- * Creates a native directory path equal to the parent portion of the given
- * <code>pathname</code>. If the directory already exists, then no action
- * is taken.
- *
- * @param pathname
- * The pathname to the file whose parent directory should be
- * created.
- * @throws IOException
- * An exception if an IO error occurs.
- */
- static public void createParentDirectoryFor(String pathname)
- throws IOException {
- File file = new File(pathname);
- File parent = file.getParentFile();
- if (parent != null) {
- parent.mkdirs();
- }
- }
-
- /**
- * Returns the IResource represented by the given selection.
- *
- * @param object
- * The selection
- * @return IResource if the selection represents an IResource. Returns null
- * otherwise.
- * @throws CoreException
- */
- static public IResource getResourceFromSelection(Object obj)
- throws CoreException {
- IResource res = null;
- if (obj != null) {
- if (obj instanceof IResource) {
- res = (IResource) obj;
- } else if (obj instanceof IJavaElement) {
- IJavaElement javaElement = (IJavaElement) obj;
- res = javaElement.getCorrespondingResource();
- } else if (obj instanceof EnterpriseBean) {
- EnterpriseBean ejbBean = (EnterpriseBean) obj;
- IProject ejbProject = ProjectUtilities.getProject(ejbBean);
- if (ejbProject != null)
- res = ejbProject;
- }
-
- }
-
- return res;
- }
-
- //----------------------------------------------------------------------
- // Naughty bits...
- //----------------------------------------------------------------------
-
- //
- // Creates a path of folders.
- // Do not call with an absolutePath of less than one segment.
- //
- // private static IContainer makeFolderPath (
- // ResourceContext resourceContext,
- // IPath absolutePath,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // if (absolutePath.segmentCount() <= 1)
- // {
- // return getWorkspaceRoot().getProject(absolutePath.segment(0));
- // }
- // else
- // {
- // IContainer parent = makeFolderPath(resourceContext,
- // absolutePath.removeLastSegments(1), progressMonitor, statusMonitor);
- // String folderName = absolutePath.lastSegment();
- // return makeFolder(resourceContext, parent,folderName, progressMonitor ,
- // statusMonitor);
- // }
- // }
- //
- // Creates a folder under a container.
- // The container must already exist.
- //
- // private static IFolder makeFolder (
- // ResourceContext resourceContext,
- // IContainer parent,
- // String folderName,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // IResource child = parent.findMember(folderName);
- // if (child == null)
- // {
- // if (!resourceContext.isCreateFoldersEnabled()) {
- // int result = statusMonitor.reportStatus(new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FOLDER_CREATION_DISABLED",
- // new Object[] {parent.getFullPath().toString(),folderName}),null),
- // getThreeStateFileOptions());
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCreateFoldersEnabled(true);
- //
- // }
- // IFolder folder = parent.getFolder(new Path(folderName));
- // folder.create(true,true,progressMonitor);
- // return folder;
- // }
- // else if (child.getType() == IResource.FOLDER)
- // {
- // return (IFolder)child;
- // }
- // else
- // {
- // throw new CoreException(new
- // Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FOLDER",new
- // Object[] {parent.getFullPath().append(folderName).toString()}),null));
- // }
- // }
-
- //
- // Creates a file under a container.
- // The container must already exist.
- //
- // private static IFile makeFile (
- // ResourceContext resourceContext,
- // IContainer parent,
- // String fileName,
- // InputStream inputStream,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // IResource child = parent.findMember(fileName);
- // if (child != null)
- // {
- // if (child.getType() == IResource.FILE)
- // {
- // if (!resourceContext.isOverwriteFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
- // new Object[] {parent.getFullPath().toString(),fileName}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setOverwriteFilesEnabled(true);
- // }
- // //We have permission to overwrite so check if file is read-only
- // if (child.isReadOnly())
- // {
- // if (!resourceContext.isCheckoutFilesEnabled()) {
- //
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
- // new Object[] {parent.getFullPath().toString(),fileName}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return null;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCheckoutFilesEnabled(true);
- // }
- //
- // IFile[] files = new IFile[1];
- // files[0] = (IFile)child;
- //
- // if (
- // !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
- // return null;
- // }
- //
- // //Change the contents of the existing file.
- // IFile file = parent.getFile(new Path(fileName));
- // file.setContents(inputStream,true,true,progressMonitor);
- // return file;
- //
- // }
- // else
- // {
- // throw new CoreException(new
- // Status(IStatus.ERROR,WebServicePlugin.ID,0,WebServicePlugin.getMessage("%MSG_ERROR_RESOURCE_NOT_FILE",new
- // Object[] {parent.getFullPath().append(fileName)}),null));
- // }
- // }
- // else
- // {
- // //Create a new file.
- // IFile file = parent.getFile(new Path(fileName));
- // file.create(inputStream,true,progressMonitor);
- // return file;
- // }
- // }
-
- /**
- * Deletes a file under a container. The container must already exist.
- *
- * @param file -
- * the IFile to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the file does not exist or if it exists and is
- * successfully deleted. False otherwise.
- */
- // public static boolean deleteFile (
- // ResourceContext resourceContext,
- // IFile file,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor )
- // throws CoreException
- // {
- // if (file.exists())
- // {
- // if (!resourceContext.isOverwriteFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_OVERWRITE_DISABLED",
- // new Object[]
- // {file.getParent().getFullPath().toString(),file.getName()}),null),
- // getThreeStateFileOptions());
- //
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return false;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setOverwriteFilesEnabled(true);
- // }
- // //We have permission to overwrite so check if file is read-only
- // if (file.isReadOnly())
- // {
- // if (!resourceContext.isCheckoutFilesEnabled()) {
- // int result = statusMonitor.reportStatus( new
- // Status(IStatus.WARNING,WebServicePlugin.ID,0,
- // WebServicePlugin.getMessage("%MSG_ERROR_FILE_CHECKOUT_DISABLED",
- // new Object[]
- // {file.getParent().getFullPath().toString(),file.getName()}),null),
- // getThreeStateFileOptions());
- // if (result == IStatusDialogConstants.CANCEL_ID)
- // return false;
- //
- // if ( result == IStatusDialogConstants.YES_TO_ALL_ID)
- // resourceContext.setCheckoutFilesEnabled(true);
- //
- // }
- // IFile[] files = new IFile[1];
- // files[0] = file;
- //
- // if (
- // !statusMonitor.reportStatus(getWorkspace().validateEdit(files,null)))
- // return false;
- // }
- // file.delete(true,progressMonitor);
- // }
- // //At this point, either the file did not exist or we successfully deleted
- // it. Return success.
- // return true;
- // }
- /**
- * Deletes a folder under a container.
- *
- * @param folder -
- * the IFolder to be deleted
- * @param progressMonitor
- * @param statusMonitor
- * @return True if the folder does not exist or if it exists and is
- * successfully deleted along with its members. False otherwise.
- */
- // public static boolean deleteFolder (
- // ResourceContext resourceContext,
- // IFolder folder,
- // IProgressMonitor progressMonitor,
- // StatusMonitor statusMonitor
- // )
- // throws CoreException
- // {
- // if (!folder.exists()) return true;
- //
- // boolean deleted = true;
- // IResource[] resources = folder.members();
- // for (int i=0; i<resources.length; i++)
- // {
- // IResource resource = resources[i];
- // if (resource instanceof IFile)
- // {
- // deleted = deleteFile(resourceContext, (IFile)resource, progressMonitor,
- // statusMonitor);
- // }
- // if (resource instanceof IFolder)
- // {
- // deleted = deleteFolder( resourceContext, (IFolder)resource,
- // progressMonitor, statusMonitor);
- // }
- //
- // if (!deleted) break;
- // }
- // if (deleted) {
- // folder.delete(true, true, progressMonitor);
- // return true;
- // }
- // else
- // return false;
- //
- // }
- /**
- * Deletes a set of files that are named in an index file located relative
- * to the plugin's installation location.
- *
- * @param plugin
- * The plugin containing the indexed file Must not be null.
- * @param sourcePath -
- * relative path of the indexed file passing a null in has the
- * same effect as passing a "." in
- * @param indexFilePath -
- * the indexed filename Must not be null
- * @param targetPath -
- * path containing the files named in the indexed file Must not
- * be null, this path must end with a trailing separator
- * @param progressMonitor
- */
- // public static void deleteIndexFilesFromOS (
- // Plugin plugin,
- // IPath indexFilePath,
- // IPath targetPath
- // )
- // throws IOException {
- // InputStream input = plugin.openStream(indexFilePath);
- // Enumeration filenames = StringUtils.parseFilenamesFromStream(input);
- // while (filenames.hasMoreElements()) {
- // File targetFile =
- // targetPath.append((String)filenames.nextElement()).toFile();
- // if (targetFile.exists())
- // targetFile.delete();
- // }
- // }
- /**
- * Returns a URI reference to the given Eclipse resource, or null if no such
- * reference can be determined (for example, if the resource does not exist
- * in the underlying filesystem).
- *
- * @param resource
- * The resource.
- * @return The URI as a string, or null if there is no URI to the resource.
- */
- public static String getResourceURI(IResource resource) {
- String uri = null;
- IPath location = resource.getLocation();
- if (location != null) {
- uri = "file:" + location.toString();
- }
- return uri;
- }
-
- /**
- * Returns a URI reference to the given Eclipse resource using the
- * "platform:" protocol, or null if no such reference can be determined (for
- * example, if the resource does not exist in the underlying filesystem).
- *
- * @param resource
- * The resource.
- * @return The URI as a string, or null if there is no URI to the resource.
- */
- public static String getPlatformResourceURI(IResource resource) {
- String uri = null;
- IPath location = resource.getFullPath();
- if (location != null) {
- uri = "platform:/resource" + location.toString();
- }
- return uri;
- }
-
- /**
- * Returns the default binding namespace string given a Java bean name
- * (using the convention used by CTC in GM). e.g. Java bean MyClass result
- * in binding namespace of
- * "http://www.myclass.com/definitions/MyClassRemoteInterface"
- *
- * @param beanName
- * The java bean.
- * @return The binding namespace as a string.
- */
- public static String getBindingNamespace(String beanName) {
- return "http://www." + beanName.toLowerCase() + ".com/definitions/"
- + beanName + "RemoteInterface";
- }
-
- /**
- * Returns the default schema namespace string given a Java bean name (using
- * the convention used by CTC in GM). e.g. Java bean MyClass result in
- * schema namespace of
- * "http://www.myclass.com/schemas/MyClassRemoteInterface"
- *
- * @param beanName
- * The java bean.
- * @return The schemas namespace as a string.
- */
- public static String getSchemaNamespace(String beanName) {
- return "http://www." + beanName.toLowerCase() + ".com/schemas/"
- + beanName + "RemoteInterface";
- }
-
- // public static Vector getThreeStateFileOptions() {
- // Vector options = new Vector();
- // options.add(new
- // StatusOption(IStatusDialogConstants.YES_ID,IStatusDialogConstants.YES_LABEL,"",""));
- // options.add(new
- // StatusOption(IStatusDialogConstants.YES_TO_ALL_ID,IStatusDialogConstants.YES_TO_ALL_LABEL,"",""));
- // options.add(new
- // StatusOption(IStatusDialogConstants.CANCEL_ID,IStatusDialogConstants.CANCEL_LABEL,"",""));
- // return options;
- // }
-
- //----------------------------------------------------------------------
-
- /**
- * Gets the SOAP rpcrouter servlet URL for the service project
- *
- * @param project
- * The project.
- * @param serverFactoryId
- * The server factory id
- * @param server
- * The server
- * @return The URL, possibly null.
- */
-
- public static String getServletURL(IProject project,
- String serverFactoryId, IServer server) {
- return getServletURL(getWebProjectURL(project, serverFactoryId, server));
- }
-
- public static String getServletURL(String webProjectURL) {
- if (webProjectURL == null)
- return null;
- else
- return webProjectURL + SERVLET_EXT;
- }
-
- /**
- * Gets the client Web project name
- *
- * @param projectName
- * The project name to base on.
- * @param typeId the webservice type id.
- * @return The client Web project name.
- *
- * @deprecated
- */
- public static String getClientWebProjectName(String projectName, String typeId)
- {
- String baseClientWebProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
- IPath projectPath;
- IProject project;
- boolean foundWebProject = false;
- int i = 1;
-
- if( isSkeletonEJBType( typeId ) )
- {
- // For the skeleton EJB scenario we need to create a slightly different
- // base name. When the EJB project is created another project
- // is created with "Client" tacked onto the end. We will
- // add "WS" to our client so we don't collide with the other
- // client project.
- baseClientWebProjectName = projectName + "WS" + DEFAULT_CLIENT_WEB_PROJECT_EXT;
- }
-
- String clientWebProjectName = baseClientWebProjectName;
-
- while (!foundWebProject)
- {
- projectPath = new Path(clientWebProjectName).makeAbsolute();
- project = ResourceUtils.getProjectOf(projectPath);
-
- if (project.exists() && !ResourceUtils.isWebProject(project))
- {
- clientWebProjectName = baseClientWebProjectName + i;
- i++;
- }
- else
- {
- foundWebProject = true;
- }
- }
-
- return clientWebProjectName;
- }
-
- public static String[] getClientProjectComponentName(String projectName, String componentName, boolean isEJB)
- {
- String clientProjectName = null;
- String clientComponentName = null;
- if (isEJB)
- {
- clientProjectName = projectName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
- clientComponentName = componentName + DEFAULT_CLIENT_EJB_PROJECT_EXT;
- }
- else
- {
- clientProjectName = projectName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-// String baseName = clientProjectName;
- clientComponentName = componentName + DEFAULT_CLIENT_WEB_PROJECT_EXT;
-// String baseCompName = clientComponentName;
- }
-
-// boolean foundWebProject = false;
-// int i = 1;
-//
-// while (!foundWebProject)
-// {
-// IPath projectPath = new Path(clientProjectName).makeAbsolute();
-// IProject project = ResourceUtils.getProjectOf(projectPath);
-//
-// if (project.exists())
-// {
-// clientProjectName = baseName + i;
-// clientComponentName = baseCompName + i;
-// i++;
-// }
-// else
-// {
-// foundWebProject = true;
-// }
-// }
-
- return new String[]{clientProjectName, clientComponentName};
- }
-
- /**
- *
- * @param typeID
- * @return
- *
- * @deprecated
- */
- public static boolean isSkeletonEJBType( String typeID )
- {
- return typeID.equals( "org.eclipse.jst.ws.type.wsdl.ejb" );
- }
-
- public static String getDefaultEJBProjectName() {
- return DEFAULT_EJB_PROJECT_NAME;
- }
-
- public static String getDefaultEJBComponentName() {
- return DEFAULT_EJB_COMPONENT_NAME;
- }
-
- public static String getDefaultWebProjectName() {
- return DEFAULT_WEB_PROJECT_NAME;
- }
-
- public static String getDefaultWebComponentName() {
- return DEFAULT_WEB_COMPONENT_NAME;
- }
-
- public static String getDefaultClientExtension() {
- return DEFAULT_CLIENT_WEB_PROJECT_EXT;
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- */
- public static String getRouterProjectName(String projectName) {
- return projectName + DEFAULT_ROUTER_PROJECT_EXT;
- }
-
- public static String getDefaultServiceEARProjectName() {
- return DEFAULT_SERVICE_EAR_PROJECT_NAME;
- }
-
- public static String getDefaultServiceEARComponentName() {
- return DEFAULT_SERVICE_EAR_COMPONENT_NAME;
- }
-
- public static String getDefaultClientEARProjectName() {
- return DEFAULT_CLIENT_EAR_PROJECT_NAME;
- }
-
- public static String getDefaultClientEARComponentName() {
- return DEFAULT_CLIENT_EAR_COMPONENT_NAME;
- }
-}
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
deleted file mode 100644
index 8e02827..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/SelectionToResource.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-
-public class SelectionToResource implements Transformer
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
- */
- public Object transform(Object value)
- {
- IStructuredSelection selection = (IStructuredSelection)value;
- IResource resource = null;
-
- if( selection != null )
- {
- Object object = selection.getFirstElement();
-
- if( object != null )
- {
- if( object instanceof IResource)
- {
- resource = (IResource)object;
- }
- else if( object instanceof ICompilationUnit )
- {
- ICompilationUnit compUnit = (ICompilationUnit)object;
-
- try
- {
- resource = compUnit.getCorrespondingResource();
- }
- catch( JavaModelException exc)
- {
- }
- }
- else if( object instanceof EnterpriseBean )
- {
- EnterpriseBean ejbBean = (EnterpriseBean)object;
- IProject ejbProject = ProjectUtilities.getProject( ejbBean );
-
- if( ejbProject != null )
- {
- resource = ejbProject;
- }
- }
- }
- }
-
- return resource;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
deleted file mode 100644
index 5f88154..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/ServerUtils.java
+++ /dev/null
@@ -1,726 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.util.Arrays;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Vector;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.servertarget.IServerTargetConstants;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.MessageUtils;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.IURLProvider;
-
-/**
- * This class contains useful methods for working with Server plugin functions
- */
-public final class ServerUtils {
-
- private MessageUtils msgUtils_;
-
- private Hashtable serverIdToLabel_;
-
- private Hashtable serverLabelToId_;
-
- private static ServerUtils instance_;
-
- public static ServerUtils getInstance() {
- if (instance_ == null) {
- instance_ = new ServerUtils();
- }
- return instance_;
-
- }
-
- public ServerUtils() {
- String pluginId = "org.eclipse.jst.ws";
- msgUtils_ = new MessageUtils(pluginId + ".plugin", this);
- }
-
- // Gets the Server labels given the server factory id
- public void getServerLabelsAndIds() {
- serverIdToLabel_ = new Hashtable();
- serverLabelToId_ = new Hashtable();
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int idx = 0; idx < serverTypes.length; idx++) {
-
- IServerType serverType = (IServerType) serverTypes[idx];
-
- String id = serverType.getId();
- String serverLabel = serverType.getName();
- if (!(id == null) && !(serverLabel == null)) {
- serverIdToLabel_.put(id, serverLabel);
- serverLabelToId_.put(serverLabel, id);
- }
- }
- }
-
- public String getServerLabelForId(String factoryId) {
- if (serverIdToLabel_ == null)
- this.getServerLabelsAndIds();
- return (String) serverIdToLabel_.get(factoryId);
- }
-
- public String getServerIdForLabel(String factoryLabel) {
- if (serverLabelToId_ == null)
- this.getServerLabelsAndIds();
- return (String) serverLabelToId_.get(factoryLabel);
- }
-
- public Status modifyModules(Environment env, IServer server,
- IModule module, boolean add, IProgressMonitor monitor) {
-
- IServerWorkingCopy wc = null;
- Status status = new SimpleStatus("");
- try {
-
- if (module == null || !module.getProject().exists()) {
- return status;
- }
-
- // check if module is a true Java project
- if (module instanceof IModule) {
- IModule pm = (IModule) module;
- if (pm != null) {
- IProject project = pm.getProject();
- if (project == null
- || ResourceUtils.isTrueJavaProject(project)) {
- return status;
- }
- }
- }
-
- wc = server.createWorkingCopy();
- if (wc != null) {
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
-
- List list = Arrays.asList(server.getModules());
- if (add) {
- if (!list.contains(module)) {
- ServerUtil.modifyModules(wc, new IModule[] { module },
- new IModule[0], monitor);
- }
- } else { // removes module
- if (list.contains(module)) {
- ServerUtil.modifyModules(wc, new IModule[0],
- new IModule[] { module }, monitor);
- }
- }
- } else {
- // handle case of Null WC; non-issue for now
- }
- } catch (CoreException ce) {
- status = new SimpleStatus("", msgUtils_
- .getMessage("MSG_ERROR_SERVER"), Status.ERROR, ce);
- env.getStatusHandler().reportError(status);
- return status;
- } finally {
- if (wc != null) {
- // Always saveAll and release the serverWorkingCopy
- try {
- wc.saveAll(true, monitor);
- } catch (CoreException cex) {
- status = new SimpleStatus("", msgUtils_
- .getMessage("MSG_ERROR_SERVER"), Status.ERROR, cex);
- env.getStatusHandler().reportError(status);
- return status;
- }
- }
- }
- return status;
- }
-
- public static IServer getServerForModule(IModule module, String serverTypeId,
- IServer server, boolean create, IProgressMonitor monitor) {
- if (server != null)
- return server;
- else
- return getServerForModule(module, serverTypeId, create, monitor);
- }
-
- public static IServer getServerForModule(IModule module,
- String serverTypeId, boolean create, IProgressMonitor monitor) {
- try {
-
- IServer[] servers = ServerUtil.getServersByModule(module, monitor);
-
- if (servers != null && servers.length > 0) {
- if (serverTypeId == null || serverTypeId.length() == 0)
- return servers[0]; // WSAD v4 behavior
-
- for (int i = 0; i < servers.length; i++) {
- if (servers[i].getServerType().getId().equalsIgnoreCase(
- serverTypeId))
- return servers[i];
- }
- }
-
- return createServer(module, serverTypeId, monitor);
-
- } catch (Exception e) {
- return null;
- }
- }
-
- public static IServer getServerForModule(IModule module) {
- try {
- IServer[] servers = ServerUtil.getServersByModule(module, null);
- return ((servers != null && servers.length > 0) ? servers[0] : null);
- } catch (Exception e) {
- return null;
- }
- }
-
- /**
- *
- * @param env
- * @param module
- * @param serverTypeId
- * @param monitor
- * @return
- *
- * @deprecated
- */
- public IServer createServer(Environment env, IModule module,
- String serverTypeId, IProgressMonitor monitor) {
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- serverWC = serverType.createServer(serverTypeId, null, monitor);
- try {
- if (serverWC != null) {
- server = serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- Status status = new SimpleStatus("", msgUtils_
- .getMessage("MSG_ERROR_SERVER"), Status.ERROR, ce);
- env.getStatusHandler().reportError(status);
- return null;
- }
-
- if (server != null) {
-
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
-
- if (module != null && module.getProject().exists()) {
- IModule[] parentModules = server.getRootModules(module,
- monitor);
- if (parentModules != null && parentModules.length != 0) {
- module = (IModule) parentModules[0];
- }
- serverWC.modifyModules(new IModule[] { module },
- new IModule[0], monitor);
- }
-
- }
-
- return server;
- } catch (Exception e) {
- Status status = new SimpleStatus("", msgUtils_
- .getMessage("MSG_ERROR_SERVER"), Status.ERROR, e);
- env.getStatusHandler().reportError(status);
- return null;
- } finally {
- try {
- if (serverWC != null) {
- serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- Status status = new SimpleStatus("", msgUtils_
- .getMessage("MSG_ERROR_SERVER"), Status.ERROR, ce);
- env.getStatusHandler().reportError(status);
- return null;
- }
- }
- }
-
- /**
- * createServer This creates a server but does not report errors. @param
- * module
- * @param serverTypeId
- * @param monitor progress monitor
- * @return IServer returns null if unsuccessful
- *
- * @deprecated
- */
- public static IServer createServer(IModule module, String serverTypeId,
- IProgressMonitor monitor) {
- IServerWorkingCopy serverWC = null;
- IServer server = null;
- try {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- serverWC = serverType.createServer(serverTypeId, null, monitor);
-
- try {
- if (serverWC != null) {
- server = serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- return null;
- }
-
- if (server != null) {
-
-// Object x = server.getAdapter(IRunningActionServer.class);
-// if (x != null && x instanceof IRunningActionServer) {
-// int state = server.getServerState();
-// if (state == IServer.STATE_STOPPED
-// || state == IServer.STATE_UNKNOWN) {
-// String mode = ILaunchManager.RUN_MODE;
-// server.synchronousStart(mode, monitor);
-// }
-// }
- if (module != null) {
- IModule[] parentModules = server.getRootModules(module,
- monitor);
- if (parentModules != null && parentModules.length != 0) {
- module = (IModule) parentModules[0];
- }
- serverWC.modifyModules(new IModule[] { module },
- new IModule[0], monitor);
- }
-
- }
-
- return server;
- } catch (Exception e) {
- return null;
- } finally {
- try {
- if (serverWC != null) {
- serverWC.saveAll(true, monitor);
- }
- } catch (CoreException ce) {
- return null;
- // handler core exception
- }
- }
- }
-
- public static String[] getServerTypeIdsByModule(IVirtualComponent component) {
- IProject project = component.getProject();
- String[] serverIds = null;
-
- if (project != null) {
- IServer[] servers = ServerUtil.getServersByModule(getModule(project, component.getName()), null);
- if (servers != null) {
- serverIds = new String[servers.length];
-
- for (int index = 0; index < servers.length; index++) {
- serverIds[index] = servers[index].getId();
-
- }
- }
- }
-
- if (serverIds == null) {
- serverIds = new String[0];
- }
-
- return serverIds;
- }
-
- /**
- * @param project
- * @return
- * @deprecated should be using getServerTypeIdsByModule( IVirtualComponent )
- */
- public static String[] getServerTypeIdsByModule(IProject project) {
- Vector serverIds = new Vector();
- if (project != null) {
- IServer[] servers = ServerUtil.getServersByModule(ResourceUtils
- .getModule(project), null);
- if (servers != null && servers.length > 0) {
- for (int i = 0; i < servers.length; i++) {
- serverIds.add(servers[i].getId());
- }
- }
- }
- return (String[]) serverIds.toArray(new String[serverIds.size()]);
- }
-
- public static IModule getModule(IProject project, String componentName) {
- IModule[] modules = ServerUtil.getModules(project);
- IModule moduleFound = null;
-
- for (int index = 0; index < modules.length; index++) {
- if (modules[index].getName().equals(componentName)) {
- moduleFound = modules[index];
- break;
- }
- }
-
- return moduleFound;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * component in a server instance or null if the project has no Web nature
- * or has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- */
- public static String getWebComponentURL(IProject project, String componentName) {
- String webProjectURL = null;
- IModule module = getModule(project, componentName);
- if (module != null) {
- IServer serverInstance = getServerForModule(module);
- if (serverInstance != null) {
- IURLProvider urlProvider = (IURLProvider) serverInstance.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- }
- else {
- IRuntime projectTarget = ServerCore.getProjectProperties(project).getRuntimeTarget();
- if (projectTarget!=null)
- {
- String projectTargetId = projectTarget.getRuntimeType().getId();
- String serverFactoryId = getFactoryIdFromRuntimeTargetId(projectTargetId);
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- try {
- if (serverType!=null) {
- IServerWorkingCopy serverWC = serverType.createServer(null, null, projectTarget, null);
- IURLProvider urlProvider = (IURLProvider) serverWC.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- }
- } catch(CoreException ce){
- Logger.getLogger().log(ce);
- }
-
- }
- }
- }
- return webProjectURL;
- }
-
- /**
- * Returns the URL string corresponding to the web server module root of the
- * project in a server instance or null if the project has no Web nature or
- * has no association to a server instance.
- *
- * @param project
- * The project.
- * @return The web server module root URL or null if the project has no Web
- * nature or has no association to a server instance.
- */
- public static String getWebComponentURL(IProject project,
- String componentName, String serverFactoryId, IServer server) {
-
- String webProjectURL = null;
- IModule module = getModule(project, componentName);
- if (module != null) {
- IServer serverInstance = ServerUtils.getServerForModule(module, serverFactoryId, server, true, new NullProgressMonitor());
- if (serverInstance != null) {
- IURLProvider urlProvider = (IURLProvider) serverInstance.loadAdapter(IURLProvider.class, null);
- if (urlProvider!=null) {
- URL url = urlProvider.getModuleRootURL(module);
- if (url != null) {
- String s = url.toString();
- webProjectURL = (s.endsWith("/") ? s.substring(0, s.length() - 1) : s);
- }
- }
- }
- }
- return webProjectURL;
- }
-
- public static String getEncodedWebComponentURL(IProject project, String componentName) {
- String url = getWebComponentURL(project, componentName);
- if (url != null) {
- int index = url.lastIndexOf('/');
- if (index != -1) {
- StringBuffer encodedURL = new StringBuffer();
- encodedURL.append(url.substring(0, index + 1));
- try {
- String ctxtRoot = URLEncoder.encode(url.substring(index + 1, url.length()), "UTF-8");
- int plusIndex = ctxtRoot.indexOf('+');
- while (plusIndex != -1) {
- StringBuffer sb = new StringBuffer();
- sb.append(ctxtRoot.substring(0, plusIndex));
- sb.append("%20");
- sb.append(ctxtRoot.substring(plusIndex + 1, ctxtRoot
- .length()));
- ctxtRoot = sb.toString();
- plusIndex = ctxtRoot.indexOf('+');
- }
- encodedURL.append(ctxtRoot);
- }catch (IOException io){
- //handler exception
- }
- url = encodedURL.toString();
- }
- }
- return url;
- }
-
- public static IServer getDefaultExistingServer(IVirtualComponent component) {
- IProject project = component.getProject();
- IModule module = getModule(project, component.getName());
- IServer preferredServer = ServerCore.getDefaultServer(module);
- if (preferredServer != null)
- return preferredServer;
-
- IServer[] configuredServers = ServerUtil.getServersByModule(module,
- null);
-
- if (configuredServers != null && configuredServers.length > 0) {
- preferredServer = configuredServers[0];
- } else {
- IServer[] nonConfiguredServers = ServerUtil
- .getAvailableServersForModule(module, false, null);
-
- if (nonConfiguredServers != null
- && nonConfiguredServers.length > 0) {
- preferredServer = nonConfiguredServers[0];
- }
- }
-
- return preferredServer;
- }
-
- /**
- * @param project
- * @return
- * @deprecated should be using getDefaultExistingServer( IVirtualComponent )
- */
- public static IServer getDefaultExistingServer(IProject project) {
-
- IModule[] modules = ServerUtil.getModules(project);
- IServer preferredServer = null;
- if (modules.length > 0){
- preferredServer = ServerCore.getDefaultServer(modules[0]);
- }
-
- if (preferredServer != null)
- return preferredServer;
-
- IServer[] configuredServers = ServerUtil.getServersByModule(
- ResourceUtils.getModule(project), null);
- if (configuredServers != null && configuredServers.length > 0) {
- return configuredServers[0];
- }
-
- IServer[] nonConfiguredServers = ServerUtil
- .getAvailableServersForModule(ResourceUtils.getModule(project),
- false, null);
- if (nonConfiguredServers != null && nonConfiguredServers.length > 0) {
- return nonConfiguredServers[0];
- }
- return null;
- }
-
- /*
- * @param moduleType - ad defined in IServerTargetConstants (i.e. EAR_TYPE,
- * WEB_TYPE, etc.) @param j2eeVersion String representation of the int
- * values in J2EEVersionConstants i.e. "12" or "13" or "14" @return String
- * the id of the server target - to be used in project creation operations.
- */
- public static String getServerTargetIdFromFactoryId(String serverFactoryId,
- String moduleType, String j2eeVersion) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType == null)
- return null;
-
- String serverRuntimeTypeId = serverType.getRuntimeType().getId();
-
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(moduleType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- String thisRuntimeTypeId = runtime.getRuntimeType().getId();
- if (thisRuntimeTypeId.equals(serverRuntimeTypeId)) {
- return runtime.getId();
- }
- }
-
- return null;
- }
-
- /*
- * @param serverFactoryId the server's factory id @returns the runtime type
- * id given the server's factory id. Returns a blank String if the no
- * ServerType exists for the given factory id.
- */
- public static String getRuntimeTargetIdFromFactoryId(String serverFactoryId) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType != null) {
- String serverRuntimeId = serverType.getRuntimeType().getId();
- return serverRuntimeId;
- } else
- return "";
- }
-
- public static String getFactoryIdFromRuntimeTargetId(String runtimeTargetId){
- IServerType[] serverTypes = ServerCore.getServerTypes();
- for (int i=0;i<serverTypes.length;i++) {
- IRuntimeType runtimeTyp = serverTypes[i].getRuntimeType();
- if (runtimeTyp!=null){
- if (runtimeTyp.getId().equals(runtimeTargetId))
- return serverTypes[i].getId();
- }
- }
- return "";
-
- }
-
-
- /*
- * @param serverFactoryId the server's factory id @returns the server type
- * id given the server's factory id. Returns a blank String if the no
- * ServerType exists for the given factory id.
- */
- public static String getServerTypeIdFromFactoryId(String serverFactoryId) {
- IServerType serverType = ServerCore.findServerType(serverFactoryId);
- if (serverType != null) {
- String serverTypeId = serverType.getId();
- return serverTypeId;
- } else
- return "";
- }
-
- /*
- * @param j2eeVersion String representation of the int values in
- * J2EEVersionConstants i.e. "12" or "13" or "14"
- */
- public static boolean isTargetValidForEAR(String runtimeTargetId,
- String j2eeVersion) {
- if (runtimeTargetId == null)
- return false;
-
- String earModuleType = IServerTargetConstants.EAR_TYPE;
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(earModuleType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- String thisId = runtime.getRuntimeType().getId();
- if (thisId.equals(runtimeTargetId))
- return true;
- }
-
- return false;
- }
-
- /*
- * @param j2eeVersion String representation of the int values in
- * J2EEVersionConstants i.e. "12" or "13" or "14" @param the project type
- * from IServerTargetConstants
- */
- public static boolean isTargetValidForProjectType(String runtimeTargetId,
- String j2eeVersion, String projectType) {
- if (runtimeTargetId == null)
- return false;
-
- if (projectType == null || projectType.length() == 0)
- return false;
-
- String stJ2EEVersion = ServerUtils.getServerTargetJ2EEVersion(j2eeVersion);
- List runtimes = Arrays.asList(ServerUtil.getRuntimes(projectType, stJ2EEVersion));
- for (int i = 0; i < runtimes.size(); i++) {
- IRuntime runtime = (IRuntime) runtimes.get(i);
- String thisId = runtime.getRuntimeType().getId();
- if (thisId.equals(runtimeTargetId))
- return true;
- }
-
- return false;
- }
-
- public static String getServerTargetJ2EEVersion(String j2eeVersion) {
-
- if (j2eeVersion == null || j2eeVersion.length() == 0)
- return null;
-
- int j2eeVersionInt = Integer.parseInt(j2eeVersion);
- switch (j2eeVersionInt) {
- case (J2EEVersionConstants.J2EE_1_2_ID):
- return IServerTargetConstants.J2EE_12;
- case (J2EEVersionConstants.J2EE_1_3_ID):
- return IServerTargetConstants.J2EE_13;
- case (J2EEVersionConstants.J2EE_1_4_ID):
- return IServerTargetConstants.J2EE_14;
- default:
- return null;
- }
- }
-
- //Converts a module type from J2EEUtils to a module type like
- //the one in IServerTargetConstants.
- public static String getServerTargetModuleType(int moduleType)
- {
- switch (moduleType)
- {
- case J2EEUtils.WEB :
- return IServerTargetConstants.WEB_TYPE;
- case J2EEUtils.EJB :
- return IServerTargetConstants.EJB_TYPE;
- case J2EEUtils.APPCLIENT :
- return IServerTargetConstants.APP_CLIENT_TYPE;
- case J2EEUtils.EAR :
- return IServerTargetConstants.EAR_TYPE;
- default:
- return null;
-
- }
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
deleted file mode 100644
index 52f0fe9..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StatusObjectHandler.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-
-public class StatusObjectHandler
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- private static final int MAX_DETAILS = 16;
-
- public static IStatus generateTreeStatus (IStatus status)
- {
- //
- // There could be lots of Throwables, CoreExceptions,
- // WrappedExceptions and IStatus objects beneath the
- // given status. Find them.
- //
- LinkedList statusList = new LinkedList();
- appendStatus(MAX_DETAILS, statusList, status, status.getSeverity());
- if (statusList.size() > 0)
- {
- IStatus newStatus = (IStatus)statusList.removeFirst();
- if (statusList.size() > 0)
- {
- IStatus[] secondaryStatusArray = new IStatus[statusList.size()];
- int n = 0;
- Iterator i = statusList.iterator();
- while (i.hasNext())
- {
- secondaryStatusArray[n++] = (IStatus)i.next();
- }
- newStatus = new MultiStatus(status.getPlugin(),status.getCode(),secondaryStatusArray,status.getMessage(),status.getException());
- }
- return newStatus;
- }
- else
- return null;
- }
-
- //
- // Appends zero or more IStatus objects to the list of IStatus objects
- // based upon an IStatus.
- //
- private static int appendStatus ( int max, List statusList, IStatus status, int severity )
- {
- if (max > 0 && status != null)
- {
- //
- // Append an IStatus object for the given status' message.
- //
- if (status.getMessage() != null)
- {
- max = append(statusList,max,severity,status.getPlugin(),status.getCode(),status.getMessage(),status.getException());
- }
- //
- // Append the IStatus' Throwable, if any.
- //
- max = appendThrowable(max,statusList,status.getException(),severity);
- //
- // If the IStatus is a multi status, append the children.
- //
- IStatus[] children = status.getChildren();
- for (int i=0; i<children.length && max>0; i++)
- {
- max = appendStatus(max,statusList,children[i],severity);
- }
- }
- return max;
- }
-
- //
- // Appends zero or more IStatus objects to the list of IStatus objects
- // based upon a Throwable. WrappedExceptions and CoreExceptions are
- // given special treatment.
- //
- private static int appendThrowable ( int max, List statusList, Throwable throwable, int severity )
- {
- if (max > 0 && throwable != null)
- {
- //
- // Append an IStatus object for the exception's message.
- //
- if (throwable.getLocalizedMessage() != null)
- {
- max = append(statusList,max,severity,WebServicePlugin.ID,0,throwable.getLocalizedMessage(),throwable);
- }
- //
- // If the exception is a WrappedException, append the wrapped Exception.
- //
- if (throwable instanceof WrappedException)
- {
- WrappedException wexc = (WrappedException)throwable;
- max = appendThrowable(max,statusList,wexc.exception(),severity);
- }
- //
- // If the exception is a CoreException, append the enclosed IStatus.
- //
- if (throwable instanceof CoreException)
- {
- CoreException cexc = (CoreException)throwable;
- max = appendStatus(max,statusList,cexc.getStatus(),severity);
- }
- }
- return max;
- }
-
- //
- // Creates and appends an IStatus to the list of IStatus objects.
- //
- private static int append ( List statusList, int max, int severity, String id, int code, String message, Throwable throwable )
- {
- if (max > 0)
- {
- IStatus status = new Status(severity,id,code,message,throwable);
- statusList.add(status);
- max--;
- }
- return max;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
deleted file mode 100644
index 9dc1a6e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringToIProjectTransformer.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.common;
-
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.wst.command.internal.provisional.env.core.data.Transformer;
-
-
-/**
- * Transfroms a java.lang.String to an org.eclipse.core.runtime.IProject
- */
-public class StringToIProjectTransformer implements Transformer
-{
- /* (non-Javadoc)
- * @see org.eclipse.wst.command.internal.provisional.env.core.data.Transformer#transform(java.lang.Object)
- * @param Object This must be a java.lang.String
- * @return Object Returns an IProject
- */
-
- public Object transform(Object value)
- {
- String project = (String)value;
- int slashIndex = project.indexOf( '/' );
- String projectName = project;
-
- if( slashIndex != -1 )
- {
- projectName = project.substring( 0, slashIndex );
- }
-
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
deleted file mode 100644
index 5d9fd9b..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/common/StringUtils.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.common;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Enumeration;
-import java.util.Vector;
-
-import org.eclipse.jdt.core.JavaConventions;
-
-/**
- * This class contains some useful string utilities that are not provided by
- * either String or StringBuffer.
- *
- * @author Peter Moogk
- * @date July 13, 2000
-**/
-public final class StringUtils
-{
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * The platform-specific line separator.
- */
- public static final String NEWLINE = System.getProperty("line.separator");
-
- private StringUtils(){};
-
- /**
- * This method splits a single line of text into multiple lines
- * based on a maximum line length. The method will try to fit as
- * many words as possible onto a line without exceeding the maximum
- * line length. Note: the only case where a line might exceed the
- * maximum is if a single word is longer than the maximum.
- **/
- public static String[] splitter( String text, int max_length )
- {
- Vector return_text = new Vector(20);
- String[] return_str;
- int index = 0;
-
- while( index < text.length() )
- {
- String str = text.substring( index, Math.min( max_length + index,
- text.length() ) );
- int space_index = str.lastIndexOf( " " );
-
- if( index + str.length() < text.length() &&
- text.charAt( index + str.length() - 1 ) != ' ' &&
- text.charAt( index + str.length() ) != ' ' &&
- space_index != -1 )
- {
- return_text.addElement( str.substring( 0, space_index ) );
- index += space_index + 1;
- }
- else
- {
- return_text.addElement( str.trim() );
- index += str.length();
- }
- }
-
- return_str = new String[return_text.size()];
-
- for( index = 0; index < return_text.size(); index++ )
- {
- return_str[index] = (String)(return_text.elementAt(index));
- }
-
- return return_str;
- }
-
- /**
- * This method returns a string with a repeated number of characters.
- **/
- static public String repeat( char the_char, int count )
- {
- StringBuffer buf = new StringBuffer( count );
-
- for( int index = 0; index < count; index++ )
- {
- buf.append( the_char );
- }
-
- return buf.toString();
- }
-
- /**
- * This method flattens an array of arguments to a string.
- * The method respects embedded whitespace and quotes.
- * <ul>
- * <li>Any argument with embedded whitespace will be flattened out
- * with enclosing quotes. For example, the single argument
- * <u>Hello World</u>
- * will be returned as
- * <u>"Hello World"</u>.
- * <li>Any argument with quotes will be flattened out with the
- * quotes escaped. For example, the single argument
- * <u>"Happy days"</u>
- * will be returned as
- * <u>\"Happy days\"</u>.
- * </ul>
- * @param arguments The array of strings to flatten.
- * @return the flattened string.
- */
- static public String flattenArguments ( String[] arguments )
- {
- StringBuffer buf = new StringBuffer();
-
- for (int i=0; i<arguments.length; i++)
- {
- //
- // Append a separator (except the first time).
- //
- if (i > 0) buf.append(' ');
-
- //
- // Look for whitespace.
- //
- boolean whitespace = false;
- char[] chars = arguments[i].toCharArray();
- for (int j=0; !whitespace && j<chars.length; j++)
- {
- if (Character.isWhitespace(chars[j]))
- {
- whitespace = true;
- }
- }
-
- //
- // Append the argument, quoted as necessary.
- //
- if (whitespace) buf.append('"');
- for (int j=0; j<chars.length; j++)
- {
- if (chars[j] == '"') buf.append('\\');
- buf.append(chars[j]);
- }
- if (whitespace) buf.append('"');
- }
-
- return buf.toString();
- }
-
- /**
- * This method parses whitespace-delimitted filenames from
- * the given <code>input</code> stream. <b>Limitation:</b>
- * Quoted filenames or filenames with embedded whitespace
- * are not currently supported.
- * @param input The input stream.
- * @return An enumeration of filenames from the stream.
- */
- static public Enumeration parseFilenamesFromStream ( InputStream input )
- throws IOException
- {
- Vector filenames = new Vector(64,64);
- StringBuffer buffer = null;
- byte state = STATE_WS;
- int ic = input.read();
- while (ic >= 0)
- {
- char c = (char)ic;
- switch (state)
- {
- case STATE_WS:
- if (!Character.isWhitespace(c))
- {
- buffer = new StringBuffer();
- buffer.append(c);
- state = STATE_NWS;
- }
- break;
- case STATE_NWS:
- if (!Character.isWhitespace(c))
- {
- buffer.append(c);
- }
- else
- {
- String filename = buffer.toString();
- filenames.add(filename);
- buffer = null;
- state = STATE_WS;
- }
- break;
- default:
- break;
- }
- ic = input.read();
- }
- return filenames.elements();
- }
-
- private static final byte STATE_WS = 0;
- private static final byte STATE_NWS = 1;
-
-
- /**
- * Returns true is the type passed in is a primtive java type
- * @param class name String
- * @return true is primitive type
- */
- public static boolean isPrimitiveType(String typeName)
- {
-
- if (typeName.equalsIgnoreCase("boolean") ||
- typeName.equalsIgnoreCase("byte") ||
- typeName.equalsIgnoreCase("double") ||
- typeName.equalsIgnoreCase("float") ||
- typeName.equalsIgnoreCase("int") ||
- typeName.equalsIgnoreCase("long") ||
- typeName.equalsIgnoreCase("short") ||
- typeName.equalsIgnoreCase("char"))
- return true;
- return false;
-
- }
-
- /**
- * The method replace the characters that are allowed in URIs
- * and not allowed in Java class names to an underscore ('_')
- * @param URI String
- * @return valid Java class name String
- */
- public static String URI2ClassName( String uri ) {
- String className = uri;
- for ( int i = 0; i < URI_SYMBOLS.length; i++ ) {
- className = className.replace ( URI_SYMBOLS[i], UNDERSCORE );
- }
- return className;
- }
-
- private static final char[] URI_SYMBOLS = {'-', '~', '#', '/', '.'};
- private static final char UNDERSCORE = '_';
-
-
- /**
- * This returns a valid Java identifier based on the given name.
- * (follows JAX-RPC 1.0 Public Review Draft 2 recommendations)
- */
- public static String javaIdentifierFor(String localName)
- {
- StringBuffer result = new StringBuffer();
- boolean skipped = false;
- for (int i = 0, length = localName.length(); i < length; ++i)
- {
- char character = localName.charAt(i);
- if (Character.isJavaIdentifierPart(character) && !isDelimiter(character))
- {
- if (skipped && result.length() != 0)
- {
- character = Character.toUpperCase(character);
- }
- result.append(character);
- skipped = false;
- }
- else
- {
- skipped =true;
- }
- }
-
- if (!JavaConventions.validateIdentifier(result.toString()).isOK())
- {
- result.insert(0, "_");
- }
-
- return result.toString();
- }
-
- private static boolean isDelimiter(char character)
- {
- return "\u002D\u002E\u003A\u005F\u00B7\u0387\u06DD\u06DE".indexOf(character) != -1;
- }
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java
deleted file mode 100644
index b1cf57c..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentProjectTopologyContext.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentProjectTopologyContext extends PersistentContext implements ProjectTopologyContext
-{
-
-public PersistentProjectTopologyContext ()
-{
- super( WebServicePlugin.getInstance());
-}
- public void load() {
- String[] ids = ProjectTopologyDefaults.getClientTypes();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0)
- sb.append(" ");
- sb.append(ids[i]);
- }
- setDefault(PREFERENCE_CLIENT_TYPES, sb.toString());
- setDefault(PREFERENCE_USE_TWO_EARS, ProjectTopologyDefaults.isUseTwoEARs());
- }
-
- public void setClientTypes(String[] ids)
- {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0)
- sb.append(" ");
- sb.append(ids[i]);
- }
- setValue(PREFERENCE_CLIENT_TYPES, sb.toString());
- }
-
- public String[] getClientTypes()
- {
- StringTokenizer st = new StringTokenizer(getValueAsString(PREFERENCE_CLIENT_TYPES));
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++)
- s[i] = st.nextToken();
- return s;
- }
-
- public void setUseTwoEARs(boolean use)
- {
- setValue(PREFERENCE_USE_TWO_EARS, use);
- }
- public boolean isUseTwoEARs()
- {
- return getValueAsBoolean(PREFERENCE_USE_TWO_EARS);
- }
-
- public ProjectTopologyContext copy() {
- TransientProjectTopologyContext context = new TransientProjectTopologyContext();
- context.setClientTypes(getClientTypes());
- context.setUseTwoEARs(isUseTwoEARs());
- return context;
-}
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
deleted file mode 100644
index 8e6143a..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentScenarioContext.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-import java.util.StringTokenizer;
-
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestExtension;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentScenarioContext extends PersistentContext implements ScenarioContext
-{
- public PersistentScenarioContext()
- {
- super(WebServicePlugin.getInstance());
- }
-
- public void load()
- {
- ScenarioDefaults defaults = new ScenarioDefaults();
- String[] ids = defaults.getWebServiceTestTypes();
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0) sb.append(",");
- sb.append(ids[i]);
- }
- String nonJavaTestService = defaults.getNonJavaTestServiceDefault();
- setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
- setDefaultStringIfNoDefault(PREFERENCE_NON_JAVA_TEST_SERVICE, nonJavaTestService);
-
- setDefaultStringIfNoDefault(PREFERENCE_CLIENT_WEBSERVICE_TYPE, defaults.webserviceClientTypeDefault() );
- setDefaultStringIfNoDefault(PREFERENCE_WEBSERVICE_TYPE, defaults.webserviceTypeIdDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_GENERATE_PROXY, defaults.generateProxyDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, defaults.launchWebserviceExplorerDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_START_WEBSERVICE, defaults.startWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_TEST_WEBSERVICE, defaults.testWebserviceDefault() );
- setDefaultBooleanIfNoDefault(PREFERENCE_MONITOR_WEBSERVICE, defaults.getMonitorWebServiceDefault());
- setDefaultBooleanIfNoDefault(PREFERENCE_LAUNCH_SAMPLE, defaults.launchSample() );
- }
-
- public String getNonJavaTestService()
- {
- WebServiceTestRegistry registry = WebServiceTestRegistry.getInstance();
- String[] testTypes = getWebServiceTestTypes();
- for (int i = 0; i < testTypes.length; i++)
- {
- WebServiceTestExtension wse = (WebServiceTestExtension) registry
- .getWebServiceExtensionsByName(testTypes[i]);
- if (wse.testWSDL()) return testTypes[i];
- }
- return "";
- }
-
- public void setWebServiceTestTypes(String[] ids)
- {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < ids.length; i++)
- {
- if (i != 0) sb.append(",");
- sb.append(ids[i]);
- }
- setValue(PREFERENCE_WEBSERVICE_TEST_TYPES, sb.toString());
- }
-
- public String[] getWebServiceTestTypes()
- {
- StringTokenizer st = new StringTokenizer(
- getValueAsString(PREFERENCE_WEBSERVICE_TEST_TYPES), ",");
- String[] s = new String[st.countTokens()];
- for (int i = 0; i < s.length; i++)
- s[i] = st.nextToken();
- return s;
- }
-
- public ScenarioContext copy()
- {
- TransientScenarioContext context = new TransientScenarioContext();
- context.setWebServiceTestTypes(getWebServiceTestTypes());
- context.setNonJavaTestService(getNonJavaTestService());
-
- context.setClientWebServiceType( getClientWebServiceType() );
- context.setWebServiceType( getWebServiceType() );
- context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
- context.setStartWebService( getStartWebService() );
- context.setGenerateProxy( getGenerateProxy() );
- context.setTestWebService( getTestWebService() );
- context.setMonitorWebService(getMonitorWebService());
- context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
-
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
- */
- public String getClientWebServiceType()
- {
- return getValueAsString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
- }
-
- public String getClientWebServiceTypeDefault()
- {
- return getDefaultString(PREFERENCE_CLIENT_WEBSERVICE_TYPE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
- */
- public boolean getGenerateProxy()
- {
- return getValueAsBoolean(PREFERENCE_GENERATE_PROXY);
- }
-
- public boolean getGenerateProxyDefault()
- {
- return getDefaultBoolean(PREFERENCE_GENERATE_PROXY);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
- */
- public boolean getLaunchWebServiceExplorer()
- {
- return getValueAsBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
- }
-
- public boolean getLaunchWebServiceExplorerDefault()
- {
- return getDefaultBoolean(PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
- */
- public boolean getStartWebService()
- {
- return getValueAsBoolean(PREFERENCE_START_WEBSERVICE);
- }
-
- public boolean getStartWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_START_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
- */
- public boolean getTestWebService()
- {
- return getValueAsBoolean(PREFERENCE_TEST_WEBSERVICE);
- }
-
- public boolean getTestWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_TEST_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
- */
- public String getWebServiceType()
- {
- return getValueAsString(PREFERENCE_WEBSERVICE_TYPE);
- }
-
- public String getWebServiceTypeDefault()
- {
- return getDefaultString(PREFERENCE_WEBSERVICE_TYPE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
- */
- public void setClientWebServiceType(String value)
- {
- setValue( PREFERENCE_CLIENT_WEBSERVICE_TYPE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
- */
- public void setGenerateProxy(boolean value)
- {
- setValue( PREFERENCE_GENERATE_PROXY, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
- */
- public void setLaunchWebServiceExplorer(boolean value)
- {
- setValue( PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
- */
- public void setStartWebService(boolean value)
- {
- setValue( PREFERENCE_START_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
- */
- public void setTestWebService(boolean value)
- {
- setValue( PREFERENCE_TEST_WEBSERVICE, value);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
- */
- public void setWebServiceType(String value)
- {
- setValue( PREFERENCE_WEBSERVICE_TYPE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
- */
- public boolean getMonitorWebService()
- {
- return getValueAsBoolean(PREFERENCE_MONITOR_WEBSERVICE);
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return getDefaultBoolean(PREFERENCE_MONITOR_WEBSERVICE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
- */
- public void setMonitorWebService(boolean value)
- {
- setValue(PREFERENCE_MONITOR_WEBSERVICE, value);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
- */
- public boolean getLaunchSampleEnabledDefault()
- {
- return getDefaultBoolean(PREFERENCE_LAUNCH_SAMPLE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
- */
- public boolean isLaunchSampleEnabled()
- {
- return getValueAsBoolean(PREFERENCE_LAUNCH_SAMPLE);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
- */
- public void setLaunchSampleEnabled(boolean value)
- {
- setValue( PREFERENCE_LAUNCH_SAMPLE, value);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
deleted file mode 100644
index f588812..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/PersistentUDDIPreferenceContext.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.wst.command.internal.env.context.PersistentContext;
-
-
-public class PersistentUDDIPreferenceContext extends PersistentContext implements UDDIPreferenceContext
-{
- public PersistentUDDIPreferenceContext()
- {
- super(WebServicePlugin.getInstance());
- }
-
- public void load()
- {
- setDefault(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataColumnDelimiter());
- setDefault(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, UDDIPreferenceDefaults.getUddiCatDataStringDelimiter());
- }
-
- public void setUddiCatDataColumnDelimiter(String delimiter)
- {
- setValue(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER, delimiter);
- }
-
- public String getUddiCatDataColumnDelimiter()
- {
- return getValueAsString(PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER);
- }
-
- public void setUddiCatDataStringDelimiter(String delimiter)
- {
- setValue(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER, delimiter);
- }
-
- public String getUddiCatDataStringDelimiter()
- {
- return getValueAsString(PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER);
- }
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java
deleted file mode 100644
index 616d335..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyContext.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-public interface ProjectTopologyContext
-{
- /**
- * This constant String is used to lookup the preferred order of the different client types
- **/
- public static final String PREFERENCE_CLIENT_TYPES = "clientTypes";
-
- /**
- * This constant String is used to lookup the two EAR option
- **/
- public static final String PREFERENCE_USE_TWO_EARS = "useTwoEARs";
-
- public void setClientTypes(String[] ids);
- public String[] getClientTypes();
-
- public void setUseTwoEARs(boolean use);
- public boolean isUseTwoEARs();
-
- public ProjectTopologyContext copy();
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java
deleted file mode 100644
index b20c609..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ProjectTopologyDefaults.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-
-public class ProjectTopologyDefaults
-{
- public static final String[] getClientTypes()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] elements = reg.getConfigurationElementsFor("org.eclipse.jst.ws.consumption.ui", "clientProjectType");
- String[] types = new String[elements.length];
- for (int i = 0; i < types.length; i++)
- types[i] = elements[i].getAttribute("id");
- return types;
- }
-
- public static final boolean isUseTwoEARs()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
deleted file mode 100644
index 9bcbd24..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public interface ScenarioContext
-{
- public final String PREFERENCE_WEBSERVICE_TEST_TYPES = "webServiceTestTypes";
-
- public final String PREFERENCE_NON_JAVA_TEST_SERVICE= "nonJavaTestService";
-
- public final String PREFERENCE_WEBSERVICE_TYPE = "webServiceType";
-
- public final String PREFERENCE_START_WEBSERVICE = "startWebService";
-
- public final String PREFERENCE_LAUNCH_WEBSERVICE_EXPLORER = "launchWebServiceExplorer";
-
- public final String PREFERENCE_GENERATE_PROXY = "generateProxy";
-
- public final String PREFERENCE_CLIENT_WEBSERVICE_TYPE = "clientWebServiceType";
-
- public final String PREFERENCE_TEST_WEBSERVICE = "testWebService";
-
- public final String PREFERENCE_MONITOR_WEBSERVICE = "monitorWebService";
-
- public final String PREFERENCE_LAUNCH_SAMPLE = "launchSample";
-
- public String[] getWebServiceTestTypes();
- public void setWebServiceTestTypes(String[] testTypes);
-
- public String getNonJavaTestService();
-
- public String getWebServiceType();
- public String getWebServiceTypeDefault();
- public void setWebServiceType( String value );
-
- public boolean getStartWebService();
- public boolean getStartWebServiceDefault();
- public void setStartWebService( boolean value );
-
- public boolean getLaunchWebServiceExplorer();
- public boolean getLaunchWebServiceExplorerDefault();
- public void setLaunchWebServiceExplorer( boolean value );
-
- public boolean getGenerateProxy();
- public boolean getGenerateProxyDefault();
- public void setGenerateProxy( boolean value );
-
- public String getClientWebServiceType();
- public String getClientWebServiceTypeDefault();
- public void setClientWebServiceType( String value );
-
- public boolean getTestWebService();
- public boolean getTestWebServiceDefault();
- public void setTestWebService( boolean value );
-
- public boolean getMonitorWebService();
- public boolean getMonitorWebServiceDefault();
- public void setMonitorWebService(boolean value);
-
- public boolean isLaunchSampleEnabled();
- public boolean getLaunchSampleEnabledDefault();
- public void setLaunchSampleEnabled( boolean value );
-
- public ScenarioContext copy();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
deleted file mode 100644
index a7aeb25..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/ScenarioDefaults.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-import org.eclipse.jst.ws.internal.ext.test.WebServiceTestRegistry;
-
-
-
-public class ScenarioDefaults
-{
-
-
- public String[] getWebServiceTestTypes()
- {
- //we will set the home grown sample as the first choice
- WebServiceTestRegistry testRegistry = WebServiceTestRegistry.getInstance();
-
- LabelsAndIds labelsandids = testRegistry.getLabelsAndIDs();
- String[] labels = labelsandids.getLabels_();
- String[] ids = labelsandids.getIds_();
-
- String[] newNames = new String[labels.length];
- int index = -1;
- for(int i = 0;i<ids.length;i++){
- if(ids[i].equals("org.eclipse.jst.ws.internal.consumption.ui.widgets.test.WebServiceSampleTest"))
- index = i;
- }
- if(index != -1){
- newNames[0] = labels[index];
- int j = 1;
- for(int i = 0;i<labels.length;i++){
- if(i != index){
- newNames[j] = labels[i];
- j++;
- }
- }
- }
- else return labels;
-
- return newNames;
- }
-
- public String getNonJavaTestServiceDefault()
- {
- return "Web Services Explorer";
- }
-
- public String webserviceTypeIdDefault()
- {
- return "0/org.eclipse.jst.ws.type.java";
- }
-
- public boolean startWebserviceDefault()
- {
- return true;
- }
-
- public boolean launchWebserviceExplorerDefault()
- {
- return false;
- }
-
- public boolean generateProxyDefault()
- {
- return false;
- }
-
- public String webserviceClientTypeDefault()
- {
- return "org.eclipse.jst.ws.client.type.java";
- }
-
- public boolean testWebserviceDefault()
- {
- return false;
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return false;
- }
-
- public boolean launchSample()
- {
- return true;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java
deleted file mode 100644
index e4a289b..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientProjectTopologyContext.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-
-public class TransientProjectTopologyContext implements ProjectTopologyContext
-{
- private String[] clientTypes;
- private boolean twoEARs;
-
- public TransientProjectTopologyContext () {}
-
- public void setClientTypes(String[] clientTypes)
- {
- this.clientTypes = clientTypes;
- }
- public String[] getClientTypes()
- {
- return clientTypes;
- }
-
- public void setUseTwoEARs(boolean use)
- {
- this.twoEARs = use;
- }
- public boolean isUseTwoEARs()
- {
- return twoEARs;
- }
-
- public ProjectTopologyContext copy() {
- TransientProjectTopologyContext context = new TransientProjectTopologyContext();
- context.setClientTypes(getClientTypes());
- context.setUseTwoEARs(isUseTwoEARs());
- return context;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
deleted file mode 100644
index 8730619..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/TransientScenarioContext.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.context;
-
-public class TransientScenarioContext implements ScenarioContext
-{
- private String[] webServiceTestTypes;
- private String nonJavaTestService;
- private String webServiceType_;
- private boolean startWebService_;
- private boolean launchWebServiceExplorer_;
- private boolean generateProxy_;
- private String clientWebServiceType_;
- private boolean testWebService_;
- private boolean monitorWebService;
- private boolean launchSample_;
-
- private ScenarioDefaults defaults = new ScenarioDefaults();
-
- public TransientScenarioContext () {}
-
- public String getNonJavaTestService()
- {
- return nonJavaTestService;
- }
-
- public void setNonJavaTestService(String nonJavaTestService)
- {
- this.nonJavaTestService = nonJavaTestService;
- }
-
- public void setWebServiceTestTypes(String[] webServiceTestTypes)
- {
- this.webServiceTestTypes = webServiceTestTypes;
- }
-
- public String[] getWebServiceTestTypes()
- {
- return webServiceTestTypes;
- }
-
- public ScenarioContext copy() {
- TransientScenarioContext context = new TransientScenarioContext();
- context.setWebServiceTestTypes(getWebServiceTestTypes());
- context.setNonJavaTestService(getNonJavaTestService());
-
- context.setWebServiceType( getWebServiceType() );
- context.setClientWebServiceType( getClientWebServiceType() );
- context.setGenerateProxy( getGenerateProxy() );
- context.setLaunchWebServiceExplorer( getLaunchWebServiceExplorer() );
- context.setStartWebService( getStartWebService() );
- context.setTestWebService( getTestWebService() );
- context.setMonitorWebService(getMonitorWebService());
- context.setLaunchSampleEnabled( isLaunchSampleEnabled() );
- return context;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getClientWebServiceType()
- */
- public String getClientWebServiceType()
- {
- return clientWebServiceType_;
- }
-
- public String getClientWebServiceTypeDefault(){ return defaults.webserviceClientTypeDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getGenerateProxy()
- */
- public boolean getGenerateProxy()
- {
- return generateProxy_;
- }
-
- public boolean getGenerateProxyDefault(){ return defaults.generateProxyDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchWebServiceExplorer()
- */
- public boolean getLaunchWebServiceExplorer()
- {
- return launchWebServiceExplorer_;
- }
-
- public boolean getLaunchWebServiceExplorerDefault(){ return defaults.launchWebserviceExplorerDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getStartWebService()
- */
- public boolean getStartWebService()
- {
- return startWebService_;
- }
-
- public boolean getStartWebServiceDefault(){ return defaults.startWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getTestWebService()
- */
- public boolean getTestWebService()
- {
- return testWebService_;
- }
-
- public boolean getTestWebServiceDefault(){ return defaults.testWebserviceDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getWebServiceType()
- */
- public String getWebServiceType()
- {
- return webServiceType_;
- }
-
- public String getWebServiceTypeDefault(){ return defaults.webserviceTypeIdDefault(); }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setClientWebServiceType(java.lang.String)
- */
- public void setClientWebServiceType(String value)
- {
- clientWebServiceType_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setGenerateProxy(boolean)
- */
- public void setGenerateProxy(boolean value)
- {
- generateProxy_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchWebServiceExplorer(boolean)
- */
- public void setLaunchWebServiceExplorer(boolean value)
- {
- launchWebServiceExplorer_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setStartWebService(boolean)
- */
- public void setStartWebService(boolean value)
- {
- startWebService_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setTestWebService(boolean)
- */
- public void setTestWebService(boolean value)
- {
- testWebService_ = value;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setWebServiceType(java.lang.String)
- */
- public void setWebServiceType(String value)
- {
- webServiceType_ = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getMonitorWebService()
- */
- public boolean getMonitorWebService()
- {
- return monitorWebService;
- }
-
- public boolean getMonitorWebServiceDefault()
- {
- return defaults.getMonitorWebServiceDefault();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setMonitorWebService(boolean)
- */
- public void setMonitorWebService(boolean value)
- {
- monitorWebService = value;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#getLaunchSampleEnabledDefault()
- */
- public boolean getLaunchSampleEnabledDefault()
- {
- return defaults.launchSample();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#isLaunchSampleEnabled()
- */
- public boolean isLaunchSampleEnabled()
- {
- return launchSample_;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jst.ws.internal.context.ScenarioContext#setLaunchSampleEnabled(boolean)
- */
- public void setLaunchSampleEnabled(boolean value)
- {
- launchSample_ = value;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
deleted file mode 100644
index a24addb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceContext.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public interface UDDIPreferenceContext
-{
- /*
- * This constant String is used to lookup the column delimiter for user-defined UDDI
- * Category data.
- */
- public static final String PREFERENCE_UDDI_CAT_DATA_COLUMN_DELIMITER = "uddiCatDataColumnDelimiter";
-
- /*
- * This constant String is used to lookup the string delimiter for user-defined UDDI
- * Category data.
- */
- public static final String PREFERENCE_UDDI_CAT_DATA_STRING_DELIMITER = "uddiCatDataStringDelimiter";
-
- public void setUddiCatDataColumnDelimiter(String delimiter);
- public String getUddiCatDataColumnDelimiter();
- public void setUddiCatDataStringDelimiter(String delimiter);
- public String getUddiCatDataStringDelimiter();
-}
\ No newline at end of file
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
deleted file mode 100644
index 39eba91..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/context/UDDIPreferenceDefaults.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.internal.context;
-
-public class UDDIPreferenceDefaults
-{
- public static final String getUddiCatDataColumnDelimiter()
- {
- return "#";
- }
-
- public static final String getUddiCatDataStringDelimiter()
- {
- return "\"";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
deleted file mode 100644
index 4bd0f64..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/LabelsAndIds.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.data;
-
-public class LabelsAndIds
-{
- private String[] labels_;
- private String[] ids_;
-
- /**
- * @return Returns the ids_.
- */
- public String[] getIds_()
- {
- return ids_;
- }
- /**
- * @param ids_ The ids_ to set.
- */
- public void setIds_(String[] ids_)
- {
- this.ids_ = ids_;
- }
- /**
- * @return Returns the labels_.
- */
- public String[] getLabels_()
- {
- return labels_;
- }
- /**
- * @param labels_ The labels_ to set.
- */
- public void setLabels_(String[] labels_)
- {
- this.labels_ = labels_;
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
deleted file mode 100644
index 4dc349d..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/data/TypeRuntimeServer.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-/**
- */
-package org.eclipse.jst.ws.internal.data;
-
-public class TypeRuntimeServer
-{
- private String typeId_ = "";
- private String runtimeId_ = "";
- private String serverId_ = "";
- private String serverInstanceId_;
-
- /**
- * @return Returns the runtimeId_.
- */
- public String getRuntimeId()
- {
- return runtimeId_;
- }
- /**
- * @param runtimeId_ The runtimeId_ to set.
- */
- public void setRuntimeId(String runtimeId_)
- {
- this.runtimeId_ = runtimeId_;
- }
- /**
- * @return Returns the serverId_.
- */
- public String getServerId()
- {
- return serverId_;
- }
- /**
- * @param serverId_ The serverId_ to set.
- */
- public void setServerId(String serverId_)
- {
- this.serverId_ = serverId_;
- }
- /**
- * @return Returns the serverInstanceId_.
- */
- public String getServerInstanceId()
- {
- return serverInstanceId_;
- }
- /**
- * @param serverInstanceId_ The serverInstanceId_ to set.
- */
- public void setServerInstanceId(String serverInstanceId_)
- {
- this.serverInstanceId_ = serverInstanceId_;
- }
- /**
- * @return Returns the typeId_.
- */
- public String getTypeId()
- {
- return typeId_;
- }
- /**
- * @param typeId_ The typeId_ to set.
- */
- public void setTypeId(String typeId_)
- {
- this.typeId_ = typeId_;
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#toString()
- */
- public String toString()
- {
- return "type(" + typeId_ + ") runtime(" + runtimeId_ + ") factory(" + serverId_ + ") servInstId(" + serverInstanceId_ + ")";
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
deleted file mode 100644
index 687bfeb..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/dialog/IStatusDialogConstants.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.dialog;
-
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-
-/**
-* Constants for status dialogs
-*/
-public interface IStatusDialogConstants {
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2002.";
-
- /*
- * Button ID for the "Yes" button
- */
- public static final int YES_ID = 2;
- /*
- * Button ID for the "Yes to all" button
- */
- public static final int YES_TO_ALL_ID = 4;
- /*
- * Button ID for the "Cancel" button
- */
- public static final int CANCEL_ID = 1;
- /*
- * Button ID for the "OK" button
- */
- public static final int OK_ID = 0;
- /*
- * Button ID for the "Details" button
- */
- public static final int DETAILS_ID = 13;
-
- /*
- * Button label for the "Yes" button
- */
- public static final String YES_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_YES_LABEL");
- /*
- * Button label for the "Yes to all" button
- */
- public static final String YES_TO_ALL_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_YES_TO_ALL_LABEL");
- /*
- * Button label for the "Cancel" button
- */
- public static final String CANCEL_LABEL = WebServicePlugin.getMessage("%STATUS_DIALOG_CANCEL_LABEL");
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
deleted file mode 100644
index 37326bf..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExecutable.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-/**
-* All Extensions with exectutable extensions should implement this
-* to fit our framework
-*/
-public interface WebServiceExecutable
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /**
- *Returns a wizard fragment for this exention type
- *
- */
- public WebServiceFinishCommand getFinishCommand();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
deleted file mode 100644
index 4332d0a..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtension.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-*/
-public interface WebServiceExtension
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * If the extension has code that needs to be executed or a fragment added
- * @return WebServiceExecutable this interface holds executable code and a
- * fragment
- */
- public Object getWebServiceExecutableExtension();
-
- /**
- * This is the config element that holds the extension info
- * @param IConfigurationElement Extension element
- */
- public void setConfigElement(IConfigurationElement configElement);
-
- /**
- * If the extension has code that
- * @return IConfigurationElement Extension element
- */
- public IConfigurationElement getConfigElement();
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
deleted file mode 100644
index 1c16bb4..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionImpl.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.wst.command.internal.env.eclipse.EclipseLog;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-
-
-
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-*/
-public class WebServiceExtensionImpl implements WebServiceExtension
-{
-
- private Log log_;
-
- /*
- * The ConfigElement that holds extension info
- */
- protected IConfigurationElement configElement_;
-
- /*
- * The extension executable
- */
- protected WebServiceExecutable webServiceExecutable_;
-
-
- public WebServiceExtensionImpl(IConfigurationElement configElement)
- {
- configElement_ = configElement;
- log_ = new EclipseLog();
- }
-
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- /**
- * If the extension has code that needs to be executed or a fragment added
- * @return WebServiceExecutable this interface holds executable code and a
- * fragment
- */
- public Object getWebServiceExecutableExtension()
- {
- if(webServiceExecutable_ != null) return webServiceExecutable_;
-
- try{
- return configElement_.createExecutableExtension("class");
- }catch (CoreException e){
- log_.log(Log.ERROR, 5029, this, "getWebServiceExecutableExtension",e);
- }
-
- return null;
- }
-
- /**
- * This is the config element that holds the extension info
- * @param IConfigurationElement Extension element
- */
- public void setConfigElement(IConfigurationElement configElement)
- {
- configElement_ = configElement;
- }
-
- /**
- * This is the config element that holds the extension info
- * @return IConfigurationElement Extension element
- */
- public IConfigurationElement getConfigElement()
- {
- return configElement_;
- }
-
- /**
- * The name of the extension being used
- * @return String name of this extension
- */
- public String getName()
- {
- return getConfigElement().getAttribute( "name" );
- }
-
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
deleted file mode 100644
index afc1d07..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistry.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-
-/**
-* Returns the names of the extensions for a given extension-point
-* also returns the extension objects
-*
-*/
-public interface WebServiceExtensionRegistry
-{
-
- /**
- * Returns the names of all registered extensions
- * @return The names of all registered extensions.
- */
- public String[] getWebServiceExtensionNames ();
-
- /**
- * Returns the extension object of the given name
- *@return WebServiceExtension object
- */
- public WebServiceExtension getWebServiceExtensionsByName( String name);
-
- /**
- * Returns All extention objects in this registry
- *@return WebServiceExtension objects
- */
- public WebServiceExtension[] getWebServiceExtensions();
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
deleted file mode 100644
index 2f53fd2..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceExtensionRegistryImpl.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import java.util.Hashtable;
-import java.util.Vector;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.data.LabelsAndIds;
-
-
-/**
-* This is a generic registry which sets up general code in handling
-* IConfigElements for an extension
-*/
-public abstract class WebServiceExtensionRegistryImpl implements WebServiceExtensionRegistry
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- private Hashtable nameExtensionTable_;
- private Vector id_;
- private Vector label_;
- private LabelsAndIds labelsandids_;
-
- public WebServiceExtensionRegistryImpl()
- {
- nameExtensionTable_ = new Hashtable();
- label_ = new Vector();
- id_ = new Vector();
- loadExtensions();
- }
-
- /**
- * Children registries will have different extension types
- * @return WebserviceExtension holds a config elem
- * for that extension capable of creating an executable file
- */
- public abstract WebServiceExtension createWebServiceExtension(IConfigurationElement configElement);
-
- /**
- * Children must implement how they get the IConfigurationElement[]
- * @return IConfigurationElement[] an array of elements particular to that
- * extension
- */
- public abstract IConfigurationElement[] getConfigElements();
-
- /*
- * Loads WebServiceExtensions for WebServiceClientTest into this registry.
- * This is done by querying the plugin registry for all extensions
- * that extend webServiceClientTest
- */
- private void loadExtensions ()
- {
- IConfigurationElement[] config = getConfigElements();
-
- for(int idx=0; idx<config.length; idx++)
- {
- IConfigurationElement elem = config[idx];
- String label = elem.getAttribute( "label" );
- String id = elem.getAttribute( "id" );
- WebServiceExtension webServiceExtension = createWebServiceExtension(elem);
- nameExtensionTable_.put(label,webServiceExtension);
- label_.add(label);
- id_.add(id);
- }
- }
-
- /**
- * Returns the names of all registered extensions
- * @return The names of all registered extensions.
- */
- public String[] getWebServiceExtensionNames ()
- {
- return (String[])nameExtensionTable_.keySet().toArray( new String[0] );
- }
-
- /**
- * Return the names and Ids
- */
- public LabelsAndIds getLabelsAndIDs()
- {
- labelsandids_ = new LabelsAndIds();
- labelsandids_.setLabels_((String[])label_.toArray( new String[0] ));
- labelsandids_.setIds_((String[])id_.toArray( new String[0] ));
- return labelsandids_;
- }
-
- /**
- * Returns the extension object of the given name
- * @return WebServiceExtension object
- */
- public WebServiceExtension getWebServiceExtensionsByName( String name)
- {
- return (WebServiceExtension)nameExtensionTable_.get(name);
- }
-
- /**
- * Returns All extention objects in this registry
- *@return WebServiceExtension objects
- */
- public WebServiceExtension[] getWebServiceExtensions()
- {
- return (WebServiceExtension[])nameExtensionTable_.values().toArray( new WebServiceExtension[0] );
- }
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceFinishCommand.java
deleted file mode 100644
index f57cb14..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/WebServiceFinishCommand.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext;
-
-import org.eclipse.wst.command.internal.provisional.env.core.Command;
-
-public interface WebServiceFinishCommand extends Command
-{
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
deleted file mode 100644
index 15c387e..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/JavaProxyTestCommand.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection;
-
-public interface JavaProxyTestCommand extends WebServiceTestFinishCommand
-{
-
- /**
- * This holds an info class that comes from user input or some calcilations that needs to be
- * used for the finish
- */
-
- public void setJspFolder(String jspFolder);
-
- public void setRunClientTest(boolean runClientTest);
-
- public void setSampleProject(String sampleProject);
-
- public void setProxyBean(String proxyBean);
-
- public void setSetEndpointMethod(String setEndpointMethod);
-
- public void setClientProject(String clientProject);
-
- public void setMethods(BooleanSelection[] methods);
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
deleted file mode 100644
index 2523dcf..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WSDLTestFinishCommand.java
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-public interface WSDLTestFinishCommand extends WebServiceTestFinishCommand
-{
- public void setServiceProject(String serverProject);
- public void setWsdlServiceURL(String wsdlURI);
- public void setExternalBrowser(boolean external);
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
deleted file mode 100644
index 76f7d77..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestExtension.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionImpl;
-
-
-
-/**
-* This represents an extension in the plugin registry
-* It job is to act as a proxy to the iconfigelement
-* In particular it holds a client test extension element
-*/
-public class WebServiceTestExtension extends WebServiceExtensionImpl
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
-
- public WebServiceTestExtension(IConfigurationElement configElement)
- {
- super(configElement);
- }
-
- /**
- * Will this testClient generate code
- * @return boolean true if codegen needed
- */
- public boolean isCodeGenNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "codegen" )).booleanValue();
- }
-
- /**
- * Use the default Folder Provided by us
- * @return boolean true if no special folder requires
- */
- public boolean useDefaultCodeGenFolder()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "defaultcodegenfolder" )).booleanValue();
- }
-
- /**
- * Use Special Folder for generated code
- * @return String special folder name
- */
- public String getCodeGenFolder()
- {
- return getConfigElement().getAttribute( "codegenfolder" );
- }
-
- /**
- * Do we need to launch something
- * @return Boolean if true launch codegen
- */
- public boolean isLaunchRequired()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "launchRequired" )).booleanValue();
- }
-
- /**
- * Do we need the methods for the proxy
- * @return boolean true if proxy methods needed
- */
- public boolean areMethodsNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "methodsneeded" )).booleanValue();
- }
-
- /**
- * Does this test machine need a server
- * @return boolean true if a server is required
- */
- public boolean isServerNeeded()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "serverneeded" )).booleanValue();
- }
-
- /**
- * Use the Default Server chosen by the wizard
- * @return boolean true if the default server is wanted
- */
- public boolean useDefaultServer()
- {
- return Boolean.valueOf(getConfigElement().getAttribute( "defaultserver" )).booleanValue();
- }
-
- /**
- * Use the Default Server chosen by the wizard
- * @return boolean true if the default server is wanted
- */
- public String useServer()
- {
- return getConfigElement().getAttribute( "useserver" );
- }
-
- public boolean testWSDL()
- {
- String wsdl = getConfigElement().getAttribute( "testWSDL" );
- if(wsdl.equals("yes") || wsdl.equals("true"))
- return true;
-
- return false;
- }
-
-
-}
-
-
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
deleted file mode 100644
index 0e87ff5..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestFinishCommand.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
-* <copyright>
-*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2000, 2002 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*
-* </copyright>
-*/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import java.util.List;
-
-import org.eclipse.jst.ws.internal.ext.WebServiceFinishCommand;
-import org.eclipse.wst.server.core.IServer;
-
-public interface WebServiceTestFinishCommand extends WebServiceFinishCommand
-{
-
- /**
- * If the command needs a server this is the chosen
- * client serverID
- * @param sampleServerTypeID
- */
- public void setServerTypeID(String serviceServerTypeID);
-
- /**
- * This is the IServer if required
- * @param sampleExistingServer
- */
- public void setExistingServer(IServer serviceExistingServer);
-
- /**
- * This is the endpoints if monitor service is enabled
- * @param endpoints
- */
- public void setEndpoint(List endpoints);
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
deleted file mode 100644
index 310e3d5..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/ext/test/WebServiceTestRegistry.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.ext.test;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtension;
-import org.eclipse.jst.ws.internal.ext.WebServiceExtensionRegistryImpl;
-
-public class WebServiceTestRegistry extends WebServiceExtensionRegistryImpl
-{
- // Copyright
- public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002.";
- /*
- * This is a singleton becasue it was decided that the memory foot print
- * is not as expensive as the time taken retrieving the data
- *
- */
-
-
- private static WebServiceTestRegistry wstr;
-
- public static WebServiceTestRegistry getInstance()
- {
- if(wstr == null) wstr = new WebServiceTestRegistry();
- return wstr;
- }
-
- private WebServiceTestRegistry()
- {
- super();
- }
-
- /**
- * Children registries will have different extension types
- * @return WebserviceExtension holds a config elem
- * for that extension capable of creating an executable file
- */
- public WebServiceExtension createWebServiceExtension(IConfigurationElement configElement)
- {
- return new WebServiceTestExtension(configElement);
- }
-
- /**
- * Children must implement how they get the IConfigurationElement[]
- * @return IConfigurationElement[] an array of elements particular to that
- * extension
- */
- public IConfigurationElement[] getConfigElements()
- {
- IExtensionRegistry reg = Platform.getExtensionRegistry();
- IConfigurationElement[] config = reg.getConfigurationElementsFor(
- "org.eclipse.jst.ws.consumption.ui",
- "tester");
- return config;
- }
-
-
-
-
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
deleted file mode 100644
index 166072a..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/internal/plugin/WebServicePlugin.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-
-package org.eclipse.jst.ws.internal.plugin;
-
-import java.text.MessageFormat;
-
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.jst.ws.internal.context.PersistentProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.PersistentScenarioContext;
-import org.eclipse.jst.ws.internal.context.PersistentUDDIPreferenceContext;
-import org.eclipse.jst.ws.internal.context.ProjectTopologyContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.context.UDDIPreferenceContext;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-
-
-/**
-* This is the plugin class for the Web Services plugin.
-* <p>
-* This plugin contains the bulk of the Web Services runtime.
-* Only the graphical user interface portion of the runtime is
-* found elsewhere - in the org.eclipse.jst.ws.ui plugin.
-*/
-public class WebServicePlugin extends Plugin
-{
- /**
- * The identifier of the descriptor of this plugin in plugin.xml.
- */
- public static final String ID = "org.eclipse.jst.ws";
-
- /**
- * The reference to the singleton instance of this plugin.
- */
- private static WebServicePlugin instance_;
-
- private PersistentResourceContext resourceContext_;
- private PersistentScenarioContext scenarioContext_;
- private PersistentProjectTopologyContext projectTopologyContext_;
- private PersistentUDDIPreferenceContext uddiPreferenceContext;
-
- /**
- * Constructs a runtime plugin object for this plugin.
- */
- public WebServicePlugin()
- {
- super();
- instance_ = this;
- }
-
- /**
- * Returns the singleton instance of this plugin.
- * @return The WebServicePlugin singleton.
- */
- public static WebServicePlugin getInstance ()
- {
- return instance_;
- }
-
- protected void initializeDefaultPluginPreferences()
- {
- ((PersistentProjectTopologyContext) getProjectTopologyContext()).load();
- ((PersistentUDDIPreferenceContext) getUDDIPreferenceContext()).load();
- }
-
- public ResourceContext getResourceContext()
- {
- if (resourceContext_ == null)
- resourceContext_ = PersistentResourceContext.getInstance();
- return resourceContext_;
- }
-
- public ScenarioContext getScenarioContext()
- {
- if (scenarioContext_ == null)
- {
- scenarioContext_ = new PersistentScenarioContext();
- scenarioContext_.load();
- }
-
- return scenarioContext_;
- }
-
- public ProjectTopologyContext getProjectTopologyContext()
- {
- if (projectTopologyContext_ == null)
- projectTopologyContext_ = new PersistentProjectTopologyContext();
- return projectTopologyContext_;
- }
-
-
- public UDDIPreferenceContext getUDDIPreferenceContext()
- {
- if (uddiPreferenceContext == null)
- uddiPreferenceContext = new PersistentUDDIPreferenceContext();
- return uddiPreferenceContext;
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties.
- * @return The String message.
- */
- public static String getMessage ( String key )
- {
- return Platform.getResourceString(instance_.getBundle(),key);
- }
-
- /**
- * Returns the message string identified by the given key from
- * plugin.properties. Substitution sequences in the message string
- * are replaced by the given array of substitution objects (which
- * are most frequently strings). See the JDK's
- * {@link java.text.MessageFormat java.text.MessageFormat}
- * class for further details on substitution.
- * @return The String message.
- */
- public static String getMessage ( String key, Object[] args )
- {
- return MessageFormat.format(getMessage(key),args);
- }
-}
diff --git a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties b/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties
deleted file mode 100644
index 29bdaaf..0000000
--- a/bundles/org.eclipse.jst.ws/src/org/eclipse/jst/ws/plugin.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################
-# Copyright (c) 2004 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# IBM Corporation - initial API and implementation
-###############################################################################
-
-#
-# Messages in plugin.xml.
-#
-
-MSG_ERROR_SERVER=IWAB0213E Error in starting server.
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.classpath b/tests/org.eclipse.jst.ws.tests.performance/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore b/tests/org.eclipse.jst.ws.tests.performance/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/tests/org.eclipse.jst.ws.tests.performance/.project b/tests/org.eclipse.jst.ws.tests.performance/.project
deleted file mode 100644
index 088e1a8..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.tests.performance</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
deleted file mode 100644
index 81df794..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Axis Perfmsr Plug-in
-Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance
-Bundle-Version: 0.7.0
-Bundle-ClassPath: axisPerfmsr.jar
-Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin
-Bundle-Vendor: IBM
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr,
- org.eclipse.jst.ws.tests.performance,
- org.eclipse.jst.ws.tests.performance.plugin
-Require-Bundle: org.eclipse.jst.ws,
- org.eclipse.jst.j2ee.core,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ui,
- org.eclipse.wst.server.core,
- org.junit,
- org.eclipse.jst.ws.tests,
- org.eclipse.jem.util,
- org.eclipse.test.performance,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env.core
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.ws.tests.performance/about.html b/tests/org.eclipse.jst.ws.tests.performance/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties
deleted file mode 100644
index bf17c58..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = build.xml,\
- plugin.xml,\
- test.xml,\
- axisPerfmsr.jar,\
- META-INF/,\
- about.html
-jars.compile.order = axisPerfmsr.jar
-source.axisPerfmsr.jar = src/
-output.axisPerfmsr.jar = bin/
diff --git a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml b/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-</plugin>
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
deleted file mode 100644
index 3f1b70f..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * Bottom up performance scenario with Axis and Tomcat v5.0
- */
-public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test {
- // Constants
- private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
- private final String PROJECT_NAME = "TestBUWeb";
- private final String WEB_MODULE_NAME = "TestBUWebModule";
-
- private IFile sourceFile_;
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception
- {
- // Create a Web project (TestWeb) targetted to Tomcat 5.0
- Status s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), env_);
- if (s.getSeverity() != Status.OK) {
- System.out.println("Error: "+s.getMessage());
- throw new Exception(s.getThrowable());
- }
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- assertTrue(webProject.exists());
-
-
- // Copy the contents of data/<test name> to the Web project's source folder.
- // <Web Project>/JavaSource/foo/Echo.java
- //IFolder destFolder = JUnitUtils.getSourceFolderForWebProject(WEB_PROJECT_NAME);
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject, WEB_MODULE_NAME);
- IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
- JUnitUtils.copyTestData("BUJava/src",folder,env_);
- sourceFile_ = folder.getFile(new Path("foo/Echo.java"));
- assertTrue(sourceFile_.exists());
-
- // Ensure that Echo.class is built in:
- // <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class
- JUnitUtils.syncBuildProject(webProject,env_);
- //assertTrue(JUnitUtils.getClassesFolderForWebProject(WEB_PROJECT_NAME).getFile(new Path("foo/Echo.class")).exists());
-
-
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception
- {
- // Set default preferences for J2EE 1.4 Axis and Tomcat 5.0
- JUnitUtils.setJ2EEWSRuntimeServer(String.valueOf(J2EEVersionConstants.J2EE_1_3_ID), WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception
- {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testBUJavaAxisTC50() throws Exception
- {
- Status status = new SimpleStatus("");
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- JUnitUtils.disableWSIDialog(webProject);
-
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
-
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- performanceMeter.dispose();
- }
-
- if (status.getSeverity() == Status.OK)
- verifyOutput();
- else
- throw new Exception(status.getThrowable());
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput() throws Exception
- {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME);
-
- IPath webInfPath = J2EEUtils.getWebInfPath(webProject, WEB_MODULE_NAME);
- IFolder webInfFolder = (IFolder)ResourceUtils.findResource(webInfPath);
-
- IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
- assertTrue(wsdlFolder.exists());
- assertTrue(wsdlFolder.members().length > 0);
- assertTrue(webContentFolder.getFolder("wsdl").members().length > 0);
-
- //TODO Check if wsdd contains new Web service
- //TODO Check if Web serivce can be invoked by a client
- }
-
- /**
- * Clear workspace if necessary
- */
- protected void deleteInputData() throws Exception
- {
- // Remove the EAR from the server.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- //JUnitUtils.removeModuleFromServer(server_,webProject,env_);
-
- // Delete the Web project.
- webProject.delete(true,true,EnvironmentUtils.getIProgressMonitor(env_));
- assertFalse(webProject.exists());
-
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
deleted file mode 100644
index 6deeb5e..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * Client performance scenario with Axis and Tomcat v5.0
- */
-public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test {
-
- private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-
- private final String CLIENT_PROJECT_NAME = "TestWebClient";
- private final String CLIENT_WEB_MODULE_NAME = "TestWebClientModule";
-
- private IFile sourceFile_;
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
- // Create an associated Web project (TestWeb) targetted to Tomcat v5.0
- Status s = JUnitUtils.createWebModule(CLIENT_PROJECT_NAME, CLIENT_WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_);
- if (s.getSeverity() != Status.OK)
- throw new Exception(s.getThrowable());
-
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- assertTrue(webProject.exists());
-
- // Copy Echo.wsdl file to WebContent folder
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, CLIENT_WEB_MODULE_NAME);
- JUnitUtils.copyTestData("TDJava",destFolder,env_);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
- assertTrue(sourceFile_.exists());
-
-
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for J2EE 1.4 Axis and Tomcat 5.0
- JUnitUtils.setJ2EEWSRuntimeServer(String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testClientAxisTC50() throws Exception
- {
- Status status = new SimpleStatus("");
-
- JUnitUtils.enableProxyGeneration(true);
- JUnitUtils.enableOverwrite(true);
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- performanceMeter.dispose();
- }
-
- if (status.getSeverity() == Status.OK) {
- verifyOutput();
- } else {
- throw new Exception(status.getThrowable());
- }
-
- }
-
- /**
- * Verify the scenario completed succesfully
- * @throws Exception
- */
- private final void verifyOutput() throws Exception {
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
-
- IPath destPath = ResourceUtils.getJavaSourceLocation(webProject, CLIENT_WEB_MODULE_NAME);
- IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath);
-
- //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME);
- IFolder folder = srcFolder.getFolder("foo");
- assertTrue(folder.exists());
- assertTrue(folder.members().length > 0);
-
- //TODO Check that the client runs
-
- }
-
- /**
- * Remove workspace if necessary
- */
- protected void deleteInputData() throws Exception {
-
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME);
- webProject.delete(true,true,EnvironmentUtils.getIProgressMonitor(env_));
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
deleted file mode 100644
index 9c80406..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test;
-import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.jst.ws.tests.util.ScenarioConstants;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-/**
- * Top down performance scenario with Axis and Tomcat v5.0
- */
-public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test {
-
- private final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-
- private final String WEB_MODULE_NAME = "TestTDWebModule";
- private final String PROJECT_NAME = "TestTDProject";
- private IFile sourceFile_;
-
-
- /**
- * Sets up the input data;
- * - create project(s),
- * - copy resources to workspace
- */
- protected void installInputData() throws Exception {
-
- // Create an associated Web project (TestWeb) targetted to Tomcat 5.0
- Status s = JUnitUtils.createWebModule(PROJECT_NAME, WEB_MODULE_NAME, SERVERTYPEID_TC50, String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), env_);
- if (s.getSeverity() != Status.OK)
- throw new Exception(s.getThrowable());
-
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- assertTrue(webProject.exists());
-
- IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME);
- JUnitUtils.copyTestData("TDJava",destFolder,env_);
- sourceFile_ = destFolder.getFile(new Path("Echo.wsdl"));
- assertTrue(sourceFile_.exists());
-
- }
-
- /**
- * Set the persistent server runtime context preferences
- */
- protected void initJ2EEWSRuntimeServerDefaults() throws Exception {
- // Set default preferences for J2EE 1.4, Axis and Tomcat v5.0 server
- JUnitUtils.setJ2EEWSRuntimeServer(String.valueOf(J2EEVersionConstants.J2EE_1_4_ID), WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50);
- }
-
- /**
- * Set the initial selection
- */
- protected void initInitialSelection() throws Exception {
- initialSelection_ = new StructuredSelection(sourceFile_);
-
- }
-
- /**
- * Launches the pop-up command to initiate the scenario
- * @throws Exception
- */
- public void testTDJavaAxisTC50() throws Exception {
-
- Status status = new SimpleStatus("");
- Performance perf= Performance.getDefault();
- PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this));
- try {
-
- performanceMeter.start();
- status = PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_);
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- }
- finally {
- performanceMeter.dispose();
- }
- if (status.getSeverity() == Status.OK)
- verifyOutput();
- else
- throw new Exception(status.getThrowable());
-
- }
-
- /**
- * Verify the scenario completed successfully
- * @throws Exception
- */
- private final void verifyOutput() throws Exception
- {
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject, WEB_MODULE_NAME);
-
- IPath webInfPath = J2EEUtils.getWebInfPath(webProject, WEB_MODULE_NAME);
- IFolder webInfFolder = (IFolder)ResourceUtils.findResource(webInfPath);
-
- IFolder wsdlFolder = webContentFolder.getFolder("wsdl");
- assertTrue(wsdlFolder.exists());
- assertTrue(wsdlFolder.members().length > 0);
-
- //TODO Verify that wsdd contains this Web service
- //TODO Verify that the service can be invoked by a client
- }
-
- /**
- * Clear workspace if required
- */
- protected void deleteInputData() throws Exception {
- // Delete the Web project.
- IProject webProject = ProjectUtilities.getProject(PROJECT_NAME);
- webProject.delete(true,true,EnvironmentUtils.getIProgressMonitor(env_));
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java
deleted file mode 100644
index 1701022..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50;
-import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50;
-
-public class AllPerformanceTests {
- public static Test suite() {
-
- // TODO: Create a test suite
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.ws.tests.performance");
- //$JUnit-BEGIN$
- suite.addTestSuite(PerfmsrBUJavaAxisTC50.class);
- suite.addTestSuite(PerfmsrTDJavaAxisTC50.class);
- suite.addTestSuite(PerfmsrClientAxisTC50.class);
- //$JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java
deleted file mode 100644
index 31f6077..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package org.eclipse.jst.ws.tests.performance.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PerformancePlugin extends AbstractUIPlugin {
- //The shared instance.
- private static PerformancePlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public PerformancePlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.internal.test.performance.PerformancePlugin");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static PerformancePlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = PerformancePlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java
deleted file mode 100644
index 1d22195..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java
+++ /dev/null
@@ -1,85 +0,0 @@
-package org.eclipse.jst.ws.tests.performance.util;
-
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceMeter;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class EclipsePerformanceLog implements Log {
-
- private boolean runState = false;
- Performance perf = null;
- PerformanceMeter performanceMeter= null;
-
- public boolean isEnabled() {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean isEnabled(String option) {
- // TODO Auto-generated method stub
- return false;
- }
-
- private String getMessageNumString(int messageNum) {
- String messageNumString = "IWAB";
- if (messageNum > 9999 || messageNum < 0)
- messageNum = 9999; //default message number
- messageNumString += (new Integer(messageNum)).toString();
- return messageNumString;
- }
-
- public void log(int severity, int messageNum, Object caller, String method, Throwable throwable) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, String option, int messageNum, Object caller, String method, Throwable throwable) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, int messageNum, Object caller, String method, Status status) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, String option, int messageNum, Object caller, String method, Status status) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, int messageNum, Object caller, String method, Object object) {
- // TODO Auto-generated method stub
-
- }
-
- public void log(int severity, String option, int messageNum, Object caller, String method, Object object) {
-
- if (method.equals("runCommand")) {
-
- try {
- if (!runState) {
- // begin performance recording
- perf = Performance.getDefault();
- performanceMeter = perf.createPerformanceMeter(((String)object).toString());
- performanceMeter.start();
- runState = true;
- }
- else {
- // end performance recording
- performanceMeter.stop();
- performanceMeter.commit();
- perf.assertPerformance(performanceMeter);
- performanceMeter.dispose();
- runState = false;
- }
- }
- catch(Exception e) {
- // handle exception
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
deleted file mode 100644
index 7d33af5..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.performance.util;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.tests.util.AccumulateStatusHandler;
-import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-
-
-public class PerformanceJUnitUtils {
-
- private static Status launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions();
- for (int i=0;i<extensions.length;i++)
- {
- if (extensions[i].getNamespace().equals(pluginNS));
- {
- IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
- for (int j=0;j<configElements.length;j++)
- {
- if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId))
- {
- IConfigurationElement actionElement = configElements[j].getChildren()[0];
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler();
- EclipsePerformanceLog log = new EclipsePerformanceLog();
- // Use this to enable per command performance measurements
- //DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler, log);
- DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
- wizard.setInitializationData(actionElement,null,null);
- wizard.selectionChanged(null,initialSelection);
- wizard.run(null);
- return statusHandler.getStatus();
- }
- }
- }
- }
- return new SimpleStatus("","No wizard found for: ",Status.ERROR);
- }
-
- public static Status launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection);
- }
-
- public static Status launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests.performance/test.xml b/tests/org.eclipse.jst.ws.tests.performance/test.xml
deleted file mode 100644
index 183b4ea..0000000
--- a/tests/org.eclipse.jst.ws.tests.performance/test.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="performance" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.ws.tests.performance"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/>
- <property name="workspace" value="${eclipse-home}/workspace_ws_performance"/>
- <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <delete dir="${workspace}" quiet="true"/>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="performance_suite">
-
- <!-- Iteration 1 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 2 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 3 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 4 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <!-- Iteration 5 -->
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- <delete dir="${workspace}" quiet="true"/>
- <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${workspace}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- <delete dir="${workspace}" quiet="true"/>
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="performance" depends="init,performance_suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org.eclipse.jst.ws.tests.performance*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
diff --git a/tests/org.eclipse.jst.ws.tests/.classpath b/tests/org.eclipse.jst.ws.tests/.classpath
deleted file mode 100644
index 9f4b4d1..0000000
--- a/tests/org.eclipse.jst.ws.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.ws.tests/.cvsignore b/tests/org.eclipse.jst.ws.tests/.cvsignore
deleted file mode 100644
index 60463af..0000000
--- a/tests/org.eclipse.jst.ws.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/tests/org.eclipse.jst.ws.tests/.project b/tests/org.eclipse.jst.ws.tests/.project
deleted file mode 100644
index fe80d54..0000000
--- a/tests/org.eclipse.jst.ws.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.ws.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index b671d5e..0000000
--- a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,33 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Java Web Services Tools Tests
-Bundle-SymbolicName: org.eclipse.jst.ws.tests
-Bundle-Version: 0.7.0
-Bundle-ClassPath: tests.jar
-Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin
-Bundle-Vendor: IBM
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.ws.tests,
- org.eclipse.jst.ws.tests.axis.tomcat.v50,
- org.eclipse.jst.ws.tests.plugin,
- org.eclipse.jst.ws.tests.unittest,
- org.eclipse.jst.ws.tests.util
-Require-Bundle: org.eclipse.jst.ws.consumption.ui,
- org.eclipse.jst.ws.consumption,
- org.eclipse.jst.ws,
- org.eclipse.wst.command.env.core,
- org.eclipse.wst.command.env.ui,
- org.eclipse.wst.command.env,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee,
- org.eclipse.jst.j2ee.web,
- org.eclipse.wst.common.frameworks,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.junit,
- org.eclipse.wst.ws.ui,
- org.eclipse.ui,
- org.eclipse.debug.core,
- org.eclipse.wst.server.core,
- org.eclipse.jem.util
-Eclipse-AutoStart: true
diff --git a/tests/org.eclipse.jst.ws.tests/about.html b/tests/org.eclipse.jst.ws.tests/about.html
deleted file mode 100644
index 6f6b96c..0000000
--- a/tests/org.eclipse.jst.ws.tests/about.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>February 24, 2005</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, "Program" will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
-indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/build.properties b/tests/org.eclipse.jst.ws.tests/build.properties
deleted file mode 100644
index f40af6d..0000000
--- a/tests/org.eclipse.jst.ws.tests/build.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-bin.includes = build.xml,\
- data/,\
- plugin.xml,\
- readme.txt,\
- tests.jar,\
- META-INF/,\
- test.xml,\
- about.html
-jars.compile.order = tests.jar
-source.tests.jar = tests/
-output.tests.jar = bin/
diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp b/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp
deleted file mode 100644
index 7b0e3b3..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp
+++ /dev/null
@@ -1,38 +0,0 @@
-<%@ page contentType="text/html; charset=UTF-8" import="java.io.*" %>
-<jsp:useBean id="echoProxy" class="foo.EchoProxy" scope="request"/>
-<html>
-<%@ include file = "/outputFilePath.jspf" %>
-<%
- // HTTP/POST parameter:
- // testInput - the String argument to call the proxy with.
- String testInput = request.getParameter("testInput");
-
- // Execute the Web service.
- String result = echoProxy.echoString(testInput);
-
- // Write the result to the outputFilePath.
- PrintWriter pw = null;
- try
- {
- pw = new PrintWriter(new FileOutputStream(outputFilePath));
- pw.print(result);
- pw.flush();
- }
- catch (Exception e)
- {
- }
- finally
- {
- if (pw != null)
- pw.close();
- }
-%>
-</body>
-<p>
-testInput: <%=testInput%>
-<p>
-outputFilePath: <%=outputFilePath%>
-<p>
-The result is <%=result%>
-</body>
-</html>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java b/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java
deleted file mode 100644
index 4e893d2..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package foo;
-
-public class Echo
-{
- public String echoString(String input)
- {
- return input;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl b/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl
deleted file mode 100644
index 46df32f..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions targetNamespace="http://foo" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <wsdl:types>
- <schema targetNamespace="http://foo" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <element name="echoStringResponse">
- <complexType>
- <sequence>
- <element name="echoStringReturn" nillable="true" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="echoString">
- <complexType>
- <sequence>
- <element name="input" nillable="true" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
-
- <wsdl:message name="echoStringResponse">
-
- <wsdl:part element="impl:echoStringResponse" name="parameters"/>
-
- </wsdl:message>
-
- <wsdl:message name="echoStringRequest">
-
- <wsdl:part element="impl:echoString" name="parameters"/>
-
- </wsdl:message>
-
- <wsdl:portType name="Echo">
-
- <wsdl:operation name="echoString">
-
- <wsdl:input message="impl:echoStringRequest" name="echoStringRequest"/>
-
- <wsdl:output message="impl:echoStringResponse" name="echoStringResponse"/>
-
- </wsdl:operation>
-
- </wsdl:portType>
-
- <wsdl:binding name="EchoSoapBinding" type="impl:Echo">
-
- <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="echoString">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="echoStringRequest">
-
- <wsdlsoap:body use="literal"/>
-
- </wsdl:input>
-
- <wsdl:output name="echoStringResponse">
-
- <wsdlsoap:body use="literal"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="EchoService">
-
- <wsdl:port binding="impl:EchoSoapBinding" name="Echo">
-
- <wsdlsoap:address location="http://localhost:9080/TestWeb/services/Echo"/>
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf b/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf
deleted file mode 100644
index c8a7aec..0000000
--- a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf
+++ /dev/null
@@ -1,6 +0,0 @@
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-</head>
-<%
- String outputFilePath = request.getParameter("outputFilePath");
-%>
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/plugin.xml b/tests/org.eclipse.jst.ws.tests/plugin.xml
deleted file mode 100644
index 7bf65fb..0000000
--- a/tests/org.eclipse.jst.ws.tests/plugin.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
-
-</plugin>
diff --git a/tests/org.eclipse.jst.ws.tests/readme.txt b/tests/org.eclipse.jst.ws.tests/readme.txt
deleted file mode 100644
index 09cdd8b..0000000
--- a/tests/org.eclipse.jst.ws.tests/readme.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-The arguments to be passed in are:
-
--Detools_perf_ctrl="log=d:/perflogs/v6001;testd=51" -Dtomcat.server.v50=E:\\Tomcat\\Tomcat5.0
-
-, where etools_perf_crtl is the log output directory and test id, and tomcat.server.v50 is the install directory of your Tomcat v5.0 server.
diff --git a/tests/org.eclipse.jst.ws.tests/test.xml b/tests/org.eclipse.jst.ws.tests/test.xml
deleted file mode 100644
index 57e4c58..0000000
--- a/tests/org.eclipse.jst.ws.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.ws.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="jst-ws-folder" value="${eclipse-home}/jst_ws_folder"/>
- <delete dir="${jst-folder}" quiet="true"/>
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${jst-ws-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.ws.tests.unittest.AllWSJUnitTests" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java
deleted file mode 100644
index 161622d..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IServer;
-
-public abstract class WSWizardTest extends TestCase
-{
- protected Environment env_;
- protected IRuntime serverRuntime_;
- protected IServer server_;
- protected IStructuredSelection initialSelection_;
-
- public String defaultURL_ = "http://localhost:8080/";
-
- /**
- * Set up the workspace for the Web Service Wizard JUnit test. Setup consists of the following steps:
- * 1) Obtain an instance of the environment.
- * 2) Install the server runtime.
- * 3) Install the input data. This may include projects, source files etc.
- * 4) Install an instance of the server if required. This may also include configuration of the input data on the server.
- * 5) Initialize the J2EE, Web Service Runtime and Server type defaults for the Web Service wizard to use.
- * 6) Initialize the initial selection object to set the context for the Web Service wizard.
- * @throws Exception
- */
- protected void setUp() throws Exception
- {
- // Get an instance of the default environment with the AccumulateStatusHandler to minimize UI dialog blocks.
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseProgressMonitor monitor = new EclipseProgressMonitor();
- EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, monitor, handler );
-
- env_ = environment;
- assertTrue(env_ != null);
-
- IProgressMonitor npm = new NullProgressMonitor();
- monitor.setMonitor(npm);
- server_ = null;
- JUnitUtils.hideActionDialogs();
- JUnitUtils.enableFlexProjectPreference();
- installServerRuntime();
- installServer();
- installInputData();
- initJ2EEWSRuntimeServerDefaults();
- initInitialSelection();
- }
-
- /**
- * Install the server runtime.
- * @throws Exception
- */
- protected abstract void installServerRuntime() throws Exception;
-
- /**
- * Installs the input data from an aggregator. This ensures that the environment, runtime
- * and server are correctly set on the aggregate since its lifecycle methods are not necessarily
- * called.
- * @param env
- * @param serverRuntime
- * @param server
- * @throws Exception
- */
- public void installInputData(Environment env,IRuntime serverRuntime,IServer server) throws Exception
- {
- env_ = env;
- serverRuntime_ = serverRuntime;
- server_ = server;
- installInputData();
- }
-
- /**
- * Install the input data for the test. This may include projects, source files etc.
- * @throws Exception
- */
- protected abstract void installInputData() throws Exception;
-
- /**
- * Install an instance of the server. This may also configure input data on the server.
- * @throws Exception
- */
- protected abstract void installServer() throws Exception;
-
- /**
- * Initialize the J2EE level, Web Service runtime type and Server defaults for the test case.
- * @throws Exception
- */
- protected abstract void initJ2EEWSRuntimeServerDefaults() throws Exception;
-
- /**
- * Initialize the initial selection which drives the Web Service wizard. This could include source Java files,
- * WSDL URLs and even EJBs.
- * @throws Exception
- */
- protected abstract void initInitialSelection() throws Exception;
-
- /**
- * Clean up the workspace. Cleanup consists of the following steps:
- * 1) Delete the input data. This should include removal of configuration data on the server if necessary.
- * 2) Stop the server.
- * 3) Delete the server.
- * 4) Delete the server runtime.
- */
- protected void tearDown() throws Exception
- {
- stopServer();
-// deleteServer();
-// deleteInputData();
-// deleteServerRuntime();
- }
-
- /**
- * Delete the input data. This should include removal of projects, src files etc. as well as removal of any server configured data.
- * @throws Exception
- */
- protected abstract void deleteInputData() throws Exception;
-
- /**
- * Stop the server if it is running.
- * @throws Exception
- */
- protected void stopServer() throws Exception
- {
- if (server_ != null && server_.getServerState() == IServer.STATE_STARTED)
- server_.stop(true);
- assertTrue(server_.getServerState() == IServer.STATE_STOPPED);
- }
-
- /**
- * Delete the server.
- * @throws Exception
- */
- protected void deleteServer() throws Exception
- {
- if (server_ != null)
- server_.delete();
- }
-
- /**
- * Delete the server runtime.
- * @throws Exception
- */
- protected void deleteServerRuntime() throws Exception
- {
- if (serverRuntime_ != null)
- serverRuntime_.delete();
- }
-
- /**
- * Get the default URL in the form of: http://localhost:9080/<contextRoot>/<path>
- * @param path - a file or URL relative path.
- * @param contextRoot - the context root of the Web module for this URL.
- * @return
- */
- protected String getDefaultURL(String path,String contextRoot)
- {
- StringBuffer url = new StringBuffer(defaultURL_);
- url.append(contextRoot);
- url.append('/');
- url.append(path);
- return url.toString();
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java
deleted file mode 100644
index 8658db6..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.axis.tomcat.v50;
-
-import org.eclipse.jst.ws.tests.WSWizardTest;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-
-
-public abstract class WSWizardTomcat50Test extends WSWizardTest {
-
- protected final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
- protected final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
- protected final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-
-
- /* (non-Javadoc)
- * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServerRuntime()
- */
- protected void installServerRuntime() throws Exception {
-
- serverRuntime_ = JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
- }
-
-
- /* (non-Javadoc)
- * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServer()
- */
- protected void installServer() throws Exception {
-
- server_ = JUnitUtils.createServer("Apache Tomcat v50", SERVERTYPEID_TC50, serverRuntime_, env_);
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java
deleted file mode 100644
index f768255..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.plugin;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
- //The shared instance.
- private static TestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- plugin = this;
- try {
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.tests.plugin.TestsPlugin");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- return resourceBundle;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
deleted file mode 100644
index 4234c3b..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestResult;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-/**
- * This class is to run all the unittest tests.
- */
-public class AllWSJUnitTests extends TestCase
-{
- /**
- * Method parseArgs.
- *
- * @param args
- */
- private void parseArgs(Object args)
- {
- // typicially args is an array of strings,
- // not sure when it wouldn't be.
- }
-
- public static void main(String[] args)
- {
- new AllWSJUnitTests().runMain(args);
- }
-
- public Object runMain(Object args)
- {
- Object result = null;
- try
- {
- TestRunner testRunner = null;
-
- parseArgs(args);
-
- testRunner = new TestRunner(System.out);
-
-
- Test suite = suite();
- TestResult testResult = testRunner.doRun(suite, false);
- printHeader(testResult);
- }
- catch (Exception e)
- {
- result = e;
- }
-
- return result;
- }
-
- public static Test suite()
- {
- TestSuite testSuite = new TestSuite();
- testSuite.addTest( ComponentCreationTests.suite() );
- testSuite.addTest( J2EEUtilsTests.suite() );
- testSuite.addTest( ServerCreationTests.suite());
- testSuite.addTest( ResourceUtilsTests.suite() );
-
-
- return testSuite;
- }
-
- /**
- * Prints the header of the report
- */
- protected void printHeader(TestResult result)
- {
- if (result.wasSuccessful())
- {
- System.out.println();
- System.out.print("OK");
- System.out.println(" (" + result.runCount() + " tests)");
-
- }
- else
- {
- System.out.println();
- System.out.println("FAILURES!!!");
- System.out.println(
- "Tests run: "
- + result.runCount()
- + ", Failures: "
- + result.failureCount()
- + ", Errors: "
- + result.errorCount());
- }
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
deleted file mode 100644
index b779ef8..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * Tests the various Component creation commands
- */
-public class ComponentCreationTests extends TestCase implements WSJUnitConstants {
-
- public static Test suite(){
- return new TestSuite(ComponentCreationTests.class);
- }
-
- public void testWebComponentCreation(){
-
- enableFlexProjectPreference();
- createServerRuntime();
- createWebModule(projectName, webComponentName, J2EEVersionConstants.J2EE_1_4_ID);
- createWebModule(projectName, webComponent2Name, J2EEVersionConstants.J2EE_1_3_ID);
-
- createWebModule(project2Name, webComp3Name, J2EEVersionConstants.J2EE_1_3_ID);
- createWebModule(project2Name, webComp4Name, J2EEVersionConstants.J2EE_1_3_ID);
-
- }
-
- public void enableFlexProjectPreference(){
- JUnitUtils.enableFlexProjectPreference();
- }
-
- public void createServerRuntime(){
-
- try {
- JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
- }
- catch(Exception e){
- e.printStackTrace();
- }
-
- }
-
- private void createWebModule(String projectNm, String componentName, int j2eeVersion){
-
- CreateModuleCommand cmc = new CreateModuleCommand();
- cmc.setJ2eeLevel(new Integer(j2eeVersion).toString());
- cmc.setModuleName(componentName);
- cmc.setModuleType(CreateModuleCommand.WEB);
- cmc.setProjectName(projectNm);
- cmc.setServerFactoryId(SERVERTYPEID_TC50);
- cmc.execute(null);
-
- System.out.println("Done creating Web component..."+projectNm+"\""+componentName);
- IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectNm);
- IVirtualComponent vc = ComponentCore.createComponent(p, componentName);
- assertTrue(vc.exists());
-
- }
-
- public void dtestCreateEJBModule(){
-
- CreateModuleCommand cmc = new CreateModuleCommand();
- cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
- cmc.setModuleName(ejbComponentName);
- cmc.setModuleType(CreateModuleCommand.EJB);
- cmc.setProjectName(ejbProjectName);
- cmc.setServerFactoryId(SERVERTYPEID_TC50);
- cmc.execute(null);
-
- System.out.println("Done creating EJB component.");
- IProject p = ResourceUtils.getWorkspaceRoot().getProject(ejbProjectName);
- IVirtualComponent vc = ComponentCore.createComponent(p, ejbComponentName);
- assertTrue(vc.exists());
- }
-
- public void dtestCreateAppClientModule(){
- CreateModuleCommand cmc = new CreateModuleCommand();
- cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
- cmc.setModuleName(appClientCompName);
- cmc.setModuleType(CreateModuleCommand.APPCLIENT);
- cmc.setProjectName(appClientProjectName);
- cmc.setServerFactoryId(SERVERTYPEID_TC50);
- cmc.execute(null);
-
- System.out.println("Done creating App client component.");
- IProject p = ResourceUtils.getWorkspaceRoot().getProject(appClientProjectName);
- IVirtualComponent vc = ComponentCore.createComponent(p, appClientCompName);
- assertTrue(vc.exists());
- }
-
- public void dtestCreateEARModule(){
- CreateModuleCommand cmc = new CreateModuleCommand();
- cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString());
- cmc.setModuleName(earCompName);
- cmc.setModuleType(CreateModuleCommand.EAR);
- cmc.setProjectName(projectName);
- cmc.setServerFactoryId(SERVERTYPEID_TC50);
- cmc.execute(null);
-
- System.out.println("Done creating EAR component.");
- IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectName);
- IVirtualComponent vc = ComponentCore.createComponent(p, earCompName);
- assertTrue(vc.exists());
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
deleted file mode 100644
index dbd6538..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.ws.internal.common.J2EEUtils;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * @author sengpl
- *
- */
-public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{
-
- private IProject project1 = null;
- private IProject project2 = null;
- private IProject ejbProject = null;
-
- private String comp1 = webComponentName;
- private String comp2 = webComponent2Name;
- private String comp3 = webComp3Name;
- private String comp4 = webComp4Name;
-
- protected void setUp() throws Exception {
- super.setUp();
-
- // Project and component names initialized here!
- project1 = ProjectUtilities.getProject(projectName);
- assertNotNull(project1);
-
- project2 = ProjectUtilities.getProject(project2Name);
- assertNotNull(project2);
-
- ejbProject = ProjectUtilities.getProject(ejbProjectName);
- assertNotNull(ejbProject);
-
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- // TODO Clear the workspace
-
- }
-
- public static Test suite()
- {
- return new TestSuite(J2EEUtilsTests.class);
- }
-
- public void testComponentsExist(){
- System.out.println("< BEGIN: testComponentExists ...");
- IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1, comp1);
- IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName(), comp3);
-
- assertTrue(vc1.exists());
- assertTrue(J2EEUtils.exists(project1, comp1));
- assertTrue(vc2.exists());
- assertTrue(J2EEUtils.exists(project2.getName(), comp3));
- System.out.println("< END: testComponentExists ...");
- }
-
- public void testLocationGetterMethods(){
-
- System.out.println("< BEGIN: testLocationGetterMethods ...");
- IPath loc1 = J2EEUtils.getWebContentPath(project1,comp1);
- System.out.println("WebContentPath of comp1 = "+loc1);
- IResource res = ResourceUtils.getWorkspaceRoot().findMember(loc1);
- assertTrue(res.exists());
- assertTrue(res.toString().endsWith("WebContent"));
-
- IPath loc2 = J2EEUtils.getWebContentPath(project2,comp3);
- System.out.println("WebContentPath of comp1 = "+loc2);
- IResource res2 = ResourceUtils.getWorkspaceRoot().findMember(loc2);
- assertTrue(res2.exists());
- assertTrue(res2.toString().endsWith("WebContent"));
-
- IPath loc3 = J2EEUtils.getWebInfPath(project1, comp2);
- System.out.println("Web-INF path = "+loc3);
- IResource res3 = ResourceUtils.getWorkspaceRoot().findMember(loc3);
- assertTrue(res3.exists());
- assertTrue(res3.toString().endsWith("WEB-INF"));
-
- IContainer container = J2EEUtils.getWebContentContainer(project2, comp3);
- IResource res4 = ResourceUtils.getWorkspaceRoot().findMember(container.getFullPath());
- assertEquals(res2, res4);
-
- System.out.println("< END: testLocationGetterMethods ...");
-
- }
-
- public void testJ2EEVersionMethods(){
-
- System.out.println("< BEGIN: testJ2EEVersionMethods ...");
-
- int j1 = J2EEUtils.getJ2EEVersion(project2, comp4);
-
- IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project1, comp2);
- int j2 = J2EEUtils.getJ2EEVersion(vc2);
- System.out.println("J2EEVersions p1: "+j2);
- System.out.println("J2EEVersions p2: "+j1);
- assertEquals(j1, j2);
-
- String j3 = J2EEUtils.getJ2EEVersionAsString(project1, comp1);
- System.out.println("J2EEVersion p1 as String: "+j3);
- assertEquals(j3, J2EEVersionConstants.VERSION_1_4_TEXT);
-
- System.out.println("< ENG: testJ2EEVersionMethods ...");
- }
-
- public void testComponentGetterMethods(){
-
- System.out.println("< BEGIN: testComponentGetterMethods ...");
-
- IVirtualComponent[] vcs = J2EEUtils.getAllComponents();
- checkVirtualComponentsExists(vcs);
-
- IVirtualComponent[] vcs2 = J2EEUtils.getAllEARComponents();
- checkVirtualComponentsExists(vcs2);
-
- IVirtualComponent[] vcs3 = J2EEUtils.getAllWebComponents();
- checkVirtualComponentsExists(vcs3);
-
- IVirtualComponent[] vcs4 = J2EEUtils.getWebComponents(project1);
- checkVirtualComponentsExists(vcs4);
-
- String[] names = J2EEUtils.getWebComponentNames(project2);
- printNameStrings(names);
-
- String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getComponentsByType(project1, J2EEUtils.WEB | J2EEUtils.EJB));
- printNameStrings(names2);
-
- IProject[] projects = J2EEUtils.getAllFlexibleProjects();
- for (int i=0;i<projects.length;i++){
- System.out.println("Flex project "+i+" = "+projects[i]);
- }
-
- System.out.println("< END: testComponentGetterMethods ...");
- }
-
- private void checkVirtualComponentsExists(IVirtualComponent[] vcs){
- for (int i=0; i<vcs.length;i++){
- IVirtualComponent vc = vcs[i];
- System.out.println("VC: Project = "+vc.getProject()+" Name = "+vc.getName());
- assertTrue(vc.exists());
-
- }
- }
-
- private void printNameStrings(String[] names){
- for (int i=0;i<names.length;i++){
- System.out.println("Name"+i+" = "+names[i]);
- }
- }
-
- public void dtestAssociateComponentCommand(){
-
- System.out.println("< BEGIN: testAssociateComponentCommand ...");
-
- AssociateModuleWithEARCommand amwe = new AssociateModuleWithEARCommand();
- amwe.setEar(earCompName);
- amwe.setEARProject(projectName);
- amwe.setModule(comp1);
- amwe.setProject(projectName);
- amwe.execute(null);
-
- System.out.println("< END: testAssociateComponentCommand ...");
- }
-
- public void dtestReferencingGetterMethods(){
-
- System.out.println("< BEGIN: testReferencingGetterMethods ...");
-
- System.out.println("isComponentAssociated ..");
- J2EEUtils.isComponentAssociated(project1, earCompName, project1, comp1);
-
- String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1, comp1));
- printNameStrings(names);
- String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2, comp3));
- printNameStrings(names2);
-
- String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1, earCompName));
- printNameStrings(names3);
-
- System.out.println("< END: testReferencingGetterMethods ...");
- }
-
- public void dtestIsComponentMethods(){
-
- System.out.println("< BEGIN: testIsComponentMethods ...");
-
- //assertFalse(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName));
- assertTrue(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName));
-
- System.out.println("< END: testIsComponentMethods ...");
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
deleted file mode 100644
index ec2f6aa..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import org.eclipse.core.runtime.IPlatformRunnable;
-
-/**
- * Minimal app to run as Eclipse "application"
- */
-public class LaunchTest implements IPlatformRunnable
-{
- /**
- * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object)
- */
- public Object run(Object args) throws Exception
- {
-
- Object result = new AllWSJUnitTests().runMain(args);
-
- if (result != null)
- {
- if (result instanceof Throwable)
- {
- ((Throwable) result).printStackTrace();
- }
- else
- {
- System.out.println("tests didn't return 'ok'");
- }
- return result;
- }
- else
- return IPlatformRunnable.EXIT_OK;
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java
deleted file mode 100644
index c8309e6..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.ws.internal.common.ResourceUtils;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-/**
- * JUnit tests for selective ResourceUtils methods. Calls which return a simple String or rely on a IResource
- * API need not be tested. The focus is mainly to exercise Component and Flexible project APIs.
- *
- */
-public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{
-
-
- public static Test suite(){
- return new TestSuite(ResourceUtilsTests.class);
- }
-
- public void testComponentType(){
- IProject project = ProjectUtilities.getProject(projectName);
- String componentType = ResourceUtils.getComponentType(project, webComponentName);
- assertEquals(IModuleConstants.JST_WEB_MODULE, componentType);
- }
-
- public void testComponentOf(){
- IProject project = ProjectUtilities.getProject(projectName);
- IPath destPath = ResourceUtils.getJavaSourceLocation(project, webComponentName);
- IFolder folder = (IFolder)ResourceUtils.findResource(destPath);
- try {
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseStatusHandler handler = new EclipseStatusHandler();
- EclipseProgressMonitor monitor = new EclipseProgressMonitor();
- EclipseEnvironment env = new EclipseEnvironment( null, resourceContext, monitor, handler );
-
- JUnitUtils.copyTestData("BUJava/src", folder, env);
- }
- catch (Exception ex){
- ex.printStackTrace();
- }
-
- IPath javaFilePath = folder.getFile(new Path("foo/Echo.java")).getFullPath();
- IVirtualComponent vc = ResourceUtils.getComponentOf(javaFilePath);
- assertTrue(vc.exists());
-
-
- }
-
- public void testJavaSourceLocation(){
- IProject project = ProjectUtilities.getProject(projectName);
- String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project, webComponent2Name).toString();
- System.out.println("Java source location = "+javaSourceLoc);
- assertTrue(javaSourceLoc.endsWith("JavaSource"));
-
- // get all the JavaSourceLocations via the VirtualComponent
- IVirtualComponent vc1 = ComponentCore.createComponent(project, webComponent2Name);
- IVirtualComponent vc2 = ComponentCore.createComponent(project, webComponentName);
- IVirtualComponent[] vcs = new IVirtualComponent[]{vc1, vc2};
- IPath[] paths = ResourceUtils.getAllJavaSourceLocations(vcs);
-
- // verify first folder exists
- IPath path1 = (IPath)paths[0];
- IResource resource = ResourceUtils.findResource(path1);
- if (resource.exists()){
- assertEquals(IResource.FOLDER, resource.getType());
- }
-
- // verify second folder exists
- IPath path2 = (IPath)paths[1];
- IResource resource2 = ResourceUtils.findResource(path2);
- if (resource2.exists()){
- assertEquals(IResource.FOLDER, resource2.getType());
- }
- }
-
- public void testWebComponentServerRoot() {
- IProject project = ProjectUtilities.getProject(projectName);
- IFolder folder = ResourceUtils.getWebComponentServerRoot(project, webComponentName);
- assertTrue(folder.exists());
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java
deleted file mode 100644
index 8ede8a2..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.ws.tests.unittest;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand;
-import org.eclipse.jst.ws.tests.util.JUnitUtils;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.ServerCore;
-
-public class ServerCreationTests extends TestCase implements WSJUnitConstants{
-
-
- public static Test suite(){
- return new TestSuite(ServerCreationTests.class);
- }
-
- public void init(){
- try {
- JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH);
- }
- catch(Exception e){
- e.printStackTrace();
- }
- }
-
- public void testCreateTomcatv5Server(){
- init();
-
- System.out.println("Creating Tomcat v5 server.");
- CreateServerCommand csc = new CreateServerCommand();
- csc.setServerFactoryid(SERVERTYPEID_TC50);
- csc.execute(null);
-
- IServer server = null;
- String instId = csc.getServerInstanceId();
- System.out.println("Server instance Id = "+instId);
- if (instId!=null){
- server = ServerCore.findServer(instId);
- }
- assertNotNull(server);
-
- System.out.println("Done creating Tomcat v5 server.");
- }
-
- public void testReattemptCreateTomcatv5Server(){
- System.out.println("Attempting to create 2nd Tomcat v5 server.");
- CreateServerCommand csc = new CreateServerCommand();
- csc.setServerFactoryid(SERVERTYPEID_TC50);
- csc.execute(null);
-
- IServer server = null;
- String instId = csc.getServerInstanceId();
- if (instId!=null) {
- server = ServerCore.findServer(instId);
- }
- assertNotNull(server);
-
- System.out.println("Done attempting 2nd Tomcat v5 server creation.");
- }
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
deleted file mode 100644
index 27a2336..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jst.ws.tests.unittest;
-
-
-public interface WSJUnitConstants {
-
- public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50");
- public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50";
-
- public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11";
-
- public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50";
-
- public final String webProjectName = "WebProject";
-
- // flexible project structure 1
- public final String projectName = "FlexProject";
- public final String webComponentName = "webComponent";
- public final String webComponent2Name = "webComp2";
-
- // flexible project structure 2
- public final String project2Name = "FlexProject2";
- public final String webComp3Name = "webComp3";
- public final String webComp4Name = "webComp4";
-
- public final String ejbProjectName = "FlexEJBProject";
- public final String ejbComponentName = "ejbComponent";
-
- public final String appClientProjectName = "FlexAppClientProject";
- public final String appClientCompName = "appClientComponent";
-
- public final String earCompName = "EARComponent";
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java
deleted file mode 100644
index 418e7c2..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import java.util.Vector;
-
-import org.eclipse.wst.command.internal.provisional.env.core.common.Choice;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusException;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-public class AccumulateStatusHandler implements StatusHandler {
- Vector statusList_;
-
- public AccumulateStatusHandler()
- {
- resetStatus();
- }
-
- /**
- * Resets the status so that it starts out empty again.
- *
- */
- public void resetStatus()
- {
- statusList_ = new Vector();
- }
-
- public Status getStatus()
- {
- Status worstStatus = new SimpleStatus( "", "", Status.OK );
-
- // Find the worst error status code
- for( int index = 0; index < statusList_.size(); index++ )
- {
- Status status = (Status)statusList_.elementAt( index );
-
- if( status.getSeverity() > worstStatus.getSeverity() )
- {
- worstStatus = status;
- }
- }
-
- return new SimpleStatus( worstStatus.getId(),
- worstStatus.getMessage(),
- (Status[])statusList_.toArray( new Status[0] ) );
- }
-
- /**
- * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[])
- */
- public Choice report(Status status, Choice[] choices)
- {
- Choice result = null;
-
- // Always take the first choice if available.
- if( choices != null && choices.length > 0 )
- {
- result = choices[0];
- }
-
- statusList_.add( status );
-
- return result;
- }
-
- /**
- * @see org.eclipse.env.common.StatusHandler#report(org.eclipse.env.common.Status)
- */
- public void report(Status status) throws StatusException
- {
- statusList_.add( status );
- }
-
- /*
- * Report a warning.
- */
- private boolean reportWarning(Status status)
- {
- statusList_.add( status );
-
- return true;
- }
-
- /**
- * @see com.ibm.env.common.StatusHandler#reportError(com.ibm.env.common.Status)
- */
- public void reportError(Status status)
- {
- statusList_.add( status );
- }
-
- /**
- * @see com.ibm.env.common.StatusHandler#reportInfo(com.ibm.env.common.Status)
- */
- public void reportInfo(Status status)
- {
- statusList_.add( status );
- }
-
-}
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java
deleted file mode 100644
index f1d2203..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import org.eclipse.jface.operation.IRunnableContext;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.wst.command.internal.env.context.PersistentResourceContext;
-import org.eclipse.wst.command.internal.env.core.data.DataFlowManager;
-import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl;
-import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment;
-import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseProgressMonitor;
-import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager;
-import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Log;
-import org.eclipse.wst.command.internal.provisional.env.core.common.StatusHandler;
-
-public class DynamicPopupJUnitWizard extends DynamicPopupWizard {
- private StatusHandler handler_;
- private Log log_;
- public DynamicPopupJUnitWizard(StatusHandler handler)
- {
- handler_ = handler;
- }
-
- public DynamicPopupJUnitWizard(StatusHandler handler, Log log)
- {
- handler_ = handler;
- log_ = log;
- }
-
- public void runHeadLess(IStructuredSelection selection,IRunnableContext context) {
- CommandFragment rootFragment = getRootFragment( selection, null );
- PersistentResourceContext resourceContext = PersistentResourceContext.getInstance();
- EclipseProgressMonitor monitor = new EclipseProgressMonitor();
- EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, monitor, handler_ );
- if (log_!=null)
- environment.setLog(log_);
-
- DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl();
- DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment );
- SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager);
-
- commandWidgetBinding_.registerDataMappings( dataRegistry_ );
- manager.setRootFragment( rootFragment );
- manager.runForwardToNextStop( context );
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
deleted file mode 100644
index 86f98a2..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java
+++ /dev/null
@@ -1,419 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.Enumeration;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jst.j2ee.internal.web.operations.WebNatureRuntimeUtilities;
-import org.eclipse.jst.ws.internal.common.EnvironmentUtils;
-import org.eclipse.jst.ws.internal.common.ServerUtils;
-import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand;
-import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin;
-import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext;
-import org.eclipse.jst.ws.internal.context.ScenarioContext;
-import org.eclipse.jst.ws.internal.plugin.WebServicePlugin;
-import org.eclipse.jst.ws.tests.plugin.TestsPlugin;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.wst.command.internal.env.common.FileResourceUtils;
-import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand;
-import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext;
-import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Environment;
-import org.eclipse.wst.command.internal.provisional.env.core.common.SimpleStatus;
-import org.eclipse.wst.command.internal.provisional.env.core.common.Status;
-import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext;
-import org.eclipse.wst.common.frameworks.internal.FlexibleJavaProjectPreferenceUtil;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServer;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.ws.internal.ui.plugin.WSUIPlugin;
-import org.eclipse.wst.ws.internal.ui.wsi.preferences.PersistentWSIContext;
-
-
-public class JUnitUtils {
- // Begin Server Utilities
- public static IRuntime createServerRuntime(String runtimeTypeId,String serverInstallPath) throws Exception
- {
- IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId);
- IRuntimeWorkingCopy wc = rt.createRuntime("aRuntime", null);
- wc.setLocation(new Path(serverInstallPath));
-
- return wc.save(true, null);
- }
-
- public static IServer createServer(String name,String serverTypeId,IRuntime runtime,Environment env) throws Exception
- {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- IServer[] servers = ServerCore.getServers();
- for (int i=0;i<servers.length;i++){
- if(servers[i].getServerType().getId().equals(serverType.getId())){
- return servers[i];
- }
- }
-
- IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null,EnvironmentUtils.getIProgressMonitor(env));
- serverWc.setName(name);
- serverWc.setRuntime(runtime);
- IServer server = serverWc.saveAll(true, EnvironmentUtils.getIProgressMonitor(env));
- return server;
- }
-
- /**
- * createServer and install JRE for Servers requiring a specific JRE
- * @param javaRuntimePath JRE install location; i.e. E:\\Java141
- * @param jreID JRE id; i.e. java141
- * @param name server name
- * @param serverTypeId server type id
- * @param runtime IRuntime
- * @param env Environment
- * @return server IServer
- * @throws Exception
- *
- * @deprecated
- */
- public static IServer createServer(String javaRuntimePath, String jreID, String name,String serverTypeId,IRuntime runtime,Environment env) throws Exception
- {
- IServerType serverType = ServerCore.findServerType(serverTypeId);
- IServer[] servers = ServerCore.getServers();
- for (int i=0;i<servers.length;i++){
- if(servers[i].getServerType().getId().equals(serverType.getId())){
- return servers[i];
- }
- }
-
- IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null,EnvironmentUtils.getIProgressMonitor(env));
- serverWc.setName(name);
- serverWc.setRuntime(runtime);
-
- IServer server = serverWc.saveAll(true, EnvironmentUtils.getIProgressMonitor(env));
-
- return server;
- }
-
- public static void startServer(IServer server,Environment env) throws Exception
- {
- final IServer currentServer = server;
- final Environment currentEnv = env;
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- try
- {
- currentServer.start(ILaunchManager.RUN_MODE,EnvironmentUtils.getIProgressMonitor(currentEnv));
- }
- catch (CoreException e)
- {
- InterruptedException wrapper = new InterruptedException(e.getMessage());
- wrapper.setStackTrace(e.getStackTrace());
- throw wrapper;
- }
- }
- };
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- }
-
- public static boolean removeEARFromServer(IServer server,IProject earProject,Environment env) throws Exception
- {
- int numberOfModules = server.getModules().length;
- if (server != null)
- {
- final IModule[] modules = ServerUtil.getModules(earProject);
- final IModule earProjectModule = modules[0];
- new ServerUtils().modifyModules(env, server,earProjectModule,false,EnvironmentUtils.getIProgressMonitor(env));
- final IServer currentServer = server;
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- for (int i=0;i<1000;i++)
- {
- int moduleState = currentServer.getModuleState(modules);
- if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING)
- {
- try
- {
- Thread.sleep(300);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace(System.err);
- }
- }
- else
- break;
- }
- }
- };
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- return (server.getModules().length == (numberOfModules-1));
- }
- return false;
- }
-
- public static boolean removeModuleFromServer(IServer server, IProject webProject, Environment env) throws Exception {
-
- int numberOfModules = server.getModules().length;
- if (server != null)
- {
- final IModule[] modules = ServerUtil.getModules(webProject);
- final IModule webProjectModule = modules[0];
-
- new ServerUtils().modifyModules(env, server,webProjectModule,false,EnvironmentUtils.getIProgressMonitor(env));
- final IServer currentServer = server;
- IRunnableWithProgress runnable = new IRunnableWithProgress()
- {
- public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException
- {
- for (int i=0;i<1000;i++)
- {
- int moduleState = currentServer.getModuleState(modules);
- if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING)
- {
- try
- {
- Thread.sleep(300);
- }
- catch (InterruptedException e)
- {
- e.printStackTrace(System.err);
- }
- }
- else
- break;
- }
- }
- };
- PlatformUI.getWorkbench().getProgressService().run(true,false,runnable);
- //Thread.sleep(6000);
- return (server.getModules().length == (numberOfModules-1));
- }
- return false;
- }
-
- // Begin: General Eclipse Utilities
-
- public static void syncBuildProject(IProject project,Environment env) throws Exception
- {
- project.build(IncrementalProjectBuilder.FULL_BUILD,EnvironmentUtils.getIProgressMonitor(env));
- WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand();
- cmd.execute(env);
- }
-
- private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,Environment env) throws Exception
- {
- Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString);
- while (e.hasMoreElements())
- {
- String filePath = (String)e.nextElement();
- if (filePath.endsWith("/"))
- copyTestFiles(filePath,rootSegmentLength,destFolder,env);
- else
- {
- IPath fileIPath = new Path(filePath);
- FileResourceUtils.copyFile(EnvironmentUtils.getResourceContext(env),
- TestsPlugin.getDefault(),
- fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir>
- (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir>
- destFolder.getFullPath(),
- env.getProgressMonitor(),
- env.getStatusHandler());
- }
- }
- }
-
- public static void copyTestData(String dataSubdirectory,IFolder destFolder,Environment env) throws Exception
- {
- String pathString = "/data/"+dataSubdirectory;
- copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env);
-
- }
-
- // Begin: Web Services Utilities
- public static void hideActionDialogs()
- {
- PersistentActionDialogsContext actionDialogsCtx = PersistentActionDialogsContext.getInstance();
- ActionDialogPreferenceType[] actionDialogPrefs = actionDialogsCtx.getDialogs();
- for (int i=0;i<actionDialogPrefs.length;i++)
- actionDialogsCtx.setActionDialogEnabled(actionDialogPrefs[i].getId(),true);
- }
-
-
- public static boolean enableProxyGeneration(boolean enable)
- {
- ScenarioContext ctx = WebServicePlugin.getInstance().getScenarioContext();
- boolean previousSetting = ctx.getGenerateProxy();
- ctx.setGenerateProxy(enable);
- return previousSetting;
- }
-
- public static void enableFlexProjectPreference(){
- FlexibleJavaProjectPreferenceUtil.setMultipleModulesPerProjectProp( true );
- }
-
- public static boolean enableOverwrite(boolean enable)
- {
- ResourceContext ctx = WebServicePlugin.getInstance().getResourceContext();
- boolean previousSetting = ctx.isOverwriteFilesEnabled();
- ctx.setOverwriteFilesEnabled(enable);
- return previousSetting;
- }
-
- public static void disableWSIDialog(IProject project){
-
- PersistentWSIContext ctx = WSUIPlugin.getInstance().getWSIAPContext();
- ctx.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-
- PersistentWSIContext ctx2 = WSUIPlugin.getInstance().getWSISSBPContext();
- ctx2.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI);
-
- }
-
- public static void setJ2EEWSRuntimeServer(String j2eeLevel,String wsRuntimeId,String serverTypeId)
- {
- PersistentServerRuntimeContext serverRuntimeCtx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext();
- serverRuntimeCtx.setJ2EEVersion(j2eeLevel);
- serverRuntimeCtx.setRuntimeId(wsRuntimeId);
- serverRuntimeCtx.setServerFactoryId(serverTypeId);
- }
-
- private static Status launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions();
- for (int i=0;i<extensions.length;i++)
- {
- if (extensions[i].getNamespace().equals(pluginNS));
- {
- IConfigurationElement[] configElements = extensions[i].getConfigurationElements();
- for (int j=0;j<configElements.length;j++)
- {
- if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId))
- {
- IConfigurationElement actionElement = configElements[j].getChildren()[0];
- AccumulateStatusHandler statusHandler = new AccumulateStatusHandler();
- DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler);
- wizard.setInitializationData(actionElement,null,null);
- wizard.selectionChanged(null,initialSelection);
- wizard.run(null);
- return statusHandler.getStatus();
- }
- }
- }
- }
- return new SimpleStatus("","No wizard found for: ",Status.ERROR);
- }
-
- public static Status launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection);
- }
-
- public static Status launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception
- {
- return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection);
- }
-
- public static Status createWebModule(String webProjectName, String moduleName, String serverFactoryId, String j2eeVersion, Environment env){
-
- Status status = new SimpleStatus("");
- try{
- CreateModuleCommand createWeb = new CreateModuleCommand();
- createWeb.setProjectName(webProjectName);
- createWeb.setModuleName(moduleName);
- createWeb.setModuleType(CreateModuleCommand.WEB);
- createWeb.setJ2eeLevel(j2eeVersion);
- createWeb.setServerFactoryId(serverFactoryId);
- return createWeb.execute(env);
- }
- catch (Exception e){
- status = new SimpleStatus("",e.getMessage(), Status.ERROR, e);
- }
- return status;
-
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- * @deprecated
- */
- public static IFolder getSourceFolderForWebProject(String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
-
- IFolder srcFolder = project.getFolder(WebNatureRuntimeUtilities.getDefaultJavaSourceName());
- return srcFolder;
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- * @deprecated
- */
- public static IFolder getWebContentFolder(String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- IFolder webContentFolder = project.getFolder(WebNatureRuntimeUtilities.getDefaultJ2EEWebContentPath());
- return webContentFolder;
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- * @deprecated
- */
- public static IFolder getWebInfFolderForWebProject(String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- return project.getFolder(WebNatureRuntimeUtilities.getDefaultWEBINFPath());
- }
-
- /**
- *
- * @param projectName
- * @return
- *
- * @deprecated
- */
- public static IFolder getClassesFolderForWebProject(String projectName)
- {
- IProject project = ProjectUtilities.getProject(projectName);
- return project.getFolder(WebNatureRuntimeUtilities.getDefaultWebOutputFolderPath());
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java
deleted file mode 100644
index 4217d82..0000000
--- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.ws.tests.util;
-
-public class ScenarioConstants {
- // Bottom up Java or EJB to Web Service wizard ID.
- public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java";
-
- // Top down WSDL to Skeleton Web Service wizard ID.
- public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton";
-
- // Web Service client wizard ID.
- public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard";
-
- // Object class for:
- // 1) Java source (bottom-up)
- // 2) WSDL or WSIL (top-down or client).
- public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile";
-
- // Object class for Java compilation units (i.e. Java classes selected in the Java perspective).
- public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit";
-
- // Object class for a service selected in the J2EE perspective (top-down or client).
- public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service";
-
- // Object class for a WSDLResourceImpl (top-down or client).
- public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl";
-
- // Object class for a ServiceRef (top-down or client).
- public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef";
-
- // Object class for a ServiceImplBean (bottom-up).
- public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean";
-
- // Object class for a BeanLink (bottom-up).
- public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink";
-}
\ No newline at end of file
