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 cb0105380..000000000 --- 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 862f49caa..000000000 --- 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 846a39435..000000000 --- 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 c9ce80bde..000000000 --- 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 6f6b96c4c..000000000 --- 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 9e02a693e..000000000 --- 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 5e9ff7c46..000000000 --- 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 c911fbfbd..000000000 --- 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 0038ec5d8..000000000 --- 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 46cb492ed..000000000 --- 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 cdf8cf592..000000000 --- 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 a7b7abdd1..000000000 --- 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 c3da781b3..000000000 --- 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 84cd5f4d7..000000000 --- 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 cb0105380..000000000 --- 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 a21e9e032..000000000 --- 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 cb0ee10ec..000000000 --- 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 cecc076d9..000000000 --- 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 6f6b96c4c..000000000 --- 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 b3397df7a..000000000 --- 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 cb7a83ddf..000000000 --- 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 9bfda1ae6..000000000 --- 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 5a9b0bbbb..000000000 --- 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 b4ed22828..000000000 --- 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 0dbdba1c6..000000000 --- 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 f1d53ac8c..000000000 --- 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 dd77be000..000000000 --- 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 12b9ac1c8..000000000 --- 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 4515739c4..000000000 --- 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 bdd9d3584..000000000 --- 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 63e0ff4ce..000000000 --- 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 d0536f46b..000000000 --- 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 cbe455d34..000000000 --- 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 fec15b9c1..000000000 --- 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 9a891abaa..000000000 --- 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 233ba12c8..000000000 --- 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 b4eeff87e..000000000 --- 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 7edd10a66..000000000 --- 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 70cc60b34..000000000 --- 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 1ffb7d090..000000000 --- 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 ae95c0f8b..000000000 --- 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 8cba8ba3f..000000000 --- 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 04b3ab142..000000000 --- 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 8b973b2e3..000000000 --- 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 2c074cc8b..000000000 --- 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 68269d186..000000000 --- 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 cb652a18a..000000000 --- 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 42afccbb1..000000000 --- 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 bf515af3a..000000000 --- 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 9048ea8d2..000000000 --- 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 267156313..000000000 --- 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 adada38bb..000000000 --- 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 ffe4c672b..000000000 --- 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 05446c960..000000000 --- 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 a892c8141..000000000 --- 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 fb2a5e220..000000000 --- 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 551c8d2b5..000000000 --- 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 dbb43b648..000000000 --- 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 33b674c73..000000000 --- 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 cb0105380..000000000 --- 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 8bb59e1f7..000000000 --- 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 0a3d1e91a..000000000 --- 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 632f6d6b4..000000000 --- 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 6f6b96c4c..000000000 --- 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 ee1304669..000000000 --- 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 3fdf164ac..000000000 --- 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 4d4dd705a..000000000 --- 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 8d41aad90..000000000 --- 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 07b7fc5a3..000000000 --- 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 a65876c70..000000000 --- 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 de3a51569..000000000 --- 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 b378b6b78..000000000 --- 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 316fa71b5..000000000 --- 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 1007507ef..000000000 --- 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/CopyDeploymentFileCommand.java b/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java deleted file mode 100644 index 9032a39ed..000000000 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/command/CopyDeploymentFileCommand.java +++ /dev/null @@ -1,86 +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 org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -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.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.componentcore.internal.StructureEdit; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; -import org.eclipse.wst.common.componentcore.resources.IVirtualFile; - -/** - * - * This command copies the server-config.wsdd file to it's proper location in the module. - * - */ - -public class CopyDeploymentFileCommand extends SimpleCommand -{ - private String projectName_; - private String componentName_; - - /** - * Constructor for CopyDeploymentFileCommand. - * @param String description - * @param String name - * - */ - public CopyDeploymentFileCommand( String projectName, String componentName ) - { - super("org.eclipse.jst.ws.internal.axis.consumption.core.command.CopyDeploymentFileCommand", "org.eclipse.jst.ws.internal.axis.consumption.core.command.CopyDeploymentFileCommand"); - - projectName_ = projectName; - componentName_ = componentName; - } - - public Status execute(Environment environment) - { - Status status = new SimpleStatus(""); - - try - { - IVirtualComponent component = J2EEUtils.getVirtualComponent( projectName_, componentName_ ); - IFolder root = StructureEdit.getOutputContainerRoot( component ); - IPath path = new Path( "WEB-INF" ).append( "server-config.wsdd" ); - IFile descriptorFile = root.getFile( path ); - IVirtualFile newLocation = component.getRootFolder().getFile( path ); - IPath targetPath = newLocation.getWorkspaceRelativePath(); - IFile targetFile = (IFile)ResourceUtils.findResource( targetPath ); - - descriptorFile.refreshLocal( 0, null ); - - if( targetFile != null && targetFile.exists() ) - { - // The target file already exists so we will just overwrite its contents. - targetFile.setContents( descriptorFile.getContents(), true, false, null ); - } - else - { - // The target file doesn't exist so we will copy it. - descriptorFile.copy( targetPath, true, null ); - } - } - catch( Throwable exc ) - { - } - - return status; - } -} 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 7aa3ad24e..000000000 --- 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 64b89753f..000000000 --- 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 8ecc02fad..000000000 --- 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 360836749..000000000 --- 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 8676c3f4a..000000000 --- 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 c3ee802c9..000000000 --- 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 6e44bb2eb..000000000 --- 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 2fe3eaaf0..000000000 --- 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 d513f136f..000000000 --- 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 83a4a3216..000000000 --- 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 d83dc372f..000000000 --- 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 9de2a11e1..000000000 --- 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 346a63be8..000000000 --- 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 417e21b01..000000000 --- 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 2345bc160..000000000 --- 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 053d10065..000000000 --- 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 e96b20ea4..000000000 --- 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 6ce5371e2..000000000 --- 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 0b6a14d97..000000000 --- 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 7e86a18a0..000000000 --- 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 5f2115a93..000000000 --- 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 d930940f6..000000000 --- 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 36cc921f4..000000000 --- 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 1114fde6f..000000000 --- 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 c5d15943e..000000000 --- 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 cbab9b4e9..000000000 --- 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 7c946b74c..000000000 --- a/bundles/org.eclipse.jst.ws.axis.creation.ui/src/org/eclipse/jst/ws/internal/axis/creation/ui/wsrt/AxisWebService.java +++ /dev/null @@ -1,339 +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.CopyDeploymentFileCommand; -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 CopyDeploymentFileCommand( project, module ) ); - 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 1e7f78be2..000000000 --- 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 38c8c87d7..000000000 --- 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 cb0105380..000000000 --- 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 491c19c4f..000000000 --- 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 788372810..000000000 --- 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 bcd5bfb4a..000000000 --- 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 6f6b96c4c..000000000 --- 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 5587d1f61..000000000 --- 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 Binary files differdeleted file mode 100644 index 8da3a2131..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/config_handler_wiz.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index a113c85cc..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/configure_handlers.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index eaba51f62..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/generated_sample.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1ee05fa2e..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/ctool16/newclient_webserv_wiz.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 1060dd967..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/configure_handlers.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 590d3965f..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/dtool/generated_sample.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 68b7a2651..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/full/wizban/webservicesclient_wiz.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 927ad5ad4..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/gen_sample_wiz.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 641fe843a..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index a3061e6ff..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/import_ws_wiz.gif +++ /dev/null diff --git a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif b/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif Binary files differdeleted file mode 100644 index 5b43cae7b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/registry.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index afb6cb7d7..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/existing_server_obj.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index afb6cb7d7..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/servers/servers_obj.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 53e7dbd12..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/html.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 11b34b7db..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wiz_banner_wsil.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 618a946cd..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/import_wsil.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 8fb844f5b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsdl.gif +++ /dev/null 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 Binary files differdeleted file mode 100644 index 7c5916fb6..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/icons/wsil/wsil.gif +++ /dev/null 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 ccd373839..000000000 --- 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 35e1a5694..000000000 --- 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 699521323..000000000 --- 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 61cefe041..000000000 --- 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 3bbe2f214..000000000 --- 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 ec44bcaf7..000000000 --- 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 e462b0487..000000000 --- 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 2026ac91f..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/consumption/ui/plugin.properties +++ /dev/null @@ -1,525 +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} -MSG_ERROR_NO_SERVER_RUNTIME=No suitable server can be found for the {0} Web service runtime. Go to Window > Preferences. Select Server > Installed Runtimes and configure one of the following: {1} - - - - -# -#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_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME=The flexible project preference is off. Therefore, project names and module names must be the same for new modules. - -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 672f9609d..000000000 --- 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 56f58a884..000000000 --- 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 bb2622643..000000000 --- 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 77efef80c..000000000 --- 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 51d4f6f56..000000000 --- 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 8f8400b6e..000000000 --- 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 0f772542b..000000000 --- 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 c96075d21..000000000 --- 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 7ac5f0dd8..000000000 --- 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 4a6be0397..000000000 --- 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 a603ed932..000000000 --- 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 3b890d399..000000000 --- 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[i]; - 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 718059ffa..000000000 --- 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 9e89985aa..000000000 --- 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 15e2af38f..000000000 --- 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 9ed91ca8a..000000000 --- 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 e4eac74f3..000000000 --- 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 22c9e07a7..000000000 --- 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 70ae56994..000000000 --- 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 092411ee4..000000000 --- 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 946f456f7..000000000 --- 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 50cf57147..000000000 --- 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 96b9860ad..000000000 --- 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 fa328a13e..000000000 --- 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 8a95a5a62..000000000 --- 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 60443a388..000000000 --- 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 d6301b04d..000000000 --- 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 82b37bf18..000000000 --- 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 3129a7ea0..000000000 --- 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 69436a0ea..000000000 --- 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 5a8499ab7..000000000 --- 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 78a6343f2..000000000 --- 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 870ba7988..000000000 --- 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 e1f7be27e..000000000 --- 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 1d1f70662..000000000 --- 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 27dfbe0c9..000000000 --- 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 9a40b1af2..000000000 --- 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 575027539..000000000 --- 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 667c432c8..000000000 --- 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 8a18713b6..000000000 --- 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 4b501b6e0..000000000 --- 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 df255bfb7..000000000 --- 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 84d8ac27a..000000000 --- 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 96dc1d544..000000000 --- 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 9b3397cea..000000000 --- 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 934623ce7..000000000 --- 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 6d721c7e2..000000000 --- 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 c72ae8850..000000000 --- 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 a0eebe22a..000000000 --- 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 1a65d9404..000000000 --- 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 5f5414fde..000000000 --- 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 837b0f3bb..000000000 --- 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 eeaf6294e..000000000 --- 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 d177d8d94..000000000 --- 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 c11956249..000000000 --- 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 fef5a9fab..000000000 --- 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 8ddff55a9..000000000 --- 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 6f1829e19..000000000 --- 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 53e018631..000000000 --- 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 7a8b886c0..000000000 --- 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 61f6e3a66..000000000 --- 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 922cf67ed..000000000 --- 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 98afd649a..000000000 --- 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 a7be6f437..000000000 --- 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 3bafa00e6..000000000 --- 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 eef2d28c1..000000000 --- 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 41d9522b6..000000000 --- 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 87b31d70f..000000000 --- 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 7f5d8729e..000000000 --- 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 8cdbd641b..000000000 --- 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 9695f9fbd..000000000 --- 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 546120c40..000000000 --- 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 1d0e7fb15..000000000 --- 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 67fd5ee77..000000000 --- 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 b0a600576..000000000 --- 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 0e4ad0a16..000000000 --- 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 4e16c4650..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ClientRuntimeSelectionWidgetDefaultingCommand.java +++ /dev/null @@ -1,1256 +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(); - Status serverStatus = setClientDefaultServer(); - if (serverStatus.getSeverity()== Status.ERROR) - { - environment.getStatusHandler().reportError(serverStatus); - return serverStatus; - } - 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 = false; - if (componentName != null && componentName.length()>0) - { - 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 Status setClientDefaultServer() - { - Status status = new SimpleStatus(""); - //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]); - } - } - else - { - //Since the project and the EAR are both new, try changing the J2EE level - boolean foundServer = false; - WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(clientIds_.getRuntimeId()); - if (wsrt != null) - { - String[] versions = wsrt.getJ2eeLevels(); - if (versions != null && versions.length > 0) - { - for (int k=0; k<versions.length; k++) - { - //If this J2EE version is different from the current one, see if there is - //a server available. - if (clientJ2EEVersion_!=versions[k]) - { - String[] si = ServerSelectionUtils.getServerFromWebServceRuntimeAndJ2EE(clientIds_.getRuntimeId(), versions[k]); - if (si!=null) - { - if (si[0]!=null && si[0].length()>0) - { - clientIds_.setServerId(si[0]); - } - if (si[1]!=null && si[1].length()>0) - { - clientIds_.setServerInstanceId(si[1]); - } - clientJ2EEVersion_ = versions[k]; - foundServer = true; - break; - } - - } - } - } - } - //No valid server runtimes appear to be configured, this is an error condition. - if (!foundServer) - { - String runtimeLabel = WebServiceRuntimeExtensionUtils.getRuntimeLabelById(clientIds_.getRuntimeId()); - String serverLabels = getServerLabels(clientIds_.getRuntimeId()); - status = new SimpleStatus("", msgUtils_.getMessage("MSG_ERROR_NO_SERVER_RUNTIME", new String[]{runtimeLabel, serverLabels}),Status.ERROR); - } - - } - } - - } - - return status; - } - - protected String getServerLabels(String runtimeId) - { - WebServiceRuntimeInfo wsrt = WebServiceRuntimeExtensionUtils.getWebServiceRuntimeById(runtimeId); - String[] validServerFactoryIds = wsrt.getServerFactoryIds(); - //String[] validServerLabels = new String[validServerFactoryIds.length]; - StringBuffer validServerLabels = new StringBuffer(); - for (int i=0; i<validServerFactoryIds.length; i++) - { - if (i>0) - { - validServerLabels.append(", "); - } - validServerLabels.append(WebServiceRuntimeExtensionUtils.getServerLabelById(validServerFactoryIds[i])); - - } - return validServerLabels.toString(); - } - - 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 0f470b9f4..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/widgets/runtime/ProjectSelectionWidget.java +++ /dev/null @@ -1,632 +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.core.resources.ResourcesPlugin; -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.widgets.Combo; -import org.eclipse.swt.widgets.Composite; -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; -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_); - - statusListener_ = statusListener; - - if (isClient_) - { - moduleProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_PROJECT", "LABEL_CLIENT_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - module_ = uiUtils.createCombo(parent, "LABEL_CLIENT_MODULE", "LABEL_CLIENT_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - earProject_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_PROJECT", "LABEL_CLIENT_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - earModule_ = uiUtils.createCombo(parent, "LABEL_CLIENT_EAR_MODULE", "LABEL_CLIENT_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER ); - } - else - { - moduleProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_PROJECT", "LABEL_SERVICE_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - module_ = uiUtils.createCombo(parent, "LABEL_SERVICE_MODULE", "LABEL_SERVICE_MODULE", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - earProject_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_PROJECT", "LABEL_SERVICE_EAR_PROJECT", INFOPOP_PWRS_COMBO_PROJECT, SWT.SINGLE | SWT.BORDER ); - earModule_ = uiUtils.createCombo(parent, "LABEL_SERVICE_EAR_MODULE", "LABEL_SERVICE_EAR_MODULE", INFOPOP_PWRS_COMBO_EAR, SWT.SINGLE | SWT.BORDER ); - } - - //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() - { - return module_.getText(); - } - - public void setComponentName( String name ) - { - listenersOff(); - module_.setText( name ); - initialModuleName_ = name; - listenersOn(); - } - - public String getEarComponentName() - { - return earModule_.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); - populateEARCombos(); - } - } - } - - private void populateEARCombos() - { - earModule_.removeAll(); - earProject_.removeAll(); - String moduleName = module_.getText(); - IProject moduleProj = ResourcesPlugin.getWorkspace().getRoot().getProject(moduleProject_.getText()); - if (moduleProj.exists()) - { - IVirtualComponent[] ears = J2EEUtils.getReferencingEARComponents(moduleProj, moduleName); - if (ears != null && ears.length > 0) - { - for (int i = 0; i < ears.length; i++) - { - earModule_.add(ears[i].getName()); - earProject_.add(ears[i].getProject().getName()); - } - earModule_.select(0); - earProject_.select(0); - return; - } - } - String earName = moduleName + "EAR"; - earModule_.setText(earName); - earProject_.setText(earName); - } - - 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); - } - - 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); - } - } - - if( !FlexibleJavaProjectPreferenceUtil.getMultipleModulesPerProjectProp() ) - { - IProject project = ResourceUtils.getWorkspaceRoot().getProject(projectText); - - if( project != null && project.exists() ) - { - String moduleName = module_.getText(); - IVirtualComponent component = J2EEUtils.getVirtualComponent( project, moduleName ); - - if( !component.exists() && !moduleName.equals( projectText ) ) - { - finalStatus = new SimpleStatus("",msgUtils.getMessage("MSG_MODULE_NAME_AND_PROJECT_NAME_NOT_THE_SAME" ),Status.ERROR); - } - } - } - - return finalStatus; - } -}
\ 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 da499cd76..000000000 --- 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 2dbae5731..000000000 --- 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 056b78201..000000000 --- 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 1c13e3b4d..000000000 --- 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 f306372f1..000000000 --- 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 8bedf5849..000000000 --- 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 87324894b..000000000 --- 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 855c35f2c..000000000 --- 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 377527c77..000000000 --- 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 5000b7790..000000000 --- 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 1df7d18db..000000000 --- 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 6db63c8a3..000000000 --- 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 b894a7c55..000000000 --- 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 07f436804..000000000 --- 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 9b9cd7a22..000000000 --- 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 cbaf9d6bc..000000000 --- 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 a980af04b..000000000 --- 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 fcd2a2206..000000000 --- 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 be7603a19..000000000 --- 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 6ab3b93ab..000000000 --- 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 22b35f62f..000000000 --- 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 1ce5e1c52..000000000 --- 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 9bf612f17..000000000 --- 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 344ecc671..000000000 --- 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 c5f115111..000000000 --- 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 bec34011c..000000000 --- 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 daf6c46ef..000000000 --- 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 23c7d93f8..000000000 --- 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 580d96036..000000000 --- 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 b149698b2..000000000 --- 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 e19b750e6..000000000 --- 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 4d2873220..000000000 --- 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 96f20a84a..000000000 --- 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 8bd1b5d5b..000000000 --- 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 198c12dd3..000000000 --- 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 670b4da07..000000000 --- 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 64bc552ba..000000000 --- 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 3b9eef606..000000000 --- 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 b42e47ad9..000000000 --- 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 df6e1d76b..000000000 --- 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 340aab3c8..000000000 --- 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 3a8f4fb3d..000000000 --- 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 229de46a2..000000000 --- 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 e158231a6..000000000 --- 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 e1e8d3db2..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistryIBM implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistryIBM() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 1df4395a5..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistryIBMTest implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistryIBMTest() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 89bdd3ea5..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistryMicrosoft implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistryMicrosoft() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 80fb5f6e2..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistryMicrosoftTest implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistryMicrosoftTest() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 0158b0ffc..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistryNTTComm implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistryNTTComm() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 04d6d1f13..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistrySAP implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistrySAP() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 31762a692..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistrySAPTest implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistrySAPTest() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 e4d9e6589..000000000 --- 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 0041287d5..000000000 --- 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.parser.plugin.ParserPlugin; - -public class PublicUDDIRegistryXMethods implements PublicUDDIRegistryType -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2002."; - - public PublicUDDIRegistryXMethods() { - } - - public String getName() { - return ParserPlugin.getMessage("%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 4e146a7e8..000000000 --- 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 7a177c5a8..000000000 --- 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 61f9d5491..000000000 --- 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 aa98c1428..000000000 --- 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 41e17c363..000000000 --- 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 2e3d20c80..000000000 --- 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 3abfb4489..000000000 --- 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 ec4640339..000000000 --- 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 28c6f50f5..000000000 --- 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 d187b3a6a..000000000 --- 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 971875ca1..000000000 --- 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 3bbef1630..000000000 --- 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 b9b6f7c11..000000000 --- a/bundles/org.eclipse.jst.ws.consumption.ui/src/org/eclipse/jst/ws/internal/consumption/ui/wsrt/WebServiceRuntimeExtensionUtils.java +++ /dev/null @@ -1,1008 +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])) - { - String label = getServerLabelById(sfids[i]); - if (label != null) - { - ids.add(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 f49b70673..000000000 --- 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; |
