diff options
Diffstat (limited to 'bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command')
22 files changed, 0 insertions, 3012 deletions
diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java deleted file mode 100644 index 2cd7ffc62..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AbstractStartServer.java +++ /dev/null @@ -1,139 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.plugin.WebServiceConsumptionPlugin; -import org.eclipse.wst.common.environment.EnvironmentService; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.server.core.IServer; - -public abstract class AbstractStartServer { - -protected IProgressMonitor monitor; -private ILog log_; - -public AbstractStartServer() -{ - log_ = EnvironmentService.getEclipseLog(); -} - -/** - * Execute the command - */ -public void StartServer (IProject project, IServer server, IProgressMonitor monitor, boolean restart) throws CoreException -{ - this.monitor = monitor; - - try - { - -// IJavaServer javaServer = (IJavaServer) server.getDelegate(); -// addJarsToClassPath(javaServer); - validateRemoteServerPath(server); - - if (server.getServerState() != IServer.STATE_STOPPED) // The Server is running - { - if (server.getServerRestartState()) - { - - server.synchronousStop(false); - log_.log(ILog.INFO, 5050, this, "StartServer", "project="+project+", Stop command completed, restart needed"); - publishProject(server); - startProject(server); - } - else - { - - if (restart) // WEB-INF\lib need to be reloaded - { - publishProject(server); - restartProject(project, server); - } - } - } - else { - - publishProject(server); - startProject(server); - } -} - - catch (CoreException ce) { - throw ce; - } - catch (Exception e) { - throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e)); - } -} - -protected void publishProject(IServer server) throws CoreException -{ - monitor.subTask( ConsumptionMessages.PROGRESS_INFO_PUBLISHING_SERVER ); - IStatus status = server.publish(IServer.PUBLISH_INCREMENTAL, monitor); - if (status.getSeverity() != IStatus.OK) - throw new CoreException(status); - log_.log(ILog.INFO, 5051, this, "publishProject", "IServer="+server+", Publish command completed"); - } - -protected void startProject(IServer server) throws CoreException -{ - try - { - monitor.subTask( ConsumptionMessages.PROGRESS_INFO_STARTING_SERVER ); - server.synchronousStart(ILaunchManager.RUN_MODE, monitor); - log_.log(ILog.INFO, 5052, this, "startProject", "IServer="+server+", Start command completed"); - - } - catch (Exception e) { - throw new CoreException(new Status(IStatus.ERROR,WebServiceConsumptionPlugin.ID,0,ConsumptionMessages.MSG_ERROR_SERVER,e)); - } -} - -protected void restartProject(IProject project, IServer server) throws CoreException -{ - //Do nothing -} - -public void runPreServerConfig(IServer server, IProject EARProject){ - - return; - -} - -public void runPostServerConfig(IServer server, IProject EARProject){ - - return; -} - - -protected abstract void addJarsToClassPath(IServer server) throws CoreException; -protected abstract void validateRemoteServerPath(IServer server) throws CoreException; - -public void stopServer(IServer server) throws CoreException { - - if (server != null) { - - if (server.getServerState() != IServer.STATE_STOPPED) { - server.synchronousStop(false); - } - } - -} - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java deleted file mode 100644 index d25b4ec0b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AddModuleToServerCommand.java +++ /dev/null @@ -1,118 +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.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -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.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; - -public class AddModuleToServerCommand extends AbstractDataModelOperation -{ - - private String serverInstanceId; - private String project; - private String module; - - public AddModuleToServerCommand() - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - - IServer server = ServerCore.findServer(serverInstanceId); - if (server == null) - { - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND ); - env.getStatusHandler().reportError(status); - return status; - } - - IServerWorkingCopy serverwc = null; - - try - { - //Ensure the module is not a Java utility - IProject iproject = ProjectUtilities.getProject(project); - if (!J2EEUtils.isJavaComponent(iproject)) - { - IModule imodule = ServerUtils.getModule(iproject); - if (!ServerUtil.containsModule(server, imodule, null)) - { - IModule[] imodules = new IModule[]{imodule}; - serverwc = server.createWorkingCopy(); - ServerUtil.modifyModules(serverwc, imodules, null, null); - } - - } - } catch (CoreException e) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[]{module}) ); - env.getStatusHandler().reportError(status); - return status; - } finally - { - try - { - if (serverwc != null) - { - serverwc.save(true, null); - } - } catch (CoreException ce) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_ADD_MODULE, new String[] { module }) ); - env.getStatusHandler().reportError(status); - return status; - } - } - - return status; - - - } - - public void setModule(String module) - { - this.module = module; - } - - public void setProject(String project) - { - this.project = project; - } - - public void setServerInstanceId(String serverInstanceId) - { - this.serverInstanceId = serverInstanceId; - } - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java deleted file mode 100644 index 82ab8a312..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/AssociateModuleWithEARCommand.java +++ /dev/null @@ -1,89 +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.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - -public class AssociateModuleWithEARCommand extends AbstractDataModelOperation -{ - private String project_; - private String module_; - private String earProject_; - private String ear_; - - - public AssociateModuleWithEARCommand(){ - - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - IProject moduleProject = null; - IProject earProject = null; - - // get projects - if (project_!=null) - moduleProject = ProjectUtilities.getProject(project_); - if (earProject_!=null) - earProject = ProjectUtilities.getProject(earProject_); - - // associate modules if not already associated - if (moduleProject!=null && earProject!=null) { - if (!J2EEUtils.isComponentAssociated(earProject, moduleProject)) - J2EEUtils.associateComponentToEAR(moduleProject, earProject); - } - - // ensure modules are associated otherwise report error - if (!J2EEUtils.isComponentAssociated(earProject, moduleProject)){ - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_ASSOCIATE, new String[]{module_, ear_}) ); - if (env!=null) - env.getStatusHandler().reportError(status); - return status; - } - - return status; - } - - public void setProject( String project ) - { - project_ = project; - } - - public void setModule( String module ) - { - module_ = module; - } - - public void setEARProject( String earProject ) - { - earProject_ = earProject; - } - - public void setEar( String ear ) - { - ear_ = ear; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java deleted file mode 100644 index 90c6ff9b3..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/BuildProjectCommand.java +++ /dev/null @@ -1,98 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class BuildProjectCommand extends AbstractDataModelOperation -{ - private ValidationManager validationManager; - private IProject project_; - private boolean forceBuild_; - // rm private Model model; - - /** - * Default CTOR; - */ - public BuildProjectCommand() - { - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - try - { - if (forceBuild_) - project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - else if (validationManager == null) - project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - else if (validationManager.getWorkspaceAutoBuildPreference()) - project_.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); - } - catch (Exception e) - { - } - - try - { - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor()); - } - catch (InterruptedException ie) - { - // continue execution - } - catch (OperationCanceledException oce) - { - // continue execution - } - - return Status.OK_STATUS; - } - /** - * @param forceBuild The forceBuild to set. - */ - public void setForceBuild(boolean forceBuild) { - this.forceBuild_ = forceBuild; - } - - /** - * @param project The project to set. - */ - public void setProject(IProject project) { - this.project_ = project; - } - - /** - * @param validationManager The validationManager to set. - */ - public void setValidationManager(ValidationManager validationManager) { - this.validationManager = validationManager; - } - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java deleted file mode 100644 index c5274a5ef..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CheckProjectOKCommand.java +++ /dev/null @@ -1,76 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; - -public class CheckProjectOKCommand extends AbstractDataModelOperation -{ - - private String serviceServerTypeId_; - - - /** - * Default CTOR - */ - public CheckProjectOKCommand() { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - - String typeid = serviceServerTypeId_; - IServer[] servers = ServerCore.getServers(); -// Iterator iterator = servers.iterator(); - boolean viewOpen = false; - String serverName = null; - - for (int i=0;i<servers.length;i++) { - IServer server = (IServer) servers[i]; - - // If the configuration editor is open for the server that we are - // deploying - // to we will prompt the user to close it. - if (server != null && server.getServerType().getId().equals(typeid)) { - viewOpen = true; - serverName = server.getName(); - break; - } - } - - if (viewOpen) { - String errorMessage = NLS.bind(ConsumptionMessages.MSG_ERROR_SERVER_VIEW_OPEN, new String[] { serverName}); - return StatusUtils.errorStatus( errorMessage ); - - } - - return status; - } - - /** - * @param serviceServerId - * The serviceServer factory Id to set. - */ - public void setServiceServerTypeID(String serviceServerId) { - this.serviceServerTypeId_ = serviceServerId; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.java deleted file mode 100644 index 329a3e5d9..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ComputeEndpointCommand.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.consumption.command.common; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.soap.SOAPAddress; -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - -public class ComputeEndpointCommand extends AbstractDataModelOperation -{ - private WebServicesParser webServicesParser; - private String wsdlURI; - private Boolean monitorService; - private Integer monitoredPort; - - public ComputeEndpointCommand() - { - } - - /** - * @param monitoredPort The monitoredPort to set. - */ - public void setMonitoredPort(Integer monitoredPort) - { - this.monitoredPort = monitoredPort; - } - /** - * @param monitorService The monitorService to set. - */ - public void setMonitorService(Boolean monitorService) - { - this.monitorService = monitorService; - } - /** - * @param webServicesParser The webServicesParser to set. - */ - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - } - /** - * @param wsdlURI The wsdlURI to set. - */ - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - public String getEndpoint() - { - if (monitorService != null && monitorService.booleanValue() && monitoredPort != null) - { - Definition def = webServicesParser.getWSDLDefinition(wsdlURI); - if (def != null) - { - for (Iterator it = def.getServices().values().iterator(); it.hasNext();) - { - Service service = (Service)it.next(); - for (Iterator it2 = service.getPorts().values().iterator(); it2.hasNext();) - { - Port port = (Port)it2.next(); - for (Iterator it3 = port.getExtensibilityElements().iterator(); it3.hasNext();) - { - ExtensibilityElement ext = (ExtensibilityElement)it3.next(); - if (ext instanceof SOAPAddress) - { - String location = ((SOAPAddress)ext).getLocationURI(); - try - { - URL url = new URL(location); - url = new URL(url.getProtocol(), url.getHost(), monitoredPort.intValue(), url.getFile()); - return url.toString(); - } - catch (MalformedURLException murle) - { - int protocolIndex = location.indexOf("://"); - if (protocolIndex != -1) - { - String protocol = location.substring(0, protocolIndex+3); - int hostPortIndex = location.indexOf('/', protocolIndex+3); - String file; - if (hostPortIndex == -1) - { - hostPortIndex = location.length(); - file = ""; - } - else - file = location.substring(hostPortIndex, location.length()); - String hostPort = location.substring(protocolIndex+3, hostPortIndex); - int hostIndex = hostPort.indexOf(':'); - String host; - if (hostIndex != -1) - host = hostPort.substring(0, hostIndex+1); - else - host = hostPort + ':'; - String newPort = String.valueOf(monitoredPort.intValue()); - StringBuffer endpoint = new StringBuffer(protocol); - endpoint.append(host); - endpoint.append(newPort); - endpoint.append(file); - return endpoint.toString(); - } - } - } - } - } - } - } - } - return null; - } - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException - { - return Status.OK_STATUS; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java deleted file mode 100644 index c50a2a4b8..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CopyWSDLCommand.java +++ /dev/null @@ -1,333 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.consumption.command.common; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Vector; - -import javax.wsdl.Definition; -import javax.wsdl.Import; -import javax.wsdl.Types; -import javax.wsdl.WSDLException; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.UnknownExtensibilityElement; -import javax.wsdl.factory.WSDLFactory; -import javax.wsdl.xml.WSDLWriter; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.emf.common.util.EList; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.uri.URIException; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder; -import org.eclipse.wst.ws.internal.parser.discovery.NetUtils; -import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.wsdl.internal.impl.XSDSchemaExtensibilityElementImpl; -import org.eclipse.wst.wsdl.internal.impl.wsdl4j.WSDLFactoryImpl; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.XSDSchemaDirective; -import org.eclipse.xsd.impl.XSDSchemaImpl; -import org.eclipse.xsd.util.XSDParser; -import org.w3c.dom.Element; - -public class CopyWSDLCommand extends AbstractDataModelOperation -{ - private String wsdlURI; - private WebServicesParser webServicesParser; - private String destinationURI; - private Definition def; - private Vector ignoreList; - - public CopyWSDLCommand() - { - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - try - { - ignoreList = new Vector(); - if (def == null) - def = webServicesParser.getWSDLDefinition(wsdlURI); - copyWSDL(env, wsdlURI, getBaseURI(destinationURI), getLocalname(destinationURI), def); - return Status.OK_STATUS; - } - catch (Throwable t) - { - t.printStackTrace(); - IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COPY_WSDL, new String[]{wsdlURI, destinationURI}), t); - env.getStatusHandler().reportError(status); - return status; - } - } - - private void copyWSDL(IEnvironment env, String uri, String destURI, String destLocalname) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException - { - Definition definition; - - try { - definition = webServicesParser.getWSDLDefinitionVerbose(uri); - copyWSDL(env, uri, destURI, destLocalname, definition); - } catch (WSDLException e) { - copyXMLSchema(env, uri, destURI); - } - } - - private void copyWSDL(IEnvironment env, String uri, String destURI, String destLocalname, Definition definition) throws WSDLException, IOException, WWWAuthenticationException, TransformerException, TransformerConfigurationException, URIException - { - if (!needToCopy(uri)) { - return; - } - - String baseURI = getBaseURI(uri); - if (destLocalname == null || destLocalname.length() <= 0) - destLocalname = getLocalname(uri); - - // copy WSDL - StringBuffer destinationFileURI = new StringBuffer(addTrailingSeparator(destURI)); - destinationFileURI.append(destLocalname); - WSDLFactory wsdlFactory = new WSDLFactoryImpl(); - WSDLWriter wsdlWriter = wsdlFactory.newWSDLWriter(); - OutputStream os = env.getURIFactory().newURI(destinationFileURI.toString()).getOutputStream(); - wsdlWriter.writeWSDL(definition, os); - os.close(); - // copy <wsdl:import>s - Map imports = definition.getImports(); - for (Iterator it = imports.values().iterator(); it.hasNext();) - { - List list = (List)it.next(); - for (Iterator listIt = list.iterator(); listIt.hasNext();) - { - Import wsdlImport = (Import)listIt.next(); - String wsdlImportURI = wsdlImport.getLocationURI(); - if (isRelative(wsdlImportURI)) - { - String importBaseURI = (new StringBuffer(baseURI)).append(wsdlImportURI).toString(); - String wsdlImportBaseURI = getBaseURI(wsdlImportURI); - StringBuffer importDestURI = new StringBuffer(destURI); - if (wsdlImportBaseURI != null) - importDestURI.append(wsdlImportBaseURI); - copyWSDL(env, importBaseURI, importDestURI.toString(), getLocalname(wsdlImportURI)); - } - } - } - Types types = definition.getTypes(); - if (types != null) - { - List schemas = types.getExtensibilityElements(); - for (Iterator it = schemas.iterator(); it.hasNext();) - { - ExtensibilityElement extElement = (ExtensibilityElement)it.next(); - if (extElement instanceof UnknownExtensibilityElement) - { - UnknownExtensibilityElement schemaElement = (UnknownExtensibilityElement)extElement; - XSDSchema xsdSchema = null; - try - { - xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement()); - } - catch (Throwable t) - { - // ignore any extensibility elements that cannot be parsed into a - // XSDSchema instance - } - copyXMLSchema(env, xsdSchema, baseURI, destURI); - } - else if (extElement instanceof XSDSchemaExtensibilityElementImpl) - { - XSDSchemaExtensibilityElementImpl schemaElement = (XSDSchemaExtensibilityElementImpl)extElement; - XSDSchema xsdSchema = null; - try - { - xsdSchema = XSDSchemaImpl.createSchema(schemaElement.getElement()); - } - catch (Throwable t) - { - // ignore any extensibility elements that cannot be parsed into a - // XSDSchema instance - } - copyXMLSchema(env, xsdSchema, baseURI, destURI); - } - } - } - } - - private String getBaseURI(String uri) - { - int index = uri.lastIndexOf('/'); - if (index == -1) - index = uri.lastIndexOf('\\'); - if (index != -1) - return uri.substring(0, index + 1); - else - return null; - } - - private String getLocalname(String uri) - { - int index = uri.lastIndexOf('/'); - if (index == -1) - index = uri.lastIndexOf('\\'); - if (index != -1) - return uri.substring(index + 1); - else - return uri; - } - - private String addTrailingSeparator(String s) - { - if (!(s.endsWith("/") || s.endsWith("\\"))) - { - StringBuffer sb = new StringBuffer(s); - sb.append('/'); - return sb.toString(); - } - else - return s; - } - - private boolean isRelative(String uri) - { - return (uri.indexOf(':') == -1); - } - - private void copyXMLSchema(IEnvironment env, String uri, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException - { - if (!needToCopy(uri)) { - return; - } - - // load as a cached schema - XSDSchema xsdSchema = XSDSchemaImpl.getSchemaForSchema(uri); - // if schema is not cached, parse it - if (xsdSchema == null) - { - XSDParser p = new XSDParser(); - InputStream is = NetUtils.getURLInputStream(uri); - if (is != null) - { - p.parse(is); - xsdSchema = p.getSchema(); - } - } - if (xsdSchema != null) - { - // copy schema - Element e = xsdSchema.getElement(); - DOMSource domSource = new DOMSource(e); - Transformer serializer = TransformerFactory.newInstance().newTransformer(); - serializer.setOutputProperty(OutputKeys.INDENT, "yes"); - serializer.setOutputProperty(OutputKeys.ENCODING, "UTF-8"); - serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); - OutputStream os = env.getURIFactory().newURI((new StringBuffer(destURI)).append(getLocalname(uri)).toString()).getOutputStream(); - serializer.transform(domSource, new StreamResult(os)); - os.close(); - // copy <xsd:import>s and <xsd:include>s - copyXMLSchema(env, xsdSchema, getBaseURI(uri), destURI); - } - } - - private void copyXMLSchema(IEnvironment env, XSDSchema xsdSchema, String baseURI, String destURI) throws TransformerException, TransformerConfigurationException, IOException, URIException - { - if (xsdSchema != null) - { - // copy <xsd:import>s and <xsd:include>s - EList xsdSchemaContents = xsdSchema.getContents(); - for (Iterator it = xsdSchemaContents.iterator(); it.hasNext();) - { - Object content = it.next(); - if (content instanceof XSDSchemaDirective) - { - XSDSchemaDirective xsdSchemaDirective = (XSDSchemaDirective)content; - String xsdSchemaDirectiveLocation = xsdSchemaDirective.getSchemaLocation(); - if (xsdSchemaDirectiveLocation != null && isRelative(xsdSchemaDirectiveLocation)) - { - String directiveURI = (new StringBuffer(baseURI)).append(xsdSchemaDirectiveLocation).toString(); - String directiveBaseURI = getBaseURI(xsdSchemaDirectiveLocation); - StringBuffer directiveDestURI = new StringBuffer(destURI); - if (directiveBaseURI != null) - directiveDestURI.append(directiveBaseURI); - copyXMLSchema(env, directiveURI, directiveDestURI.toString()); - } - } - } - } - } - - private boolean needToCopy (String uri) { - String normalizedURI = normalize(uri); - if (ignoreList.contains(normalizedURI)) - return false; - ignoreList.add(normalizedURI); - return true; - } - - private String normalize(String uri ) - { - try { - String encodedURI = URIEncoder.encode(uri,"UTF-8"); - URI normalizedURI = new URI(encodedURI); - normalizedURI = normalizedURI.normalize(); - return normalizedURI.toString(); - } catch (URISyntaxException e) { - return uri; - } catch (UnsupportedEncodingException e) { - return uri; - } - } - - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - } - - public void setDestinationURI(String destinationURI) - { - this.destinationURI = destinationURI; - } - - public void setDefinition(Definition def) - { - this.def = def; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java deleted file mode 100644 index 1d10ea922..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateEARProjectCommand.java +++ /dev/null @@ -1,109 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.commands.ExecutionException; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; - - -public class CreateEARProjectCommand extends AbstractDataModelOperation -{ - private String earProjectName_; - private String serverFactoryId_; - private String j2eeVersion_; - - /** - * Constructor - */ - public CreateEARProjectCommand() - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - try - { - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(earProjectName_); - if (project != null && !project.exists()) - { - IDataModel info = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider()); - info.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME, project.getName()); - - //Set the J2EE version - if (j2eeVersion_ != null && j2eeVersion_.length()>0) - { - info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(j2eeVersion_)); - } - else - { - info.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, new Integer(J2EEVersionConstants.J2EE_1_3_ID)); - } - - //Set the server target - if (serverFactoryId_!=null && serverFactoryId_.length()>0) - { -// TODO - Add this logic to FlexibleProjectCreationDataModel, and op.... -// String runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId_, IServerTargetConstants.EAR_TYPE, finalJ2EEVersion); -// info.setProperty(EARComponentCreationDataModel.SERVER_TARGET_ID, runtimeTargetId ); -// info.setProperty(EARComponentCreationDataModel.ADD_SERVER_TARGET, Boolean.TRUE); - } - - //Create the EAR - IDataModelOperation operation = info.getDefaultOperation(); - operation.execute(new NullProgressMonitor(), null); - } - } - catch (ExecutionException ite) - { - IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_EAR_PROJECT, new String[] {earProjectName_}), ite); - env.getStatusHandler().reportError(status); - return status; - } - return Status.OK_STATUS; - } - /** - * @param earProjectName_ The earProjectName_ to set. - */ - public void setEarProjectName(String earProjectName) - { - this.earProjectName_ = earProjectName; - } - - public void setServerFactoryId(String serverFactoryId) - { - serverFactoryId_ = serverFactoryId; - } - - public void setJ2EEVersion(String j2eeVersion) - { - j2eeVersion_ = j2eeVersion; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java deleted file mode 100644 index 698a4a9d6..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateFacetedProjectCommand.java +++ /dev/null @@ -1,267 +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.command.common; - -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.server.core.FacetUtil; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.common.FacetMatcher; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; -import org.eclipse.wst.common.project.facet.core.IProjectFacet; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.common.project.facet.core.VersionFormatException; -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; - -public class CreateFacetedProjectCommand extends AbstractDataModelOperation -{ - - private String projectName; - private String templateId; - private RequiredFacetVersion[] requiredFacetVersions; - //private FacetMatcher facetMatcher; - private String serverFactoryId; - private String serverInstanceId; - - private org.eclipse.wst.common.project.facet.core.runtime.IRuntime facetRuntime; - - private IProgressMonitor monitor_; - - - public IStatus execute(IProgressMonitor monitor, IAdaptable info) - { - monitor_ = monitor; - IStatus status = Status.OK_STATUS; - - // check if data ready - status = checkDataReady(); - if (status.getSeverity()==Status.ERROR) - { - return status; - } - - IProject project = ProjectUtilities.getProject(projectName); - if (!project.exists()) - { - try - { - IFacetedProject fproject = ProjectFacetsManager.create(projectName, null, monitor_); - - //Decide which facets to install based on the templateId and the selected server. - Set facetsToAdd = getFacetsToAdd(); - - //Set up the install actions. - Set actions = FacetUtils.getInstallActions(facetsToAdd); - /* - IProjectFacetVersion webFacet24 = ProjectFacetsManager.getProjectFacet("jst.web").getVersion("2.4"); - IProjectFacetVersion javaFacet14 = ProjectFacetsManager.getProjectFacet("jst.java").getVersion("1.4"); - Set facetsToAdd = new HashSet(); - facetsToAdd.add(webFacet24); - facetsToAdd.add(javaFacet14); - actions = FacetUtils.getInstallActions(facetsToAdd); - */ - fproject.modify(actions, monitor_); - - Set newFacetVersions = fproject.getProjectFacets(); - Set fixedFacets = new HashSet(); - for (Iterator iter = newFacetVersions.iterator(); iter.hasNext();) { - IProjectFacetVersion facetVersion = (IProjectFacetVersion) iter.next(); - fixedFacets.add(facetVersion.getProjectFacet()); - } - fproject.setFixedProjectFacets(fixedFacets); - - - //Set the runtime - if (facetRuntime != null) - { - fproject.setRuntime(facetRuntime, monitor); - } - - - } catch (CoreException ce) - { - System.out.println("Exception occurred when creating a faceted project."); - return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] { projectName })); - } - } - else - { - //TODO Just add the facets you need. - } - return status; - } - - private IStatus checkDataReady() - { - - if (projectName == null || serverFactoryId == null) - { - return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_PROJECT_CREATION, new String[] {projectName})); - } - - return Status.OK_STATUS; - } - - /* - * @return Set Returns the Set of facets to add to the new project, - * choosing the highest level of each facet that works on the selected server. - */ - private Set getFacetsToAdd() - { - Set facets = new HashSet(); - - //Set the facet runtime. - setFacetRuntime(); - if (facetRuntime != null) - { - IFacetedProjectTemplate template = ProjectFacetsManager.getTemplate(templateId); - Set templateFacets = template.getFixedProjectFacets(); - Iterator templateFacetsItr = templateFacets.iterator(); - while (templateFacetsItr.hasNext()) - { - IProjectFacet fixedFacet = (IProjectFacet)templateFacetsItr.next(); - List versions = null; - //IProjectFacetVersion[] versions = FacetUtils.getOrderedVersions(fixedFacet); - try { - versions = fixedFacet.getSortedVersions(false); - } catch (VersionFormatException e) { - Set versionSet = fixedFacet.getVersions(); - Iterator itr = versionSet.iterator(); - versions = new ArrayList(); - while (itr.hasNext()) - { - versions.add(itr.next()); - } - } catch (CoreException e) { - Set versionSet = fixedFacet.getVersions(); - Iterator itr = versionSet.iterator(); - versions = new ArrayList(); - while (itr.hasNext()) - { - versions.add(itr.next()); - } - } - Iterator versionsItr = versions.iterator(); - while(versionsItr.hasNext()) - //for (int i=0; i<versions.length; i++) - { - IProjectFacetVersion pfv = (IProjectFacetVersion)versionsItr.next(); - Set pfvs = new HashSet(); - pfvs.add(pfv); - - //Check against RequiredFacetVersions - FacetMatcher fm = FacetUtils.match(requiredFacetVersions, pfvs); - if (fm.isMatch()) - { - //Check against Runtime - if (FacetUtils.doesRuntimeSupportFacets(facetRuntime, pfvs)) - { - //We have a match. Add this one to the master set. - facets.add(pfv); - break; - } - } - } - } - } - else - { - facets = FacetUtils.getInitialFacetVersionsFromTemplate(templateId); - } - - - return facets; - } - - private void setFacetRuntime() - { - - if (serverInstanceId != null && serverInstanceId.length()>0) - { - IServer server = ServerCore.findServer(serverInstanceId); - IRuntime sRuntime = server.getRuntime(); - facetRuntime = FacetUtil.getRuntime(sRuntime); - } - else - { - IServerType st = ServerCore.findServerType(serverFactoryId); - String runtimeTypeId = st.getRuntimeType().getId(); - //Find the facet runtime - IRuntime[] runtimes = ServerCore.getRuntimes(); - for (int i=0; i<runtimes.length; i++) - { - IRuntime sRuntime = runtimes[i]; - if ( !sRuntime.isStub() && sRuntime.getRuntimeType().getId().equals(runtimeTypeId)) - { - facetRuntime = FacetUtil.getRuntime(sRuntime); - } - } - } - } - - /* - public void setFacetMatcher(FacetMatcher facetMatcher) - { - this.facetMatcher = facetMatcher; - } - */ - - public void setProjectName(String projectName) - { - this.projectName = projectName; - } - - public void setTemplateId(String templateId) - { - this.templateId = templateId; - } - - public void setRequiredFacetVersions(RequiredFacetVersion[] requiredFacetVersions) - { - this.requiredFacetVersions = requiredFacetVersions; - } - - public void setServerFactoryId(String serverFactoryId) - { - this.serverFactoryId = serverFactoryId; - } - - public void setServerInstanceId(String serverInstanceId) - { - this.serverInstanceId = serverInstanceId; - } - - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java deleted file mode 100644 index b17308122..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateJavaProjectCommand.java +++ /dev/null @@ -1,82 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2003, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.resources.ICommand; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - - -public class CreateJavaProjectCommand extends AbstractDataModelOperation -{ - private String projectName_; - - /** - * Default CTOR - */ - public CreateJavaProjectCommand() - { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName_); - - if (project != null && !project.exists()) - { - try - { - project.create(ResourcesPlugin.getWorkspace().newProjectDescription(project.getName()), monitor); - project.open(monitor); - IProjectDescription desc = project.getDescription(); - desc.setNatureIds(new String[] {JavaCore.NATURE_ID}); - ICommand cmd = desc.newCommand(); - cmd.setBuilderName(JavaCore.BUILDER_ID); - desc.setBuildSpec(new ICommand[] {cmd}); - project.setDescription(desc, monitor); - IJavaProject javaProject = JavaCore.create(project); - Path projectRoot = new Path(Path.ROOT.append(new Path(project.getName())).toString()); - javaProject.setRawClasspath(new IClasspathEntry[] {JavaCore.newSourceEntry(projectRoot), JavaCore.newContainerEntry(new Path(JavaRuntime.JRE_CONTAINER))}, monitor); - javaProject.setOutputLocation(projectRoot, monitor); - } - catch (CoreException ce) - { - IStatus status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CANNOT_CREATE_JAVA_PROJECT, new String[] {projectName_}), ce); - env.getStatusHandler().reportError(status); - return status; - } - } - return Status.OK_STATUS; - } - - public void setProjectName(String projectName) - { - projectName_ = projectName; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java deleted file mode 100644 index 7430aee8f..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateModuleCommand.java +++ /dev/null @@ -1,336 +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.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider; -import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientComponentCreationDataModelProvider; -import org.eclipse.jst.j2ee.datamodel.properties.IAppClientComponentCreationDataModelProperties; -import org.eclipse.jst.j2ee.datamodel.properties.IEarComponentCreationDataModelProperties; -import org.eclipse.jst.j2ee.ejb.datamodel.properties.IEjbComponentCreationDataModelProperties; -import org.eclipse.jst.j2ee.internal.earcreation.EarComponentCreationDataModelProvider; -import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider; -import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentCreationDataModelProvider; -import org.eclipse.jst.j2ee.project.datamodel.properties.IFlexibleJavaProjectCreationDataModelProperties; -import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentCreationDataModelProperties; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory; -import org.eclipse.wst.common.frameworks.datamodel.IDataModel; -import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; - -public class CreateModuleCommand extends AbstractDataModelOperation -{ - - public final static int WEB = J2EEUtils.WEB; - public final static int EJB = J2EEUtils.EJB; - public final static int APPCLIENT = J2EEUtils.APPCLIENT; - public final static int EAR = J2EEUtils.EAR; - - private String projectName; - private String moduleName; // may be null for non-flexible project - private int moduleType;; - private String j2eeLevel; - private String serverFactoryId; - private String serverInstanceId_; - private IEnvironment env; - private IProgressMonitor monitor_; - - public CreateModuleCommand(){ - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - monitor_ = monitor; - this.env = getEnvironment(); - IStatus status = Status.OK_STATUS; - - // check if data ready - status = checkDataReady(); - if (status.getSeverity()==Status.ERROR){ - return status; - } - - // check if flexible project exists - IProject project = ProjectUtilities.getProject(projectName); - if (project==null || !project.exists()){ - status = createFlexibleJavaProject(); - if (status.getSeverity()==Status.ERROR){ - return status; - } - } - - // check if project and/or component exists - if (projectName!=null) { - if (moduleName==null){ - if (project.exists()) - return status; - } - else { - if (J2EEUtils.exists(projectName, moduleName)) - return status; - } - } - else { - return StatusUtils.errorStatus(NLS.bind(ConsumptionMessages.MSG_ERROR_COMPONENT_CREATION, new String[]{projectName, moduleName}) ); - } - - // create the component according to the component type specified - int type = getModuleType(); - switch (type) { - case WEB: - status = createWebComponent(); - break; - case EJB: - status = createEJBComponent(); - break; - case APPCLIENT: - status = createAppClientComponent(); - break; - case EAR: - status = createEARComponent(); - break; - - default: - return StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COMPONENT_CREATION, new String[]{moduleName}) ); - } - - - return status; - } - - private IStatus checkDataReady(){ - - if (projectName==null || serverFactoryId==null){ - return StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_COMPONENT_CREATION, new String[]{projectName, moduleName}) ); - } - - return Status.OK_STATUS; - } - - - /** - * Create a Web component - * @return - */ - public IStatus createWebComponent(){ - IStatus status = Status.OK_STATUS; - try - { - IDataModel projectInfo = DataModelFactory.createDataModel(new WebComponentCreationDataModelProvider()); - - projectInfo.setProperty(IWebComponentCreationDataModelProperties.PROJECT_NAME,projectName); - if (moduleName!=null) - projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_NAME, moduleName); - - // get the Web servlet level - Integer servletLevel = J2EEUtils.getServletVersionForJ2EEVersion(j2eeLevel); - - if (j2eeLevel!=null) - projectInfo.setProperty(IWebComponentCreationDataModelProperties.COMPONENT_VERSION, servletLevel); - IDataModelOperation op = projectInfo.getDefaultOperation(); - op.execute(monitor_, null); - } - catch (Exception e) - { - status = StatusUtils.errorStatus( e ); - } - return status; - } - - /** - * Create an EAR component - * @return - */ - public IStatus createEARComponent(){ - IStatus status = Status.OK_STATUS; - try - { - IDataModel projectInfo = DataModelFactory.createDataModel(new EarComponentCreationDataModelProvider()); - projectInfo.setProperty(IEarComponentCreationDataModelProperties.PROJECT_NAME,projectName); - if (moduleName!=null) - projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_NAME, moduleName); - if (j2eeLevel!=null) - projectInfo.setProperty(IEarComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel)); - IDataModelOperation op =projectInfo.getDefaultOperation(); - op.execute(monitor_, null); - } - catch (Exception e) - { - status = StatusUtils.errorStatus( e ); - } - return status; - } - - /** - * Create an EJB Component - * @return - */ - public IStatus createEJBComponent(){ - IStatus status = Status.OK_STATUS; - - try - { - IDataModel projectInfo = DataModelFactory.createDataModel(new EjbComponentCreationDataModelProvider()); - projectInfo.setProperty(IEjbComponentCreationDataModelProperties.PROJECT_NAME,projectName); - if (moduleName!=null) - projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_NAME, moduleName); - - // get the EJB spec level - Integer ejbLevel = J2EEUtils.getEJBVersionForJ2EEVersion(j2eeLevel); - - if (j2eeLevel!=null) - projectInfo.setProperty(IEjbComponentCreationDataModelProperties.COMPONENT_VERSION, ejbLevel); - - //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects. - projectInfo.setProperty(IEjbComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE); - - IDataModelOperation op = projectInfo.getDefaultOperation(); - op.execute( monitor_, null); - } - catch (Exception e) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_EJB_COMPONENT, new String[]{projectName}), e); - } - return status; - } - - /** - * Create an Application Client component - * @return - */ - public IStatus createAppClientComponent() - { - IStatus status = Status.OK_STATUS; - try - { - IDataModel projectInfo = DataModelFactory.createDataModel(new AppClientComponentCreationDataModelProvider()); - projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.PROJECT_NAME,projectName); - if (moduleName!=null) - projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_NAME, moduleName); - if (j2eeLevel!=null) - projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.COMPONENT_VERSION, Integer.valueOf(j2eeLevel)); - - //Don't create an EAR. The ADD_TO_EAR property gets defaulted to TRUE for everything except Web projects. - projectInfo.setProperty(IAppClientComponentCreationDataModelProperties.ADD_TO_EAR, Boolean.FALSE); - - IDataModelOperation op = projectInfo.getDefaultOperation(); - - op.execute( monitor_, null); - } - catch (Exception e) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_APPCLIENT_COMPONENT, new String[]{projectName}), e); - } - return status; - } - - /** - * Creates Flexible Java Project structure - * This project is required if it doesn't already exist in order to create the component - * @return - * - * Note: This call may not be necessary once J2EE implements creating a flex project automatically - * with the creation of components. - */ - public IStatus createFlexibleJavaProject(){ - IStatus status = Status.OK_STATUS; - try - { - IDataModel projectInfo = DataModelFactory.createDataModel(new FlexibleJavaProjectCreationDataModelProvider()); - projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.PROJECT_NAME,projectName); - - String runtimeTargetId = null; - if( serverInstanceId_ == null ) - { - // We don't have a server instance so we will get the first runtimeTarget from the factory ID. - runtimeTargetId = ServerUtils.getServerTargetIdFromFactoryId(serverFactoryId, ServerUtils.getServerTargetModuleType(moduleType), j2eeLevel); - } - else - { - // We have a server instance so we will just get it's runtimeTargetId. - IServer server = ServerCore.findServer( serverInstanceId_ ); - runtimeTargetId = server.getRuntime().getId(); - } - - projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.RUNTIME_TARGET_ID,runtimeTargetId); - projectInfo.setProperty(IFlexibleJavaProjectCreationDataModelProperties.ADD_SERVER_TARGET,Boolean.TRUE); - IDataModelOperation op = projectInfo.getDefaultOperation(); - if (env!=null) - op.execute( monitor_, null); - else - op.execute(new NullProgressMonitor(), null); - - } - catch (Exception e) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_CREATE_FLEX_PROJET, new String[]{projectName}), e); - } - return status; - } - - public void setModuleName(String moduleName) - { - this.moduleName = moduleName; - } - - public int getModuleType() - { - return moduleType; - } - - public void setModuleType(int moduleType) - { - this.moduleType = moduleType; - } - - public void setProjectName(String projectName) - { - this.projectName = projectName; - } - - /** - * Expecting 12,13,14 etc. - * @param level - */ - public void setJ2eeLevel(String level) - { - if (level !=null && level.indexOf(".")!=-1) - j2eeLevel = J2EEUtils.getJ2EEIntVersionAsString(level); - else - j2eeLevel = level; - } - - public void setServerFactoryId(String serverFactoryId) - { - this.serverFactoryId = serverFactoryId; - } - - public void setServerInstanceId( String serverInstanceId ) - { - serverInstanceId_ = serverInstanceId; - } - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.java deleted file mode 100644 index ce05bff11..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateMonitorCommand.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.consumption.command.common; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.data.TypeRuntimeServer; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerPort; -import org.eclipse.wst.server.core.internal.IMonitoredServerPort; -import org.eclipse.wst.server.core.internal.IServerMonitorManager; -import org.eclipse.wst.server.core.internal.ServerMonitorManager; - -public class CreateMonitorCommand extends AbstractDataModelOperation -{ - - private static final String WEB_SERVICES = "Web services"; - - private Boolean monitorService; - - private String serviceServerInstanceId; - - private Integer monitoredPort; - - public CreateMonitorCommand() { - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - if (monitorService != null && monitorService.booleanValue()) { - IServer server = ServerCore.findServer(serviceServerInstanceId); - if (server != null) { - - // IMonitorableServer monitorableServer = (IMonitorableServer) - // serverDelegate; - ServerPort[] ports = server.getServerPorts(null); - ServerPort port = null; - for (int it = 0; it < ports.length; it++) { - ServerPort p = ports[it]; - String protocol = p.getProtocol(); - if (protocol != null && protocol.trim().toLowerCase().equals("http")) { - port = p; - break; - } - } - if (port != null) { - IServerMonitorManager serverMonitorManager = ServerMonitorManager.getInstance(); - IMonitoredServerPort[] monitoredPorts = serverMonitorManager.getMonitoredPorts(server); - for (int it2 = 0; it2 < monitoredPorts.length; it2++) { - IMonitoredServerPort imsPort = monitoredPorts[it2]; - if (port.getPort() == imsPort.getServerPort().getPort() && hasContentWebServices(imsPort)) // port - // already - // being - // monitored - { - if (!imsPort.isStarted()) { - try { - serverMonitorManager.startMonitor(imsPort); - } - catch (CoreException ce) { - IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, - new Object[] { String.valueOf(port.getPort()), server.getName()}), ce); - env.getStatusHandler().reportError(error); - return error; - } - } - monitoredPort = new Integer(imsPort.getMonitorPort()); - return Status.OK_STATUS; - } - } - try { - IMonitoredServerPort imsPort = serverMonitorManager.createMonitor(server, port, -1, new String[] { WEB_SERVICES}); - serverMonitorManager.startMonitor(imsPort); - monitoredPort = new Integer(imsPort.getMonitorPort()); - return Status.OK_STATUS; - } - catch (CoreException ce) { - IStatus error = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[] { - String.valueOf(port.getPort()), server.getName()}), ce); - env.getStatusHandler().reportError(error); - return error; - } - } - - else { - IStatus info = StatusUtils.infoStatus( NLS.bind(ConsumptionMessages.MSG_INFO_MONITORING_NOT_SUPPORTED, - new Object[] { server.getName()}) ); - env.getStatusHandler().reportInfo(info); - return info; - } - } - } - return Status.OK_STATUS; - } - - private boolean hasContentWebServices(IMonitoredServerPort imsPort) { - String[] contents = imsPort.getContentTypes(); - for (int i = 0; i < contents.length; i++) - if (WEB_SERVICES.equals(contents[i])) return true; - return false; - } - - public void setServiceTypeRuntimeServer(TypeRuntimeServer typeRuntimeServer) { - this.serviceServerInstanceId = typeRuntimeServer.getServerInstanceId(); - } - - public void setServiceServerInstanceId(String serviceServerInstanceId) { - this.serviceServerInstanceId = serviceServerInstanceId; - } - - public Integer getMonitoredPort() { - return monitoredPort; - } - - public void setMonitorService(Boolean value) { - monitorService = value; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java deleted file mode 100644 index fe31e83af..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/CreateServerCommand.java +++ /dev/null @@ -1,123 +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.command.common; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -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.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; - -public class CreateServerCommand extends AbstractDataModelOperation -{ - private String serverFactoryId; - private String serverInstanceId; - - /** - * Creates a server of the factory id - * Note1: Checking for server instance == null is done in the PreService/ClientInstallCommands - * Note2: Reporting of errors is done in PreService/ClientInstallCommands; simply return the status. - */ - public CreateServerCommand(){ - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - - if (serverFactoryId==null){ - status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_CREATE_SERVER ); - return status; - } - - IServerWorkingCopy serverWC = null; - IServer server = null; - try { - IServerType serverType = ServerCore.findServerType(serverFactoryId); - if (serverType!=null) { - - //Choose a Runtime which is not a stub - IRuntime nonStubRuntime = null; - IRuntime[] runtimes = ServerUtil.getRuntimes(null, null); - String serverRuntimeTypeId = serverType.getRuntimeType().getId(); - for (int i = 0; i < runtimes.length; i++) { - IRuntime runtime = runtimes[i]; - String thisRuntimeTypeId = runtime.getRuntimeType().getId(); - if (thisRuntimeTypeId.equals(serverRuntimeTypeId) && !runtime.isStub()) { - //Found an appropriate IRuntime that is not a stub - nonStubRuntime = runtime; - break; - } - } - - if (nonStubRuntime==null) - { - status = StatusUtils.errorStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_STUB_ONLY,new String[]{serverFactoryId}) ); - return status; - } - - if (env!=null) - { - serverWC = serverType.createServer(null, null, nonStubRuntime, monitor ); - } - else - { - serverWC = serverType.createServer(null, null, nonStubRuntime, null); - } - - if (serverWC != null) { - if (env!=null) - server = serverWC.saveAll(true, monitor ); - else - server = serverWC.saveAll(true, null); - } - } - } catch (CoreException ce) { - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER, ce); - return status; - } - - // set serverInstanceId - if (server!=null) - serverInstanceId = server.getId(); - else { - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_CREATE_SERVER ); - } - - return status; - } - - public void setServerFactoryid(String serverFactoryId) - { - this.serverFactoryId = serverFactoryId; - } - - public String getServerInstanceId() - { - return serverInstanceId; - } - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java deleted file mode 100644 index f10d2c35c..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableBuildCommand.java +++ /dev/null @@ -1,68 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.ws.internal.datamodel.Model; - - -public class DisableBuildCommand extends AbstractDataModelOperation -{ - - private ValidationManager manager_; - /** - * CTOR; - */ - public DisableBuildCommand() - { - - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - - ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_BUILD); - - if (manager_!=null) { - manager_.disableAutoBuild(); - } - return status; - } - - /** - * Set the model - * - * @param model - */ - public void setModel(Model model) { - } - - - /** - * @param manager_ The manager_ to set. - */ - public void setValidationManager(ValidationManager manager) { - this.manager_ = manager; - } -} - diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java deleted file mode 100644 index c513db90b..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/DisableValidationCommand.java +++ /dev/null @@ -1,63 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class DisableValidationCommand extends AbstractDataModelOperation -{ - - private ValidationManager manager_; - private IProject serviceProject_; - - /** - * CTOR; - */ - public DisableValidationCommand() { - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IStatus status = Status.OK_STATUS; - - ProgressUtils.report(monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_DISABLE_VALIDATION); - - IProject project = serviceProject_; - if (project != null) manager_.disableValidationForProject(project); - - return status; - } - - /** - * @param manager_ - * The manager_ to set. - */ - public void setValidationManager(ValidationManager manager) { - this.manager_ = manager; - } - - public void setServiceProject(IProject serviceProject){ - this.serviceProject_ = serviceProject; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.java deleted file mode 100644 index 423b1eb19..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/GetMonitorCommand.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.consumption.command.common; - -// TODO: Get rid of this. A replacement is in org.eclipse.wst.ws. - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Vector; - -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.http.HTTPAddress; -import javax.wsdl.extensions.soap.SOAPAddress; - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.osgi.util.NLS; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; -import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy; -import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore; -import org.eclipse.wst.server.core.util.SocketUtil; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - -public class GetMonitorCommand extends AbstractDataModelOperation -{ - private boolean monitorService; - private boolean create; - private WebServicesParser webServicesParser; - private String wsdlURI; - private List endpoints; - - public GetMonitorCommand() - { - monitorService = true; - create = true; - } - - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - - endpoints = new Vector(); - if (monitorService && webServicesParser != null && wsdlURI != null && wsdlURI.length() > 0) - { - Definition definition = webServicesParser.getWSDLDefinition(wsdlURI); - if (definition != null) - { - Map services = definition.getServices(); - for (Iterator servicesIt = services.values().iterator(); servicesIt.hasNext();) - { - Service service = (Service)servicesIt.next(); - Map ports = service.getPorts(); - for (Iterator portsIt = ports.values().iterator(); portsIt.hasNext();) - { - Port wsdlPort = (Port)portsIt.next(); - List extElements = wsdlPort.getExtensibilityElements(); - for (Iterator extElementsIt = extElements.iterator(); extElementsIt.hasNext();) - { - ExtensibilityElement extElement = (ExtensibilityElement)extElementsIt.next(); - String endpoint = null; - URL endpointURL = null; - if (extElement instanceof SOAPAddress) - endpoint = ((SOAPAddress)extElement).getLocationURI(); - else if (extElement instanceof HTTPAddress) - endpoint = ((HTTPAddress)extElement).getLocationURI(); - if (endpoint != null) - { - try - { - endpointURL = new URL(endpoint); - } - catch (MalformedURLException murle) - { - } - } - if (endpointURL != null) - { - String protocol = endpointURL.getProtocol(); - String host = endpointURL.getHost(); - int port = endpointURL.getPort(); - if (port == -1) - { - if ("http".equalsIgnoreCase(protocol)) - port = 80; - else if ("https".equalsIgnoreCase(protocol)) - port = 443; - } - if (protocol != null && protocol.startsWith("http") && host != null && host.length() > 0 && port != -1) - { - IMonitor m = null; - IMonitor[] monitors = MonitorCore.getMonitors(); - for (int i=0; i<monitors.length; i++) - { - if (host.equalsIgnoreCase(monitors[i].getRemoteHost()) && port == monitors[i].getRemotePort()) - { - m = monitors[i]; - break; - } - } - if (m == null && create) - { - int monitoredPort = SocketUtil.findUnusedPort(5000, 15000); - IMonitorWorkingCopy monitorWorkingCopy = MonitorCore.createMonitor(); - monitorWorkingCopy.setLocalPort(monitoredPort); - monitorWorkingCopy.setRemoteHost(host); - monitorWorkingCopy.setRemotePort(port); - monitorWorkingCopy.setProtocol("HTTP"); - try - { - m = monitorWorkingCopy.save(); - } - catch (Throwable t) - { - IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint}), t); - try - { - if (env != null) - env.getStatusHandler().report(warning); - } - catch (StatusException se) - { - } - } - } - if (m != null) - { - try - { - if (!m.isRunning()) - m.start(); - StringBuffer sb = new StringBuffer(endpointURL.getProtocol()); - sb.append("://localhost:"); - sb.append(String.valueOf(m.getLocalPort())); - sb.append(endpointURL.getFile()); - endpoints.add(sb.toString()); - } - catch (Throwable t) - { - IStatus warning = StatusUtils.warningStatus( NLS.bind(ConsumptionMessages.MSG_ERROR_UNABLE_TO_START_MONITOR, new Object[]{String.valueOf(port), endpoint}), t); - try - { - if (env != null) - env.getStatusHandler().report(warning); - } - catch (StatusException se) - { - } - } - } - } - } - } - } - } - } - } - return Status.OK_STATUS; - } - - public void setMonitorService(boolean monitorService) - { - this.monitorService = monitorService; - } - - public void setDefinition(Definition definition) - { - } - - public void setWebServicesParser(WebServicesParser webServicesParser) - { - this.webServicesParser = webServicesParser; - } - - public void setWsdlURI(String wsdlURI) - { - this.wsdlURI = wsdlURI; - } - - public void setCreate(boolean create) - { - this.create = create; - } - - public List getEndpoints() - { - return endpoints; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java deleted file mode 100644 index b0ad9da58..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/JavaMofReflectionCommand.java +++ /dev/null @@ -1,114 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - - -//core stuff -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.java.JavaHelpers; -import org.eclipse.jem.java.JavaRefFactory; -import org.eclipse.jem.util.emf.workbench.nature.EMFNature; -import org.eclipse.jem.workbench.utility.JemProjectUtilities; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -/** -* This class is to be used to Build the data model -* first we get the java class and then build the model -*/ -public class JavaMofReflectionCommand extends AbstractDataModelOperation -{ - - public static String LABEL = "JavaMofReflectionCommand"; - public static String DESCRIPTION = "reflection for a given class"; - public static String OK_MESSAGE = "The model has been built "; - private static String JAVA_EXTENSION = ".java"; - private static String CLASS_EXTENSION = ".class"; - - private String clientProject; - private JavaHelpers javaClass; - private String qname; - private String proxyBean; - - /** - * Constructs a new JavaMofReflectionCommand with the given label and description - * - */ - public JavaMofReflectionCommand() - { - } - - // setters for this command - - - /** - * The end result of this whole process is to get the Java Class - */ - public JavaHelpers getJavaClass() - { - return javaClass; - } - - - private void processQName() - { - qname = proxyBean; - if (qname.toLowerCase().endsWith(JAVA_EXTENSION)) { - qname = qname.substring(0,(qname.length() -5)); - } - if (qname.toLowerCase().endsWith(CLASS_EXTENSION)) { - qname = qname.substring(0,(qname.length() -6)); - } - } - - /** - * Get the java model from the resource then - * build the model from the mof - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - //just make sure the project and qname are there - //they are essential for this operation - IStatus status = Status.OK_STATUS; - IProject clientIProject = (IProject)ResourceUtils.findResource(clientProject); - processQName(); - if(clientProject == null || qname == null) - return StatusUtils.warningStatus( ConsumptionMessages.MSG_WARN_UNABLE_TO_FIND_PROXY ); - - try { - EMFNature nature = JemProjectUtilities.getJEM_EMF_Nature(clientIProject, true); - javaClass = JavaRefFactory.eINSTANCE.reflectType(qname, nature.getResourceSet()); - } catch (CoreException e) { - } - - return status; - } - - public void setProxyBean(String proxyBean) - { - this.proxyBean = proxyBean; - } - - public void setClientProject(String clientProject) - { - this.clientProject = clientProject; - } - - } diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java deleted file mode 100644 index 5ca1c3224..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/ManageServerStartUpCommand.java +++ /dev/null @@ -1,139 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; - -public class ManageServerStartUpCommand extends AbstractDataModelOperation -{ - - private Boolean isStartServiceEnabled_; - private Boolean isTestServiceEnabled_; - - private IProject serviceProject_; - private String serviceServerTypeId_; - private IServer serviceExistingServer_; - - private IProject sampleProject_; - private String sampleServerTypeId_; - private IServer sampleExistingServer_; - - private boolean isWebProjectStartupRequested_; - - /** - * Default CTOR; - */ - public ManageServerStartUpCommand( ) { - - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - IEnvironment env = getEnvironment(); - IStatus status = Status.OK_STATUS; - ProgressUtils.report(monitor, ConsumptionMessages.PROGRESS_INFO_START_WEB_PROJECT); - - if (isStartServiceEnabled_.booleanValue() && serviceExistingServer_!=null){ - //System.out.println("Calling service server start: "+serviceProject_+" "+serviceServerTypeId_); - StartProjectCommand spc = new StartProjectCommand( ); - spc.setServiceProject(serviceProject_); - spc.setServiceServerTypeID(serviceServerTypeId_); - spc.setServiceExistingServer(serviceExistingServer_); - spc.setIsWebProjectStartupRequested(isWebProjectStartupRequested_); - spc.setEnvironment( env ); - spc.execute( null, null ); - } - - if(isTestServiceEnabled_.booleanValue()&& sampleExistingServer_!=null && serviceExistingServer_!=null && !sampleExistingServer_.equals(serviceExistingServer_)){ - //System.out.println("Calling client server start: "+sampleProject_+" "+sampleExistingServer__); - StartProjectCommand spc = new StartProjectCommand( ); - spc.setSampleProject(sampleProject_); - spc.setSampleServerTypeID(sampleServerTypeId_); - spc.setSampleExistingServer(sampleExistingServer_); - spc.setCreationScenario(new Boolean("false")); - spc.setEnvironment( env ); - spc.execute( null, null ); - } - - return status; - } - - /** - * @param isStartServiceEnabled The isStartServiceEnabled to set. - */ - public void setStartService(Boolean isStartServiceEnabled) { - this.isStartServiceEnabled_ = isStartServiceEnabled; - } - /** - * @param isTestServiceEnabled The isTestServiceEnabled to set. - */ - public void setTestService(Boolean isTestServiceEnabled) { - this.isTestServiceEnabled_ = isTestServiceEnabled; - } - /** - * @param serviceExistingServer The serviceExistingServer to set. - */ - public void setServiceExistingServer(IServer serviceExistingServer) { - this.serviceExistingServer_ = serviceExistingServer; - } - - /** - * @param serviceServerTypeId The serviceServerTypeId to set. - */ - public void setServiceServerTypeId(String serviceServerTypeId) { - this.serviceServerTypeId_ = serviceServerTypeId; - } - /** - * @param serviceProject The serviceProject to set. - */ - public void setServiceProject(IProject serviceProject) { - this.serviceProject_ = serviceProject; - } - - /** - * @param sampleExistingServer The sampleExistingServer to set. - */ - public void setSampleExistingServer(IServer sampleExistingServer) { - this.sampleExistingServer_ = sampleExistingServer; - } - /** - * @param sampleProject The sampleProject to set. - */ - public void setSampleProject(IProject sampleProject) { - this.sampleProject_ = sampleProject; - } - /** - * @param sampleServerTypeId The sampleServerTypeId to set. - */ - public void setSampleServerTypeId(String sampleServerTypeId) { - this.sampleServerTypeId_ = sampleServerTypeId; - } - - /** - * @param isRestartProjectNeeded The isRestartProjectNeeded to set. - */ - public void setIsWebProjectStartupRequested(boolean isRestartProjectNeeded) { - this.isWebProjectStartupRequested_ = isRestartProjectNeeded; - } -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.java deleted file mode 100644 index 3e86dd4da..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/PublishProjectCommand.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.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; - -public class PublishProjectCommand extends AbstractDataModelOperation -{ - - -private String project; -private String serverTypeID; -private IServer existingServer; - - -/** - * Default CTOR; - */ -public PublishProjectCommand() { -} - -/** - * Execute the command - */ -public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) -{ - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - try - { - ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_PUBLISH_WEB_PROJECT ); - - if (project == null){ - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND ); - env.getStatusHandler().reportError(status); - return status; - } - - IProject iProject = (IProject)ResourceUtils.findResource(project); - IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(iProject), serverTypeID, existingServer, true, monitor); - if (instance == null) - { - status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND); - env.getStatusHandler().reportError(status); - return status; - } - - IStatus returnedStatus = instance.publish(IServer.PUBLISH_INCREMENTAL, monitor); - status = returnedStatus; - - //getStatusMonitor().reportStatus (instance.publish(getProgressMonitor())); - env.getLog().log(ILog.OK, 5026, this, "execute", new String("project="+project+" successfully published")); - //ILog.write(PublishProjectCommand.class,"execute",ILog.OK,"project="+project+" successfully published"); - return status; - } - catch (Exception e) { - status = StatusUtils.errorStatus(ConsumptionMessages.MSG_ERROR_PUBLISH, e); - env.getStatusHandler().reportError(status); - return status; - - } -} - - -public void setProject(String project) -{ - this.project = project; -} - -public void setServerTypeID(String serverTypeID) -{ - this.serverTypeID = serverTypeID; -} - -public void setExistingServer(IServer existingServer) -{ - this.existingServer = existingServer; -} - - - -} diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java deleted file mode 100644 index f663b4846..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreBuildStateCommand.java +++ /dev/null @@ -1,56 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class RestoreBuildStateCommand extends AbstractDataModelOperation -{ - - private ValidationManager manager_; - - /** - * Default CTOR; - */ - public RestoreBuildStateCommand() - { - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_BUILD); - - manager_.restoreAutoBuild(); - - return Status.OK_STATUS; - } - - /** - * @param manager_ The manager_ to set. - */ - public void setValidationManager(ValidationManager manager) { - this.manager_ = manager; - } -} - diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.java deleted file mode 100644 index 6ae6317ea..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/RestoreValidationStateCommand.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.command.common; - - -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; - - -public class RestoreValidationStateCommand extends AbstractDataModelOperation -{ - private ValidationManager manager_; - - private boolean runValidation_; - - /** - * Default CTOR; - */ - public RestoreValidationStateCommand( boolean runValidation ) - { - runValidation_ = runValidation; - } - - /** - * Execute the command - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - ProgressUtils.report( monitor, ConsumptionMessages.TASK_DESC_WEBSERVICE_RESTORE_VALIDATION); - - manager_.restoreValidationForProjects( runValidation_ ); - - return Status.OK_STATUS; - } - - /** - * @param manager The validation manager to set. - */ - public void setValidationManager(ValidationManager manager) { - this.manager_ = manager; - } -} - diff --git a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java b/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java deleted file mode 100644 index ef01e27a5..000000000 --- a/bundles/org.eclipse.jst.ws.consumption/src/org/eclipse/jst/ws/internal/consumption/command/common/StartProjectCommand.java +++ /dev/null @@ -1,156 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.jst.ws.internal.consumption.command.common; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.ConsumptionMessages; -import org.eclipse.jst.ws.internal.consumption.common.WebServiceStartServerRegistry; -import org.eclipse.wst.command.internal.env.core.common.ProgressUtils; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.common.frameworks.datamodel.AbstractDataModelOperation; -import org.eclipse.wst.server.core.IServer; - -public class StartProjectCommand extends AbstractDataModelOperation -{ - -private Boolean creationScenario_ = Boolean.TRUE; - -private boolean isWebProjectStartupRequested_; -private IProject serviceProject_; -private IProject sampleProject_; -private String serviceServerTypeID_; -private String sampleServerTypeID_; -private IServer serviceExistingServer_; -private IServer sampleExistingServer_; - - -/** - * Default CTOR; - */ -public StartProjectCommand( ) { - -} - -/** - * Default CTOR; - */ -public StartProjectCommand(boolean creationScenario ) { - creationScenario_ = new Boolean(creationScenario); -} - -/** - * Execute the command - */ -public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) -{ - IEnvironment env = getEnvironment(); - - IStatus status = Status.OK_STATUS; - ProgressUtils.report( monitor, ConsumptionMessages.PROGRESS_INFO_START_WEB_PROJECT); - - - IProject project = ((creationScenario_.booleanValue()) ? serviceProject_ : sampleProject_); - String serverTypeID = ((creationScenario_.booleanValue()) ? serviceServerTypeID_ : sampleServerTypeID_); - IServer server = ((creationScenario_.booleanValue()) ? serviceExistingServer_ : sampleExistingServer_); - if (serverTypeID == null && server!=null) { - serverTypeID = server.getServerType().getId(); - } - if (project == null) - { - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_PROJECT_NOT_FOUND ); - env.getStatusHandler().reportError(status); - return status; - } - IServer instance = ServerUtils.getServerForModule(ServerUtils.getModule(project), serverTypeID, server, true, monitor ); - if (instance == null) - { - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_INSTANCE_NOT_FOUND ); - env.getStatusHandler().reportError(status); - return status; - } - - try - { - AbstractStartServer startServerCommand = null; - WebServiceStartServerRegistry reg = WebServiceStartServerRegistry.getInstance(); - startServerCommand = (AbstractStartServer)reg.getServerStartByTypeId(instance.getServerType().getId()); - startServerCommand.StartServer(project, instance, monitor, isWebProjectStartupRequested_); - return status; - } - catch (CoreException ce ) - { - IStatus embeddedStatus = ce.getStatus(); - status = embeddedStatus; - env.getStatusHandler().reportError(status); - return status; - } - catch (Exception e) - { - status = StatusUtils.errorStatus( ConsumptionMessages.MSG_ERROR_SERVER, e); - env.getStatusHandler().reportError(status); - return status; - } - -} - -public void setCreationScenario(Boolean creationScenario) -{ - creationScenario_ = creationScenario; -} - -public void setServiceProject(IProject serviceProject) -{ - serviceProject_ = serviceProject; -} - -public void setSampleProject(IProject sampleProject) -{ - sampleProject_ = sampleProject; -} - -public void setServiceServerTypeID(String serviceServerTypeID) -{ - serviceServerTypeID_ = serviceServerTypeID; -} - -public void setSampleServerTypeID(String sampleServerTypeID) -{ - sampleServerTypeID_ = sampleServerTypeID; -} - -public void setServiceExistingServer(IServer serviceExistingServer) -{ - serviceExistingServer_ = serviceExistingServer; - if (serviceExistingServer_ != null) - setServiceServerTypeID(serviceExistingServer_.getServerType().getId()); -} - -public void setSampleExistingServer(IServer sampleExistingServer) -{ - sampleExistingServer_ = sampleExistingServer; - if (sampleExistingServer_ != null) - setSampleServerTypeID(sampleExistingServer_.getServerType().getId()); -} - -public void setIsWebProjectStartupRequested(boolean webProjectStartupRequested) -{ - isWebProjectStartupRequested_ = webProjectStartupRequested; -} - -} |