diff options
Diffstat (limited to 'bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal')
66 files changed, 0 insertions, 5603 deletions
diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java deleted file mode 100644 index 6eeca66b8..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/BundleUtils.java +++ /dev/null @@ -1,26 +0,0 @@ -/*************************************************************************************************** - * Copyright (c) 2003, 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.wst.ws.internal.common; - -import java.net.MalformedURLException; -import java.net.URL; -import org.eclipse.core.runtime.Platform; -import org.osgi.framework.Bundle; - -public class BundleUtils -{ - static public URL getURLFromBundle( String bundleId, String path ) throws MalformedURLException - { - Bundle bundle = Platform.getBundle( bundleId ); - URL installURL = bundle.getEntry("/"); - URL fileURL = new URL(installURL, path ); - - return fileURL; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java deleted file mode 100644 index 3981e1242..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/EnvironmentUtils.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.internal.common; - -import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.provisional.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.provisional.env.core.context.TransientResourceContext; -import org.eclipse.wst.common.environment.Environment; - -public final class EnvironmentUtils -{ - /** - * - * @param env This should be an EclipseEnvironment. - * @return Returns a ResourceContext. - */ - public static ResourceContext getResourceContext( Environment env ) - { - ResourceContext context = null; - - if( env instanceof EclipseEnvironment ) - { - context = ((EclipseEnvironment)env).getResourceContext(); - } - else - { - context = new TransientResourceContext(); - } - - return context; - } - - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java deleted file mode 100644 index 0dfb0504d..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/LiveWSDLFilter.java +++ /dev/null @@ -1,102 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2002, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.common; - -import java.io.IOException; -import java.net.MalformedURLException; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.wsdl.Definition; -import javax.wsdl.Port; -import javax.wsdl.Service; -import javax.wsdl.WSDLException; -import javax.wsdl.extensions.ExtensibilityElement; -import javax.wsdl.extensions.http.HTTPAddress; -import javax.wsdl.extensions.soap.SOAPAddress; -import org.eclipse.wst.ws.internal.parser.discovery.WebServicesParserExt; -import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; - -public class LiveWSDLFilter extends Thread -{ - private String wsdlURL_; - private boolean finish_; - private boolean live_; - - public LiveWSDLFilter(String wsdlURL) - { - wsdlURL_ = wsdlURL; - finish_ = false; - live_ = false; - } - - public String getWSDLURL() - { - return wsdlURL_; - } - - public boolean isFinish() - { - return finish_; - } - - public boolean isWSDLLive() - { - return live_; - } - - public void run() - { - try - { - live_ = validateWSDL(); - } - catch (Throwable t) - { - System.out.println("Throwing exception " + t.getMessage()); - live_ = false; - } - finally - { - finish_ = true; - } - } - - private boolean validateWSDL() throws WSDLException, MalformedURLException, IOException, WWWAuthenticationException - { - WebServicesParserExt parser = new WebServicesParserExt(); - Definition definition = parser.getWSDLDefinitionVerbose(wsdlURL_); - System.out.println("wsdlURL_ " + wsdlURL_.toString()); - Map services = definition.getServices(); - Iterator serviceIterator = services.values().iterator(); - System.out.println("serviceIterator " + serviceIterator.toString()); - while (serviceIterator.hasNext()) - { - Service service = (Service)serviceIterator.next(); - Map ports = service.getPorts(); - Iterator portIterator = ports.values().iterator(); - while (portIterator.hasNext()) - { - Port port = (Port)portIterator.next(); - List extensibilityElements = port.getExtensibilityElements(); - Iterator extensibilityElementsIterator = extensibilityElements.iterator(); - while (extensibilityElementsIterator.hasNext()) - { - ExtensibilityElement extensibilityElement = (ExtensibilityElement)extensibilityElementsIterator.next(); - if ((extensibilityElement instanceof SOAPAddress) || (extensibilityElement instanceof HTTPAddress)) - return true; - } - } - } - return false; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java deleted file mode 100644 index 02b492d5d..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/common/WSDLUtility.java +++ /dev/null @@ -1,140 +0,0 @@ -package org.eclipse.wst.ws.internal.common; - -import java.net.MalformedURLException; -import java.net.URL; -import java.util.List; -import java.util.Map; -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.resources.IResource; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; - -/** - * Utilities for working with a workspace WSDL file resource. - * - * @author joan - * - */ - -public class WSDLUtility { - - protected Definition definition_ = null; - protected IResource resource_ = null; - protected String serviceName_ = ""; - protected URL url_ = null; - - public WSDLUtility(IResource res) - { - super(); - resource_ = res; - buildDefinition(); - } - - protected boolean buildDefinition() - { - - if (resource_.getType() == IResource.FILE) - { - String ext = resource_.getFileExtension(); - if (ext != null && ext.equalsIgnoreCase("wsdl")) - { - String resPath = resource_.getFullPath().toString(); - WebServicesParser parser = new WebServicesParser(); - - try { - definition_ = parser.getWSDLDefinition("platform:" + resPath); - if (definition_ == null){ - throw new Exception("WebServiceUtils.getWSDLAddress - error parsing platform:/resource" + resPath); - } - } - catch (Exception e){ - return false; - } - } - } - serviceName_ = ""; - return true; - } - - /** - * Determines the name of the service defined in the WSDL file - * - * @param resource The workspace resource for the WSDL file - * @return Returns a string containing the value of the name attribute of the service element - */ - public String getServiceName() - { - if (serviceName_.equals("")) - { - Map servicesMap = definition_.getServices(); - Object[] services = servicesMap.values().toArray(); - - // TODO: here can detect if no service tag - send appropriate message - // TODO: what if > 1 service defined in the WSDL? - // for now return the first service name found... - for (int i = 0; i < services.length; i++) { - Service s = (Service)services[i]; - String qString = s.getQName().toString(); - - //get name only from qualified string - int index1 = qString.indexOf("}")+1; //$NON-NLS-1$ - int index2 = qString.length(); - - serviceName_ = qString.substring(index1, index2); - } - } - return serviceName_; - } - - public URL getWSDLAddress() - { - if (url_ == null) - { - String locationURI = null; - Map servicesMap = definition_.getServices(); - Object[] services = servicesMap.values().toArray(); - - // TODO: here can detect if no service tag - send appropriate message - // TODO: what if > 1 service defined in the WSDL? - for (int i = 0; i < services.length; i++) { - Service s = (Service)services[i]; - Map portsMap = s.getPorts(); - Object[] ports = portsMap.values().toArray(); - - // TODO: here can detect if > 1 port for the service - determine how to handle - for (int j = 0; j < ports.length; j++) { - Port p = (Port)ports[j]; - List extList = p.getExtensibilityElements(); - - for (int k = 0; j < extList.size(); j++){ - ExtensibilityElement extElement = (ExtensibilityElement)extList.get(k); - if (extElement instanceof SOAPAddress) - { - locationURI = ((SOAPAddress)extElement).getLocationURI(); - } - else if (extElement instanceof HTTPAddress) - { - locationURI = ((HTTPAddress)extElement).getLocationURI(); - } - else - { - //TODO: if not SOAP or HTTP - how do we want to handle it... - } - } - } - } - - try { - url_ = new URL(locationURI + "?" + resource_.getFileExtension()); - } - catch (MalformedURLException malExc){ - - } - } - return url_; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/data/LabelsAndIds.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/data/LabelsAndIds.java deleted file mode 100644 index 5a06b36f1..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/data/LabelsAndIds.java +++ /dev/null @@ -1,48 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -/** - */ -package org.eclipse.wst.ws.internal.data; - -public class LabelsAndIds -{ - private String[] labels_; - private String[] ids_; - - /** - * @return Returns the ids_. - */ - public String[] getIds_() - { - return ids_; - } - /** - * @param ids_ The ids_ to set. - */ - public void setIds_(String[] ids_) - { - this.ids_ = ids_; - } - /** - * @return Returns the labels_. - */ - public String[] getLabels_() - { - return labels_; - } - /** - * @param labels_ The labels_ to set. - */ - public void setLabels_(String[] labels_) - { - this.labels_ = labels_; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.java deleted file mode 100644 index 538caa25e..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicConnection.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.wst.ws.internal.datamodel; - -public class BasicConnection implements Connection -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private Rel fRel; - private Element fElement; - private Connection fOpposingConnection; - - public static final int OUTBOUND = 0; - public static final int INBOUND = 1; - - public static Connection[] createPair ( Rel outboundRel, Element targetElement, Rel inboundRel, Element sourceElement ) - { - BasicConnection outboundConnection = new BasicConnection(outboundRel,targetElement); - BasicConnection inboundConnection = new BasicConnection(inboundRel,sourceElement); - outboundConnection.fOpposingConnection = inboundConnection; - inboundConnection.fOpposingConnection = outboundConnection; - return new Connection[] {outboundConnection,inboundConnection}; - } - - public BasicConnection ( Rel rel, Element element ) - { - fRel = rel; - fElement = element; - fOpposingConnection = null; - } - - public Rel getRel () - { - return fRel; - } - - public Element getElement () - { - return fElement; - } - - public Connection getOpposingConnection () - { - return fOpposingConnection; - } - - public String toString () - { - return fElement.getName(); - } -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java deleted file mode 100644 index 72d08f09d..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicElement.java +++ /dev/null @@ -1,344 +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.wst.ws.internal.datamodel; - -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; - -public class BasicElement implements Element -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private String fName; - private String fMUID; - private Model fModel; - private Hashtable fRels; - private Hashtable fProperties; - private Vector fListeners; - - public BasicElement ( String name, Model model ) - { - fName = name; - setMUID(model.makeMUID(name)); - model.addElement(this); - fModel = model; - fRels = new Hashtable(); - fListeners = new Vector(); - fProperties = new Hashtable(); - fProperties.put(Property.NAME,new BasicProperty(Property.NAME,fName)); - } - - public BasicElement ( String name, Element element, String outboundRelName, String inboundRelName ) - { - this(name,element.getModel()); - connect(element,outboundRelName,inboundRelName); - } - - /** - * Returns a clone of this <code>Element</code> - * of the same class and with the same name and model, - * but with no Properties, Rels or Listeners except for - * the {@link Property#NAME NAME} property. - * @return Object A new Element. - */ - public Element shallowClone () - { - return new BasicElement(fName,fModel); - } - - /** - * Returns a clone of this <code>Element</code> - * of the same class and with the same name and model - * and with a copy of the original Element's Properties. - * The Rels and Listeners are not cloned. - * @return Element A new Element. - */ - public final Element deepClone () - { - Element newElement = shallowClone(); - Enumeration e = getProperties(); - while (e.hasMoreElements()) - { - Property property = (Property)e.nextElement(); - Property newProperty = (Property)property.shallowClone(); - newElement.setProperty(newProperty); - } - return newElement; - } - - /** - * Model-View-Controller: All property changes to the model - * (such as those made by a wizard in the role of a Controller) - * should yield events to which an interested party can listen - * (such as a wizard in the role of a Viewer). - * @param tml The listener to add. - */ - public void addListener ( ElementListener listener ) - { - fListeners.add(listener); - } - - public Model getModel () - { - return fModel; - } - - public boolean isValid () - { - return (fModel != null && fModel.containsElement(this)); - } - - public boolean remove () - { - return fModel.removeElement(this); - } - - public void setName ( String name ) - { - fName = name; - fProperties.put(Property.NAME,new BasicProperty(Property.NAME,fName)); - } - - public String getName () - { - return fName; - } - - /* - * The getter for the MUID - * The MUID is the Model Unique Identifier, made from the name and an - * appended unique number - * @return String a unique id for this element within the context of the model - */ - public String getMUID() - { - return fMUID; - } - - /* - * - * - */ - public int getNumberID() - { - String number = getMUID().substring(getName().length()); - return Integer.parseInt(number); - } - - /* - * Set the MUID which was made by the model - * Should only be settable within this element - * Set once upon creation, you can change the name - * but the id will remain constant. - */ - private void setMUID(String MUID) - { - fMUID = MUID; - } - - public void setProperty ( Property property ) - { - String propertyName = property.getName(); - Property oldProperty = getProperty(propertyName); - fProperties.put(propertyName,property); - if (oldProperty == null) - { - PropertyAddEvent event = new PropertyAddEvent(this,property); - Enumeration e = fListeners.elements(); - while (e.hasMoreElements()) - { - ((ElementListener)e.nextElement()).propertyAdded(event); - } - } - else - { - Object oldValue = oldProperty.getValue(); - Object newValue = property.getValue(); - if (oldValue != newValue) - { - if (oldValue == null || newValue == null || (!oldValue.equals(newValue))) - { - PropertyChangeEvent event = new PropertyChangeEvent(this,property,oldProperty); - Enumeration e = fListeners.elements(); - while (e.hasMoreElements()) - { - ((ElementListener)e.nextElement()).propertyChanged(event); - } - } - } - } - if (propertyName.equals(Property.NAME)) fName = property.getValue().toString(); - } - - public void setPropertyAsObject ( String name, Object value ) - { - setProperty(new BasicProperty(name,value)); - } - - public void setPropertyAsString ( String name, String value ) - { - setProperty(new BasicProperty(name,value)); - } - - public Property getProperty ( String name ) - { - return (Property)fProperties.get(name); - } - - public Object getPropertyAsObject ( String name ) - { - Property property = getProperty(name); - return (property == null ? null : property.getValue()); - } - - public String getPropertyAsString ( String name ) - { - Property property = getProperty(name); - return (property == null ? null : property.getValueAsString()); - } - - public Enumeration getProperties () - { - return fProperties.elements(); - } - - public boolean connect ( Element targetElement, String outboundRelName, String inboundRelName ) - { - if (fModel == null || fModel != targetElement.getModel()) return false; - - Element sourceElement = this; - Rel outboundRel = sourceElement.getRel(outboundRelName); - Rel inboundRel = targetElement.getRel(inboundRelName); - Connection[] pair = BasicConnection.createPair(outboundRel,targetElement,inboundRel,sourceElement); - outboundRel.addConnection(pair[BasicConnection.OUTBOUND]); - inboundRel.addConnection(pair[BasicConnection.INBOUND]); - RelAddEvent event = new RelAddEvent(pair); - Enumeration eSource = getListeners(); - Enumeration eTarget = targetElement.getListeners(); - while (eSource.hasMoreElements()) - { - ((ElementListener)eSource.nextElement()).relAdded(event); - } - - while (eTarget.hasMoreElements()) - { - ((ElementListener)eTarget.nextElement()).relAdded(event); - } - - - return true; - } - - public boolean disconnect ( Element targetElement, String outboundRelName ) - { - return disconnect(targetElement,getRel(outboundRelName)); - } - - public boolean disconnectRel ( String outboundRelName ) - { - return disconnectRel(getRel(outboundRelName)); - } - - public boolean disconnectAll () - { - if (fModel == null) return false; - Enumeration e = fRels.elements(); - while (e.hasMoreElements()) - { - Rel rel = (Rel)e.nextElement(); - disconnectRel(rel); - } - return true; - } - - public Enumeration getElements ( String relName ) - { - return getRel(relName).getTargetElements(); - } - - public int getNumberOfElements ( String relName ) - { - return getRel(relName).getNumberOfTargetElements(); - } - - public Rel getRel ( String relName ) - { - Rel rel = (Rel)fRels.get(relName); - if (rel == null) - { - rel = new BasicRel(relName,this); - fRels.put(relName,rel); - } - return rel; - } - - public Enumeration getRels () - { - return fRels.elements(); - } - - public Enumeration getListeners() - { - return fListeners.elements(); - } - - protected boolean disconnect ( Element targetElement, Rel outboundRel ) - { - if (fModel == null || fModel != targetElement.getModel() || outboundRel == null) return false; - Connection outboundConnection = outboundRel.getConnectionTo(targetElement); - if (outboundConnection == null) return false; - Connection inboundConnection = outboundConnection.getOpposingConnection(); - RelRemoveEvent event = new RelRemoveEvent(new Connection [] {outboundConnection,inboundConnection}); - Enumeration e = fListeners.elements(); - while (e.hasMoreElements()) - { - ((ElementListener)e.nextElement()).relRemoved(event); - } - - Enumeration eTarget = targetElement.getListeners(); - while (eTarget.hasMoreElements()) - { - ((ElementListener)eTarget.nextElement()).relRemoved(event); - } - - Rel inboundRel = inboundConnection.getRel(); - boolean done = outboundRel.removeConnection(outboundConnection); - inboundRel.removeConnection(inboundConnection); - return done; - } - - protected boolean disconnectRel ( Rel outboundRel ) - { - if (fModel == null || outboundRel == null) return false; - Element[] elements = new Element[outboundRel.getNumberOfTargetElements()]; - int i = 0; - Enumeration e = outboundRel.getTargetElements(); - while (e.hasMoreElements()) - { - elements[i++] = (Element)e.nextElement(); - } - while (i-- > 0) - { - disconnect(elements[i],outboundRel); - } - return true; - } - - public String toString () - { - return getName(); - } -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java deleted file mode 100644 index 3b3b43589..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicModel.java +++ /dev/null @@ -1,149 +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.wst.ws.internal.datamodel; - -import java.util.Enumeration; -import java.util.Hashtable; -import java.util.Vector; - -public class BasicModel implements Model -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private String fName; - private Hashtable fElements; - private Element fRoot; - //This is used by the MUID - private int fUniqueNumberCounter; - - public BasicModel ( String name ) - { - fName = name; - fElements = new Hashtable(); - fRoot = null; - fUniqueNumberCounter = 0; - } - - public void setName ( String name ) - { - fName = name; - } - - public String getName () - { - return fName; - } - - - /* - * simple counter that increments each call - */ - public int getUniqueNumber() - { - fUniqueNumberCounter++; - return fUniqueNumberCounter; - } - - /* - * This will use a unique number and append it to the end of the name - * @param String name of the element - * @return String MUID - */ - public String makeMUID(String name) - { - String num = String.valueOf(getUniqueNumber()); - String muid = name + num; - return muid; - } - - - public boolean setRootElement ( Element root ) - { - if (root.getModel() == null) - addElement(root); - else if (root.getModel() != this) - return false; - fRoot = root; - return true; - } - - public Element getRootElement () - { - if (fRoot == null) fRoot = getFirstElement(); - return fRoot; - } - - - /** - * Get the elements that have this name - * @param String name the name of the element - * @return Vector a vector of elements that have this name - * These elements may be of different types - **/ - - public Vector getElementsByName(String name) - { - Vector vector = new Vector(); - Enumeration e = fElements.keys(); - while (e.hasMoreElements()){ - Element element = (Element)e.nextElement(); - if (element.getName().equals(name)) vector.addElement(element); - } - return vector; - } - - - - public boolean addElement ( Element element ) - { - if (element.getModel() != null) return false; - fElements.put(element,element); - return true; - } - - public boolean removeElement ( Element element ) - { - if (element.getModel() != this) return false; - element.disconnectAll(); - if (fRoot == element) fRoot = null; - return (fElements.remove(element) == element); - } - - public Enumeration getElements () - { - return fElements.elements(); - } - - public int getNumberOfElements () - { - return fElements.size(); - } - - public boolean containsElement ( Element element ) - { - return fElements.contains(element); - } - - private Element getFirstElement () - { - Enumeration e = getElements(); - return (e.hasMoreElements() ? (Element)e.nextElement() : null); - } - - public String toString () - { - return getName(); - } -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java deleted file mode 100644 index 6661a82e0..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicProperty.java +++ /dev/null @@ -1,70 +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.wst.ws.internal.datamodel; - -public class BasicProperty implements Property -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private String fName; - private Object fValue; - - public BasicProperty ( String name ) - { - fName = name; - } - - public BasicProperty ( String name, Object value ) - { - fName = name; - fValue = value; - } - - /** - * Returns a shallow clone of this <code>Property</code>. - * Property key and value references are cloned, - * but the value objects themselves are not cloned. - * @return Property A new Property. - */ - public Property shallowClone () - { - return new BasicProperty(fName,fValue); - } - - public String getName () - { - return fName; - } - - public void setValue ( Object value ) - { - fValue = value; - } - - public Object getValue () - { - return fValue; - } - - public void setValueAsString ( String value ) - { - fValue = value; - } - - public String getValueAsString () - { - return (fValue != null ? fValue.toString() : null); - } -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java deleted file mode 100644 index 41336fbd9..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/BasicRel.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.datamodel; - -import java.util.Enumeration; -import java.util.Vector; - -public class BasicRel implements Rel -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private String fName; - private Element fSourceElement; - private Vector fConnections; - - public BasicRel ( String name, Element sourceElement ) - { - fName = name; - fSourceElement = sourceElement; - fConnections = new Vector(); - } - - public String getName () - { - return fName; - } - - public Element getSourceElement () - { - return fSourceElement; - } - - public Enumeration getTargetElements () - { - return new ElementEnumeration(fConnections.elements()); - } - - public int getNumberOfTargetElements () - { - return fConnections.size(); - } - - public void addConnection ( Connection connection ) - { - fConnections.addElement(connection); - } - - public boolean removeConnection ( Connection connection ) - { - return fConnections.removeElement(connection); - } - - public Connection getConnectionTo ( Element targetElement ) - { - Enumeration e = fConnections.elements(); - while (e.hasMoreElements()) - { - Connection c = (Connection)e.nextElement(); - if (c.getElement() == targetElement) return c; - } - return null; - } - - public String toString () - { - return getName(); - } - - private class ElementEnumeration implements Enumeration - { - private Enumeration fConnectionEnumeration; - - public ElementEnumeration ( Enumeration connectionEnumeration ) - { - fConnectionEnumeration = connectionEnumeration; - } - - public boolean hasMoreElements () - { - return fConnectionEnumeration.hasMoreElements(); - } - - public Object nextElement () - { - return ((Connection)fConnectionEnumeration.nextElement()).getElement(); - } - } -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java deleted file mode 100644 index 8d6270c6a..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Connection.java +++ /dev/null @@ -1,57 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.datamodel; - -/** -* This is the abstract class for a connection that ties a Rel to a Node. -* Normally Connection objects are manufactured and managed within the -* derived classes of the Model framework, and are not manipulated by -* the caller directly. -*/ -public interface Connection -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * Returns the Rel that owns this connection. - * @return Rel The Rel that owns this connection. - * This method never returns null, that is, a Connection - * cannot exist without a Rel to own it. - */ - public Rel getRel (); - - /** - * Returns the Node that this connection points to. - * @return Node The Node this connection points to. - * This method never returns null, that is, a Connection - * cannot exist without a Node to point to. - */ - public Element getElement (); - - /** - * Returns the opposing connection to this connection. - * Connection objects always exist in pairs, that is, - * if node "Parent" has a relationship named "Children" - * containing a connection to node "Child", then there - * must exist an opposing connection from "Child" to - * "Parent" in some relationship of "Child" (for example, - * in a relationship called "Parents"). - * @return Connection The opposing connection. - * As a general rule, this method should never return null. - * It may only return null during construction of the pair - * of connections. - */ - public Connection getOpposingConnection (); -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java deleted file mode 100644 index c23721b8e..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Element.java +++ /dev/null @@ -1,265 +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.wst.ws.internal.datamodel; - -import java.util.Enumeration; - -/** -* This is the abstract class for elements that can be managed by a Model. -* Every element has a name, a set of properties, and a set of relationships -* to other elements. -*/ -public interface Element -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * Returns a clone of this <code>Element</code> - * of the same class and with the same name and model, - * but with no Properties, Rels or Listeners except for - * the {@link Property#NAME NAME} property. - * @return Object A new Element. - */ - public Element shallowClone (); - - /** - * Returns a clone of this <code>Element</code> - * of the same class and with the same name and model - * and with a copy of the original Element's Properties. - * The Rels and Listeners are not cloned. - * @return Element A new Element. - */ - public Element deepClone (); - - /** - * Returns the model this element belongs to, or null if the element - * has not been added to a model. See also {@link #isValid isValid()}. - * @return Model The model this element belongs to, or null if none. - */ - public Model getModel (); - - /** - * Returns true if and only if this element belongs to a model. - * See also {@link #getModel getModel()}. - * @return boolean True if and only if this element belongs to a model. - */ - public boolean isValid (); - - /** - * Removes this element from the model to which it currently belongs. - * After calling this method, {@link #getModel getModel()} will return - * null and {@link #isValid isValid()} will return false. - * @return boolean True if the element was successfully removed from - * its model. This method returns false if the element does not belong - * to any model. - */ - public boolean remove (); - - /** - * Sets the name of this element and updates the "name" property. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into setName(). - * @param name The name of this element. - */ - public void setName ( String name ); - - /** - * - */ - public void addListener ( ElementListener listener ); - - /** - * Returns the name of this element. - * @return String The name of this element. - */ - public String getName (); - - /** - * Adds or sets a property of this element. - * Properties set using this method can be retrieved using either - * {@link #getProperty getProperty()} or - * {@link #getPropertyAsObject getPropertyAsObject()}. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into {@link #setName setName()}. - * Any previous property with the same name is replaced. - * @param property The property to set. - */ - public void setProperty ( Property property ); - - /** - * Adds or sets a property of this element. - * Properties set using this method can be retrieved using either - * {@link #getProperty getProperty()} or - * {@link #getPropertyAsObject getPropertyAsObject()}. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into {@link #setName setName()}. - * Any previous property with the same name is replaced. - * @param name The name of the property to set. - * @param value The Object value of the property to set. - */ - public void setPropertyAsObject ( String name, Object value ); - - /** - * Adds or sets a String property of this element. - * Properties set using this method can be retrieved using either - * {@link #getProperty getProperty()}, - * {@link #getPropertyAsObject getPropertyAsObject()} or - * {@link #getPropertyAsString getPropertyAsString()}. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into {@link #setName setName()}. - * Any previous property with the same name is replaced. - * @param name The name of the property to set. - * @param value The String value of the property to set. - */ - public void setPropertyAsString ( String name, String value ); - - /** - * Returns a property of the given name or null if there is none. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into {@link #setName setName()}. - * @param name The name of the property to return. - * @return Property The property, or null if none. - */ - public Property getProperty ( String name ); - - /** - * Returns the Object value of a property of the given name or null - * if there is none. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into {@link #setName setName()}. - * @param name The name of the property to return. - * @return Object The property value as an Object, or null if none. - */ - public Object getPropertyAsObject ( String name ); - - /** - * Returns the String value of a property of the given name or null - * if there is none. - * Every element includes a property called "name" (see Property.NAME) - * whose value is the same string as passed into {@link #setName setName()}. - * @param name The name of the property to return. - * @return String The property value as a String, or null if none. - */ - public String getPropertyAsString ( String name ); - - /** - * Returns an enumeration of all properties of this element. - * There is always at least one property that carries the - * name of this element (see {@link #setName setName()}). - * @return Enumeration An enumeration of all properties of this element. - */ - public Enumeration getProperties (); - - /** - * Creates a bidirectional relationship between this element and another. - * Both relationships are identified by names. The names of all the - * outbound relationships of a element must be mutually unique. - * @param element The element to connect to. - * @param outboundRelName The name of the relationship to contain the - * connection to the element. - * @param inboundRelName The name of the relationship to contain the - * inverse connection back to this element. - * @return boolean True if the connection is created successfully. - * Both elements must belong to the same model, other false is returned. - */ - public boolean connect ( Element element, String outboundRelName, String inboundRelName ); - - /** - * Dismantles the connection to another element in a given relationship. - * The inverse connection is also automatically dismantled. - * @param element The element to disconnect from. - * @param outboundRelName The name of the relationship containing - * the connection to the element. - * @return boolean True if the connection is removed successfully. - * Both elements must belong to the same model, other false is returned. - * If the elements are not connected through the given relationship, then - * false is returned. - */ - public boolean disconnect ( Element element, String outboundRelName ); - - /** - * Dismantles the connection to all elements in the given relationship. - * The inverse connections are also automatically dismantled. - * @param outboundRelName The name of the relationship. - * @return boolean True if all connections are removed successfully. - * This method returns false if the element does not belong to a model. - */ - public boolean disconnectRel ( String outboundRelName ); - - /** - * Dismantles all connections from this element. - * @return boolean True if all connections are removed successfully. - * This method returns false if the element does not belong to a model. - */ - public boolean disconnectAll (); - - /** - * Returns an enumeration of all elements - * connected thru the given relationship. - * @param relName The name of the relationship. - * @return Enumeration The elements in the relationship. - * This method never returns null. - */ - public Enumeration getElements ( String relName ); - - /** - * Returns the number of elements in the given relationship. - * @param relName The name of the relationship. - * @return int The number of elements in the relationship. - * This method never returns a negative value. - */ - - public Enumeration getListeners(); - - public int getNumberOfElements ( String relName ); - - /** - * Returns the relationship object of the given name. - * @param relName The name of the relationship. - * @return int The relationship. This method never returns null. - * In other words, any reference to a relationship name automatically - * brings a corresponding Rel object into existence. Careless naming - * may result in the {@link #getRels getRels()} method returning an enumeration of - * more relationships than would be meaningful, efficient or useful. - */ - public Rel getRel ( String relName ); - - /** - * Returns an enumeration of all known relationships. - * @return Enumeration The outbound relationships of the element. - * This method never returns null. - */ - public Enumeration getRels (); - - - /* - * There is a need sometimes for each element in a model to have a unique identifier. - * Normally this would be left to a name, but since the element maker gives it its name - * there is a chance that a model could have two elements with the same name. If they - * are the same element type then there would be no way to differenciate between the two. - * The following getter and setter will provide a unique identifier. This identifier will be known - * as the muid or Model Unique Identifier. Unlike a uuid it will only be assured uniqueness - * within its own model. The intention is to use a unique number appended to the end - * of the name. - * The following is the getter - * @return String the unique identifier - */ - - public String getMUID(); - - - - -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java deleted file mode 100644 index ec0cfd8bb..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementAdapter.java +++ /dev/null @@ -1,62 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2001, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.datamodel; - -/** -* This is where we store all the state data that various UIs -* (such as the NewWSDLCreationWizard) capture from the user -* and then need to process. -*/ -public class ElementAdapter implements ElementListener -{ - /** - * Called when a property is added to the model. - * @param event The event containing the model, property and value. - */ - public void propertyAdded ( PropertyAddEvent event ) - { - } - - /** - * Called when a property in the model changes. - * @param event The event containing the model, property, old value - * and new value. - */ - public void propertyChanged ( PropertyChangeEvent event ) - { - } - - /** - * Called when a property in the model is removed. - * @param event The event containing the model, property and old value. - */ - public void propertyRemoved ( PropertyRemoveEvent event ) - { - } - - /** - * Called when a property is added to the model. - * @param event The event containing the model, property and value. - */ - public void relAdded ( RelAddEvent event ) - { - } - - /** - * Called when a property is added to the model. - * @param event The event containing the model, property and value. - */ - public void relRemoved ( RelRemoveEvent event ) - { - } -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.java deleted file mode 100644 index 44819e36b..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/ElementListener.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.wst.ws.internal.datamodel; - -/** -* This is where we store all the state data that various UIs -* (such as the NewWSDLCreationWizard) capture from the user -* and then need to process. -*/ -public interface ElementListener -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * Called when a property is added to the model. - * @param event The event containing the model, property and value. - */ - public void propertyAdded ( PropertyAddEvent event ); - - /** - * Called when a property in the model changes. - * @param event The event containing the model, property, old value - * and new value. - */ - public void propertyChanged ( PropertyChangeEvent event ); - - /** - * Called when a property in the model is removed. - * @param event The event containing the model, property and old value. - */ - public void propertyRemoved ( PropertyRemoveEvent event ); - - /** - * Called when a property is added to the model. - * @param event The event containing the model, property and value. - */ - public void relAdded ( RelAddEvent event ); - - /** - * Called when a property is added to the model. - * @param event The event containing the model, property and value. - */ - public void relRemoved ( RelRemoveEvent event ); -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java deleted file mode 100644 index 72f297a11..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Model.java +++ /dev/null @@ -1,135 +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.wst.ws.internal.datamodel; - -import java.util.Enumeration; -import java.util.Vector; - -/** -* This is the abstract class for a simple data model consisting of -* a network of named nodes (class Node). Every node carries a set -* of named properties (class Property). Nodes are interrelated by -* relationships (class Rel) and connections (class Connection). -* Each Model keeps a registry of all of its nodes, and keeps a -* reference to one "root" node that can be used as a starting -* point for navigation. -*/ -public interface Model -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * Sets the name of the model. - * @param name The name of the model. - */ - public void setName ( String name ); - - /** - * Gets the name of the model. - * @return String The name of the model. This must not be null. - */ - public String getName (); - - /** - * Sets a node as the root of the model. If the node does not - * belong to a model, then it is added automatically. If the - * node already belongs to another model, then the root node - * is not set and method returns false. - * @param root The node to set as the root. The node must - * belong either to this model or to no model. This must - * not be null. - * @return boolean True if the node was set as the root. - * This method returns false if the given node already belongs - * to another model. - */ - public boolean setRootElement ( Element root ); - - /** - * Returns the root node. This method always returns a node - * except on an empty Model. If setRootNode() has not been - * called, or if the last root node was removed from the model, - * then the method will select and return an arbitrary node as - * the root. This method will consistently return the same node - * until either - * (a) setRootNode() is called with a different node or - * (b) removeNode() is called to remove the node from the model. - * @return Node The current root node, or null if the model is empty. - */ - - public Element getRootElement (); - - /** - * Get the elements that have this name - * @param String name the name of the element - * @return Vector a vector of elements that have this name - * These elements may be of different types - **/ - - public Vector getElementsByName(String name); - - /** - * Adds a node to the model. If the node already belongs to another - * model then it will not be added. - * @param node The node to add. This must not be null. - * @return boolean True if the node was added successfully. - * This method returns false if the given node already belongs to - * the current model or to another model. - */ - public boolean addElement ( Element element ); - - /** - * Removes a node from the model. - * @param node The node to remove. This must not be null. - * @return boolean True if the node was removed successfully. - * This method returns false if the given node does not belong - * to this model. - */ - public boolean removeElement ( Element element ); - - /** - * Returns an enumeration of all nodes in the model and in no - * particular order, - * @return Enumeration An enumeration of all nodes in the model. - * This method never returns null. - */ - public Enumeration getElements (); - - /** - * Returns the number of nodes in the model. - * @return int The number of nodes in the model. - * This method never returns a negative value. - */ - public int getNumberOfElements (); - - /** - * Determines if this model contains the given node. - * @param node The node to check for. This must not be null. - * @return boolean True if and only if the model contains the node. - */ - public boolean containsElement ( Element element ); - - /* - * This function will provide the next number in the queue for the MUID - * - */ - public int getUniqueNumber(); - - /* - * heres what we call from the element - */ - public String makeMUID(String name); - - -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java deleted file mode 100644 index 8e793ba7c..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Property.java +++ /dev/null @@ -1,70 +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.wst.ws.internal.datamodel; - -/** -* This is the abstract class for properties of a Node. -* Every property has an immutable name and a value of type Object. -*/ -public interface Property -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * Every Node has a property called "name" that is equivalent - * to and kept synchronized with Node.getName() and Node.setName(). - */ - public static final String NAME = "name"; - - /** - * Returns a shallow clone of this <code>Property</code>. - * Property key and value references are cloned, - * but the value objects themselves are not cloned. - * @return Property A new Property. - */ - public Property shallowClone (); - - /** - * Returns the name of this node. - * @return String The name of this node. - */ - public String getName (); - - /** - * Sets the value of this property. - * @param value The value to set. Any previous value is replaced. - */ - public void setValue ( Object value ); - - /** - * Returns the value of this property. - * @return Object The value of this property, possibly null. - */ - public Object getValue (); - - /** - * Sets the value of this property as a string. - * @param value The string to set. Any previous value is replaced. - * The type of the previous value, if any, is of no consequence. - */ - public void setValueAsString ( String value ); - - /** - * Returns the value of this property as a string. - * @return String the value of this property as a string, possibly null. - * If the set value is an arbitrary Object, then Object.toString() is - * returned. - */ - public String getValueAsString (); -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java deleted file mode 100644 index 62fc05805..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyAddEvent.java +++ /dev/null @@ -1,66 +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.wst.ws.internal.datamodel; - -/** -* Carries data relevant to when a property is added to the model. -*/ -public class PropertyAddEvent -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * The model the changed. - */ - protected BasicElement fElement; - - /** - * The property that was added. - */ - protected Property fProperty; - - - /** - * Constructor. - * @param model The model that changed. - * @param property The property that was added. - * @param value The property's value. - */ - public PropertyAddEvent ( BasicElement element, Property property) - { - fElement = element; - fProperty = property; - } - - /** - * Returns the model that changed (that produced this event). - * @return TinyModel The model that changed. - */ - public BasicElement getElement () - { - return fElement; - } - - /** - * Returns the model property that was added. - * @return TinyModel The property that was added. - */ - public Property getProperty () - { - return fProperty; - } - - -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java deleted file mode 100644 index 0ade7cb29..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyChangeEvent.java +++ /dev/null @@ -1,81 +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.wst.ws.internal.datamodel; - -/** -* Carries data relevant to when a property is changed in the model. -*/ -public class PropertyChangeEvent -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * The model the changed. - */ - protected BasicElement fElement; - - /** - * The property that changed. - */ - protected Property fProperty; - - /** - * The property's old value. - */ - protected Property fOldProperty; - - /** - * Constructor. - * @param model The model that changed. - * @param property The property that changed. - * @param oldValue The property's old value. - * @param newValue The property's new value. - */ - public PropertyChangeEvent ( BasicElement element , Property property, Property oldProperty ) - { - fElement = element; - fProperty = property; - fOldProperty = oldProperty; - } - - /** - * Returns the model that changed (that produced this event). - * @return TinyModel The model that changed. - */ - public BasicElement getElement () - { - return fElement; - } - - /** - * Returns the model property that changed. - * @return TinyModel The property that changed. - */ - public Property getProperty () - { - return fProperty; - } - - /** - * Returns the model property's old value. - * @return TinyModel The property's old value. - */ - public Property getOldProperty () - { - return fOldProperty; - } - - -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java deleted file mode 100644 index be468da8c..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/PropertyRemoveEvent.java +++ /dev/null @@ -1,64 +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.wst.ws.internal.datamodel; - -/** -* Carries data relevant to when a property is removed from the model. -*/ -public class PropertyRemoveEvent -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * The model the changed. - */ - protected BasicElement fElement; - - /** - * The property that was removed. - */ - protected Property fProperty; - - /** - * Constructor. - * @param model The model that changed. - * @param property The property that was removed. - * @param value The property's value. - */ - public PropertyRemoveEvent ( BasicElement element, Property property) - { - fElement = element; - fProperty = property; - } - - /** - * Returns the model that changed (that produced this event). - * @return TinyModel The model that changed. - */ - public BasicElement getElement () - { - return fElement; - } - - /** - * Returns the model property that was removed. - * @return TinyModel The property that was removed. - */ - public Property getProperty () - { - return fProperty; - } - -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java deleted file mode 100644 index 661a6dfc3..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/Rel.java +++ /dev/null @@ -1,86 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.datamodel; - -import java.util.Enumeration; - -/** -* This is the abstract class for relationships in a Model. -*/ -public interface Rel -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * Returns the name of this relationship. Relationship names - * cannot be changed. - * @return String The name of the relationship. - */ - public String getName (); - - /** - * Returns the node that owns this relationship. - * @return Node The node that owns this relationship. - * This method never returns null, that is, relationships - * cannot exist in the absence of a node. - */ - public Element getSourceElement(); - - /** - * Returns an enumeration of all nodes in this relationship. - * @return Enumeration The nodes in this relationship. - * This method never returns null. - */ - public Enumeration getTargetElements (); - - /** - * Returns the number of nodes in this relationship. - * @return int The number of nodes in this relationship. - * This method never returns a negative value. - */ - public int getNumberOfTargetElements (); - - /** - * Adds a connection to this relationship. This method is - * intended for use by derivations of the Model framework, - * not by users of the framework. Connection objects should - * only be constructed, added, removed and retrieved by - * implementations of the Node and Rel interfaces. - * @param connection The connection to add. - */ - public void addConnection ( Connection connection ); - - /** - * Removes a connection from this relationship. This method is - * intended for use by derivations of the Model framework, - * not by users of the framework. Connection objects should - * only be constructed, added, removed and retrieved by - * implementations of the Node and Rel interfaces. - * @param connection The connection to remove. - * @return boolean True if the connection was found and removed. - */ - public boolean removeConnection ( Connection connection ); - - /** - * Returns the Connection object for the given target node. - * This method is intended for use by derivations of the Model - * framework, not by users of the framework. Connection objects - * should only be constructed, added, removed and retrieved by - * implementations of the Node and Rel interfaces. - * @param targetNode The node to find the Connection to. - * @return Connection The connection, or null if none. - */ - public Connection getConnectionTo ( Element targetElement ); -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java deleted file mode 100644 index 41a10f739..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelAddEvent.java +++ /dev/null @@ -1,110 +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.wst.ws.internal.datamodel; - -/** -* Carries data relevant to when a property is added to the model. -*/ -public class RelAddEvent -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * The model the changed. - */ - protected Connection fOutBound; - - /** - * The model the changed. - */ - protected Connection fInBound; - - /** - * The property that was added. - */ - protected Property fProperty; - - - /** - * Constructor. - * @param model The model that changed. - * @param property The property that was added. - * @param value The property's value. - */ - public RelAddEvent (Connection[] pair) - { - fOutBound = pair[BasicConnection.OUTBOUND]; - fInBound = pair[BasicConnection.INBOUND]; - } - - /** - * Returns the outbound connection that changed - **/ - public Connection getOutBoundConnection () - { - return fOutBound; - } - - /** - * Returns the changed rel name - **/ - public String getOutBoundRelName() - { - return fOutBound.getRel().getName(); - } - - /** - * Returns the changed rel - **/ - public Rel getOutBoundRel() - { - return fOutBound.getRel(); - } - - /** - * Returns the changed rel name - **/ - public String getInBoundRelName() - { - return fInBound.getRel().getName(); - } - - /** - * Returns the changed rel - **/ - public Rel getInBoundRel() - { - return fInBound.getRel(); - } - - /** - * Returns the outbound element that changed - **/ - public Element getParentElement () - { - return fOutBound.getElement(); - } - - - /** - * Returns the inbound connection that changed - **/ - public Element getChildElement () - { - return fInBound.getElement(); - } - - -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java deleted file mode 100644 index d8fa4f764..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/datamodel/RelRemoveEvent.java +++ /dev/null @@ -1,122 +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.wst.ws.internal.datamodel; - -/** -* Carries data relevant to when a property is added to the model. -*/ -public class RelRemoveEvent -{ - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * The model the changed. - */ - protected Connection fOutBound; - - /** - * The model the changed. - */ - protected Connection fInBound; - - /** - * The property that was added. - */ - protected Property fProperty; - - - /** - * Constructor. - * @param model The model that changed. - * @param property The property that was added. - * @param value The property's value. - */ - public RelRemoveEvent (Connection[] pair) - { - fOutBound = pair[BasicConnection.OUTBOUND]; - fInBound = pair[BasicConnection.INBOUND]; - } - - /** - * Returns the model that changed (that produced this event). - * @return TinyModel The model that changed. - */ - public Connection getOutBound () - { - return fOutBound; - } - - /** - * Returns the model property that was added. - * @return TinyModel The property that was added. - */ - public Connection getInBound () - { - return fInBound; - } - - /** - * Returns the changed rel name - **/ - public String getOutBoundRelName() - { - return fOutBound.getRel().getName(); - } - - /** - * Returns the changed rel - **/ - public Rel getOutBoundRel() - { - return fOutBound.getRel(); - } - - /** - * Returns the changed rel name - **/ - public String getInBoundRelName() - { - return fInBound.getRel().getName(); - } - - /** - * Returns the changed rel - **/ - public Rel getInBoundRel() - { - return fInBound.getRel(); - } - - - /** - * Returns the outbound element that changed - **/ - public Element getOutBoundElement () - { - return fOutBound.getElement(); - } - - - /** - * Returns the inbound connection that changed - **/ - public Element getInboundElement () - { - return fInBound.getElement(); - } - - - -} - - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java deleted file mode 100644 index 393d12d45..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExecutable.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.ext; - -import org.eclipse.wst.command.internal.provisional.env.core.AbstractDataModelOperation; - -/** -* All Extensions with exectutable extensions should implement this -* to fit our framework -*/ -public interface WebServiceExecutable -{ - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - /** - *Returns a wizard fragment for this exention type - * - */ - public AbstractDataModelOperation getFinishCommand(); -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtension.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtension.java deleted file mode 100644 index 0f932a8ee..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtension.java +++ /dev/null @@ -1,46 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.ext; - -import org.eclipse.core.runtime.IConfigurationElement; - - -/** -* This represents an extension in the plugin registry -* It job is to act as a proxy to the iconfigelement -*/ -public interface WebServiceExtension -{ - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * If the extension has code that needs to be executed or a fragment added - * @return WebServiceExecutable this interface holds executable code and a - * fragment - */ - public Object getWebServiceExecutableExtension(); - - /** - * This is the config element that holds the extension info - * @param IConfigurationElement Extension element - */ - public void setConfigElement(IConfigurationElement configElement); - - /** - * If the extension has code that - * @return IConfigurationElement Extension element - */ - public IConfigurationElement getConfigElement(); -} - - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.java deleted file mode 100644 index d06475d79..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.ext; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.wst.common.environment.EnvironmentService; -import org.eclipse.wst.common.environment.Log; - - - - - -/** -* This represents an extension in the plugin registry -* It job is to act as a proxy to the iconfigelement -*/ -public class WebServiceExtensionImpl implements WebServiceExtension -{ - - private Log log_; - - /* - * The ConfigElement that holds extension info - */ - protected IConfigurationElement configElement_; - - /* - * The extension executable - */ - protected WebServiceExecutable webServiceExecutable_; - - - public WebServiceExtensionImpl(IConfigurationElement configElement) - { - configElement_ = configElement; - log_ = EnvironmentService.getEclipseLog(); - } - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - /** - * If the extension has code that needs to be executed or a fragment added - * @return WebServiceExecutable this interface holds executable code and a - * fragment - */ - public Object getWebServiceExecutableExtension() - { - if(webServiceExecutable_ != null) return webServiceExecutable_; - - try{ - return configElement_.createExecutableExtension("class"); - }catch (CoreException e){ - log_.log(Log.ERROR, 5029, this, "getWebServiceExecutableExtension",e); - } - - return null; - } - - /** - * This is the config element that holds the extension info - * @param IConfigurationElement Extension element - */ - public void setConfigElement(IConfigurationElement configElement) - { - configElement_ = configElement; - } - - /** - * This is the config element that holds the extension info - * @return IConfigurationElement Extension element - */ - public IConfigurationElement getConfigElement() - { - return configElement_; - } - - /** - * The name of the extension being used - * @return String name of this extension - */ - public String getName() - { - return getConfigElement().getAttribute( "name" ); - } - - -} - - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistry.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistry.java deleted file mode 100644 index fd19bcbd9..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistry.java +++ /dev/null @@ -1,42 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.ext; - - -/** -* Returns the names of the extensions for a given extension-point -* also returns the extension objects -* -*/ -public interface WebServiceExtensionRegistry -{ - - /** - * Returns the names of all registered extensions - * @return The names of all registered extensions. - */ - public String[] getWebServiceExtensionNames (); - - /** - * Returns the extension object of the given name - *@return WebServiceExtension object - */ - public WebServiceExtension getWebServiceExtensionsByName( String name); - - /** - * Returns All extention objects in this registry - *@return WebServiceExtension objects - */ - public WebServiceExtension[] getWebServiceExtensions(); - - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.java deleted file mode 100644 index f57c7d9e9..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/ext/WebServiceExtensionRegistryImpl.java +++ /dev/null @@ -1,115 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2000, 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.ext; - -import java.util.Hashtable; -import java.util.Vector; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.wst.ws.internal.data.LabelsAndIds; - - -/** -* This is a generic registry which sets up general code in handling -* IConfigElements for an extension -*/ -public abstract class WebServiceExtensionRegistryImpl implements WebServiceExtensionRegistry -{ - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - private Hashtable nameExtensionTable_; - private Vector id_; - private Vector label_; - private LabelsAndIds labelsandids_; - - public WebServiceExtensionRegistryImpl() - { - nameExtensionTable_ = new Hashtable(); - label_ = new Vector(); - id_ = new Vector(); - loadExtensions(); - } - - /** - * Children registries will have different extension types - * @return WebserviceExtension holds a config elem - * for that extension capable of creating an executable file - */ - public abstract WebServiceExtension createWebServiceExtension(IConfigurationElement configElement); - - /** - * Children must implement how they get the IConfigurationElement[] - * @return IConfigurationElement[] an array of elements particular to that - * extension - */ - public abstract IConfigurationElement[] getConfigElements(); - - /* - * Loads WebServiceExtensions for WebServiceClientTest into this registry. - * This is done by querying the plugin registry for all extensions - * that extend webServiceClientTest - */ - private void loadExtensions () - { - IConfigurationElement[] config = getConfigElements(); - - for(int idx=0; idx<config.length; idx++) - { - IConfigurationElement elem = config[idx]; - String label = elem.getAttribute( "label" ); - String id = elem.getAttribute( "id" ); - WebServiceExtension webServiceExtension = createWebServiceExtension(elem); - nameExtensionTable_.put(label,webServiceExtension); - label_.add(label); - id_.add(id); - } - } - - /** - * Returns the names of all registered extensions - * @return The names of all registered extensions. - */ - public String[] getWebServiceExtensionNames () - { - return (String[])nameExtensionTable_.keySet().toArray( new String[0] ); - } - - /** - * Return the names and Ids - */ - public LabelsAndIds getLabelsAndIDs() - { - labelsandids_ = new LabelsAndIds(); - labelsandids_.setLabels_((String[])label_.toArray( new String[0] )); - labelsandids_.setIds_((String[])id_.toArray( new String[0] )); - return labelsandids_; - } - - /** - * Returns the extension object of the given name - * @return WebServiceExtension object - */ - public WebServiceExtension getWebServiceExtensionsByName( String name) - { - return (WebServiceExtension)nameExtensionTable_.get(name); - } - - /** - * Returns All extention objects in this registry - *@return WebServiceExtension objects - */ - public WebServiceExtension[] getWebServiceExtensions() - { - return (WebServiceExtension[])nameExtensionTable_.values().toArray( new WebServiceExtension[0] ); - } - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java deleted file mode 100644 index 8ec196271..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractClientFragment.java +++ /dev/null @@ -1,86 +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.wst.ws.internal.extensions; - -import org.eclipse.wst.command.internal.env.core.fragment.CommandFactoryFragment; -import org.eclipse.wst.common.environment.Environment; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebServiceClient; - -public abstract class AbstractClientFragment extends CommandFactoryFragment -{ - protected IWebServiceClient webServiceClient_; - protected Environment environment_; - protected IContext context_; - protected ISelection selection_; - protected String project_; - protected String module_; - protected String earProject_; - protected String ear_; - - public AbstractClientFragment() - { - } - - protected AbstractClientFragment( AbstractClientFragment fragment ) - { - super( fragment ); - - webServiceClient_ = fragment.webServiceClient_; - environment_ = fragment.environment_; - context_ = fragment.context_; - selection_ = fragment.selection_; - module_ = fragment.module_; - ear_ = fragment.ear_; - } - - public void setWebService( IWebServiceClient webService ) - { - webServiceClient_ = webService; - } - - public void setEnvironment( Environment environment ) - { - environment_ = environment; - } - - public void setContext( IContext context ) - { - context_ = context; - } - - public void setSelection( ISelection selection ) - { - selection_ = selection; - } - - 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.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java deleted file mode 100644 index 2b904aca7..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AbstractServiceFragment.java +++ /dev/null @@ -1,86 +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.wst.ws.internal.extensions; - -import org.eclipse.wst.command.internal.env.core.fragment.CommandFactoryFragment; -import org.eclipse.wst.common.environment.Environment; -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.ISelection; -import org.eclipse.wst.ws.internal.provisional.wsrt.IWebService; - -public abstract class AbstractServiceFragment extends CommandFactoryFragment -{ - protected IWebService webService_; - protected Environment environment_; - protected IContext context_; - protected ISelection selection_; - protected String project_; - protected String module_; - protected String earProject_; - protected String ear_; - - public AbstractServiceFragment() - { - } - - protected AbstractServiceFragment( AbstractServiceFragment fragment ) - { - super( fragment ); - - webService_ = fragment.webService_; - environment_ = fragment.environment_; - context_ = fragment.context_; - selection_ = fragment.selection_; - module_ = fragment.module_; - ear_ = fragment.ear_; - } - - public void setWebService( IWebService webService ) - { - webService_ = webService; - } - - public void setEnvironment( Environment environment ) - { - environment_ = environment; - } - - public void setContext( IContext context ) - { - context_ = context; - } - - public void setSelection( ISelection selection ) - { - selection_ = selection; - } - - 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.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java deleted file mode 100644 index 406325bd8..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleClientFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class AssembleClientFragment extends AbstractClientFragment -{ - public AssembleClientFragment() - { - } - - protected AssembleClientFragment( AssembleClientFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new AssembleClientFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webServiceClient_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webServiceClient_.assemble( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java deleted file mode 100644 index aaa6a9c7a..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/AssembleServiceFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class AssembleServiceFragment extends AbstractServiceFragment -{ - public AssembleServiceFragment() - { - } - - protected AssembleServiceFragment( AssembleServiceFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new AssembleServiceFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webService_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webService_.assemble( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java deleted file mode 100644 index 004b6213b..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployClientFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class DeployClientFragment extends AbstractClientFragment -{ - public DeployClientFragment() - { - } - - protected DeployClientFragment( DeployClientFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new DeployClientFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webServiceClient_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webServiceClient_.deploy( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java deleted file mode 100644 index 2b171eae0..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DeployServiceFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class DeployServiceFragment extends AbstractServiceFragment -{ - public DeployServiceFragment() - { - } - - protected DeployServiceFragment( DeployServiceFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new DeployServiceFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webService_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webService_.deploy( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java deleted file mode 100644 index 78389a419..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopClientFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class DevelopClientFragment extends AbstractClientFragment -{ - public DevelopClientFragment() - { - } - - protected DevelopClientFragment( DevelopClientFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new DevelopClientFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webServiceClient_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webServiceClient_.develop( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java deleted file mode 100644 index 4a5113112..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/DevelopServiceFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class DevelopServiceFragment extends AbstractServiceFragment -{ - public DevelopServiceFragment() - { - } - - protected DevelopServiceFragment( DevelopServiceFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new DevelopServiceFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webService_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webService_.develop( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java deleted file mode 100644 index 4e6c13a02..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallClientFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class InstallClientFragment extends AbstractClientFragment -{ - public InstallClientFragment() - { - } - - protected InstallClientFragment( InstallClientFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new InstallClientFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webServiceClient_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webServiceClient_.install( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java deleted file mode 100644 index 9b779f436..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/InstallServiceFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class InstallServiceFragment extends AbstractServiceFragment -{ - public InstallServiceFragment() - { - } - - protected InstallServiceFragment( InstallServiceFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new InstallServiceFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webService_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webService_.install( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java deleted file mode 100644 index d16ddcec3..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunClientFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class RunClientFragment extends AbstractClientFragment -{ - public RunClientFragment() - { - } - - protected RunClientFragment( RunClientFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new RunClientFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webServiceClient_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webServiceClient_.run( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java deleted file mode 100644 index 7e46223b1..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/extensions/RunServiceFragment.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.extensions; - -import java.util.Vector; -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.command.internal.provisional.env.core.SimpleCommandFactory; - -public class RunServiceFragment extends AbstractServiceFragment -{ - public RunServiceFragment() - { - } - - protected RunServiceFragment( RunServiceFragment fragment ) - { - super( fragment ); - } - - public Object clone() - { - return new RunServiceFragment(); - } - - public ICommandFactory getICommandFactory() - { - ICommandFactory factory = null; - - if( webService_ == null ) - { - factory = new SimpleCommandFactory( new Vector() ); - } - else - { - factory = webService_.run( environment_, context_, selection_, project_, module_, earProject_, ear_ ); - } - - return factory; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java deleted file mode 100644 index 27a1e99e6..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/monitor/GetMonitorCommand.java +++ /dev/null @@ -1,212 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.internal.monitor; - -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.wst.command.internal.provisional.env.core.AbstractDataModelOperation; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Environment; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitor; -import org.eclipse.wst.internet.monitor.core.internal.provisional.IMonitorWorkingCopy; -import org.eclipse.wst.internet.monitor.core.internal.provisional.MonitorCore; -import org.eclipse.wst.server.core.util.SocketUtil; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; - -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 ) - { - Environment 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( - WSPlugin.getResourceString( - "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( - WSPlugin.getResourceString( - "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.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.java deleted file mode 100644 index dd9b9e321..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/plugin/WSPlugin.java +++ /dev/null @@ -1,125 +0,0 @@ -package org.eclipse.wst.ws.internal.plugin; - -import java.text.MessageFormat; -import java.util.MissingResourceException; -import java.util.ResourceBundle; -import org.eclipse.core.runtime.Plugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSDLValidationContext; -import org.eclipse.wst.ws.internal.preferences.PersistentWaitForWSDLValidationContext; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class WSPlugin extends Plugin { - - // The shared instance. - private static WSPlugin plugin; - - // Resource bundle. - private ResourceBundle resourceBundle; - - private PersistentWSDLValidationContext wsdlValidationContext_; - private PersistentWaitForWSDLValidationContext waitForWsdlValidationContext_; - - /** - * The constructor. - */ - public WSPlugin() { - super(); - plugin = this; - } - - /** - * Returns the singleton instance of this plugin. Equivalent to calling - * (WSPlugin)Platform.getPlugin("org.eclipse.wst.ws"); - * @return The WSPlugin singleton. - */ - static public WSPlugin getInstance() { - return plugin; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - resourceBundle = null; - } - - /** - * Returns the shared instance. - */ - public static WSPlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, or 'key' if not - * found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = WSPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the string from the plugin's resource bundle, or 'key' if not - * found. Replaces substitution variables in the message by objects in 'args'. - */ - public static String getResourceString(String key, Object[] args) { - return MessageFormat.format(getResourceString(key), args); - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle - .getBundle("org.eclipse.wst.ws.WSPluginResources"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } - - /** - * Get WSDL Valiation Context - * - */ - - public PersistentWSDLValidationContext getWSDLValidationContext() { - if (wsdlValidationContext_ == null) { - wsdlValidationContext_ = new PersistentWSDLValidationContext(); - wsdlValidationContext_.load(); - } - return wsdlValidationContext_; - } - - /** - * Get Wait for WSDL Valiation Context - * - */ - - public PersistentWaitForWSDLValidationContext getWaitForWSDLValidationContext() { - if (waitForWsdlValidationContext_ == null) { - waitForWsdlValidationContext_ = new PersistentWaitForWSDLValidationContext(); - waitForWsdlValidationContext_.load(); - } - return waitForWsdlValidationContext_; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java deleted file mode 100644 index cb1c047a9..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWSDLValidationContext.java +++ /dev/null @@ -1,77 +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.wst.ws.internal.preferences; - -import org.eclipse.wst.command.internal.env.context.PersistentContext; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; - - - -public class PersistentWSDLValidationContext extends PersistentContext -{ - public static final String VALIDATE_NO_WSDL = "0"; - public static final String VALIDATE_REMOTE_WSDL = "1"; - public static final String VALIDATE_ALL_WSDL = "2"; - - private String wsdl_validation = "WSDL_VALIDATION"; - -public PersistentWSDLValidationContext () -{ - super( WSPlugin.getInstance()); - -} - -public void load() -{ - setDefault(wsdl_validation, VALIDATE_NO_WSDL); -} - -// to be used only by the preference page -public void updateWSDLValidation ( String value) -{ - setValue( wsdl_validation, value); -} - -public String getPersistentWSDLValidation () -{ - String property = getValueAsString(wsdl_validation); -// default to Ignore if no init has been done from ini file - if (property == null || property.equals("")) { - setValue( wsdl_validation, VALIDATE_NO_WSDL); - return VALIDATE_NO_WSDL; - } - else - return property; -} - -public String getDefault() -{ - return getDefaultString(wsdl_validation); -} - -public boolean ValidateNoWSDL() -{ - return VALIDATE_NO_WSDL.equals(getPersistentWSDLValidation()); -} - -public boolean WarnNonWSICompliances() -{ - return VALIDATE_REMOTE_WSDL.equals(getPersistentWSDLValidation()); -} - -public boolean IgnoreNonWSICompliances() -{ - return VALIDATE_ALL_WSDL.equals(getPersistentWSDLValidation()); -} - - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java deleted file mode 100644 index eced2116e..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/preferences/PersistentWaitForWSDLValidationContext.java +++ /dev/null @@ -1,55 +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.wst.ws.internal.preferences; - -import org.eclipse.wst.command.internal.env.context.PersistentContext; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; - - - -public class PersistentWaitForWSDLValidationContext extends PersistentContext -{ - - private String wait_for_wsdl_validation = "WAIT_FOR_WSDL_VALIDATION"; - -public PersistentWaitForWSDLValidationContext () -{ - super( WSPlugin.getInstance()); - -} - -public void load() -{ - setDefault(wait_for_wsdl_validation, true); -} - -// to be used only by the preference page -public void setWaitForWSDLValidation ( boolean value) -{ - setValue( wait_for_wsdl_validation, value); -} - -public boolean getPersistentWaitForWSDLValidation () -{ - return getValueAsBoolean(wait_for_wsdl_validation); - -} - -public boolean getDefault() -{ - return getDefaultBoolean(wait_for_wsdl_validation); -} - - - - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java deleted file mode 100644 index 64f57ce04..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebService.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.common.environment.Environment; - - -public abstract class AbstractWebService implements IWebService { - - private WebServiceInfo info; - - public AbstractWebService(WebServiceInfo info) { - this.info = info; - } - - - public WebServiceInfo getWebServiceInfo() { - return info; - } - - public abstract ICommandFactory assemble(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory deploy(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory develop(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory install(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory run(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java deleted file mode 100644 index e6edcf412..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceClient.java +++ /dev/null @@ -1,50 +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.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.common.environment.Environment; - - -public abstract class AbstractWebServiceClient implements IWebServiceClient { - - private WebServiceClientInfo info; - - public AbstractWebServiceClient(WebServiceClientInfo info) { - this.info = info; - } - - - public WebServiceClientInfo getWebServiceClientInfo() { - return info; - } - - public abstract ICommandFactory assemble(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory deploy(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory develop(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory install(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); - - - public abstract ICommandFactory run(Environment env, IContext ctx, ISelection sel, - String project, String module, String earProject, String ear); -} - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java deleted file mode 100644 index 9f226778c..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/AbstractWebServiceRuntime.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ - -package org.eclipse.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; - -public abstract class AbstractWebServiceRuntime implements IWebServiceRuntime { - - public abstract IWebService getWebService(WebServiceInfo info); - /** - */ - public abstract IWebServiceClient getWebServiceClient(WebServiceClientInfo info); - /** - */ - public ICommandFactory announce(IWebService webService) - { - //TODO provide a boiler-plate announce implementation. - return null; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java deleted file mode 100644 index f546a8195..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IContext.java +++ /dev/null @@ -1,40 +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.wst.ws.internal.provisional.wsrt; - -public interface IContext { - - public boolean getAssemble(); - - public boolean getCheckOutFiles(); - - public boolean getClient(); - - public boolean getCreateFolders(); - - public boolean getDeploy(); - - public boolean getDevelop(); - - public boolean getInstall(); - - public boolean getOverWriteFiles(); - - public boolean getPublish(); - - public boolean getRun(); - - public WebServiceScenario getScenario(); - - public boolean getTest(); - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java deleted file mode 100644 index 7672f19d5..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/ISelection.java +++ /dev/null @@ -1,18 +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.wst.ws.internal.provisional.wsrt; - -public interface ISelection { - - Object[] getSelection(); - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java deleted file mode 100644 index 60a1c7608..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebService.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; - - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.common.environment.Environment; - - -public interface IWebService { - - /** - */ - public WebServiceInfo getWebServiceInfo(); - - public ICommandFactory develop(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory assemble(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory install(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory run(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java deleted file mode 100644 index 7985b6eb0..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceClient.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.common.environment.Environment; - -public interface IWebServiceClient { - - /** - */ - public WebServiceClientInfo getWebServiceClientInfo(); - - public ICommandFactory develop(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory deploy(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory assemble(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory install(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - public ICommandFactory run(Environment env, IContext ctx, ISelection sel, String project, String module, String earProject, String ear); - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java deleted file mode 100644 index 69ed42ca9..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServicePublisher.java +++ /dev/null @@ -1,20 +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.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; -import org.eclipse.wst.common.environment.Environment; - -public interface IWebServicePublisher { - - public ICommandFactory publish(Environment env, IWebService ws); - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java deleted file mode 100644 index fdb873ce2..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceRuntime.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2005 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; - - -public interface IWebServiceRuntime { - - /** - */ - public IWebService getWebService(WebServiceInfo info); - /** - */ - public IWebServiceClient getWebServiceClient(WebServiceClientInfo info); - /** - */ - public ICommandFactory announce(IWebService webService); - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java deleted file mode 100644 index 2a5dae654..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/IWebServiceTester.java +++ /dev/null @@ -1,18 +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.wst.ws.internal.provisional.wsrt; - -import org.eclipse.wst.command.internal.provisional.env.core.ICommandFactory; - -public interface IWebServiceTester { - public ICommandFactory generate(TestInfo testInfo); - public ICommandFactory launch(TestInfo testInfo); -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java deleted file mode 100644 index 611b32eb2..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/TestInfo.java +++ /dev/null @@ -1,253 +0,0 @@ -package org.eclipse.wst.ws.internal.provisional.wsrt; - -import java.util.List; -import org.eclipse.wst.command.internal.provisional.env.core.selection.BooleanSelection; -import org.eclipse.wst.server.core.IServer; -/** - * This holds info that comes from user input or some calculations that - * which might be useful to any test extenders - */ - -public class TestInfo { - private String jspFolder; - private String generationModule; - private String generationProject; - private String serviceProject; - private String proxyBean; - private String setEndpointMethod; - private String clientProject; - private String clientModule; - private boolean clientNeedEAR; - private String clientEARProject; - private String clientEARModule; - private BooleanSelection[] methods; - private String serviceServerTypeID; - private String clientServerTypeID; - private IServer serviceExistingServer; - private IServer clientExistingServer; - private List endpoints; - private String wsdlServiceURL; - - - /** - * This is the folder the user has chosen to generate any jsps - * @param jspFolder - */ - public void setJspFolder(String jspFolder){ - this.jspFolder = jspFolder; - } - - public String getJspFolder(){ - return jspFolder; - } - - /** - * This is the project the user has chosen to generate artifacts to - * @param generationProject - */ - public void setGenerationProject(String generationProject){ - this.generationProject = generationProject; - } - - public String getGenerationProject(){ - return generationProject; - } - - /** - * This is the Module the user has chosen to generate artifacts to - * @param generationModule - */ - public void setGenerationModule(String generationModule){ - this.generationModule = generationModule; - } - - public String getGenerationModule(){ - return generationModule; - } - - /** - * The proxy bean was generated by us this is the name of it - * @param proxyBean - */ - public void setProxyBean(String proxyBean){ - this.proxyBean = proxyBean; - } - - public String getProxyBean(){ - return proxyBean; - } - - /** - * This is the SetEndpointMethod - * @param - */ - public void setSetEndpointMethod(String setEndpointMethod){ - this.setEndpointMethod = setEndpointMethod; - } - - public String getSetEndpointMethod(){ - return setEndpointMethod; - } - - /** - * The clientProject contains the client artifacts including the - * generated proxy bean - * @param clientProject String - */ - public void setClientProject(String clientProject){ - this.clientProject = clientProject; - } - - public String getClientProject(){ - return clientProject; - } - - /** - * The clientModule contains the client artifacts including the - * module - * @param clientProject String - */ - public void setClientModule(String clientModule){ - this.clientModule = clientModule; - } - - public String getClientModule(){ - return clientModule; - } - - /** - * These are methods on the proxybean the user has checked ones - * they want included in the test client - * @param methods - */ - public void setMethods(BooleanSelection[] methods){ - this.methods = methods; - } - - public BooleanSelection[] getMethods(){ - return methods; - } - - /** - * If the command needs a server this is the chosen - * client serverID - * @param sampleServerTypeID - */ - public void setServiceServerTypeID(String serviceServerTypeID){ - this.serviceServerTypeID = serviceServerTypeID; - } - - public String getServiceServerTypeID(){ - return serviceServerTypeID; - } - - /** - * If the command needs a server this is the chosen - * client serverID - * @param sampleServerTypeID - */ - public void setClientServerTypeID(String clientServerTypeID){ - this.clientServerTypeID = clientServerTypeID; - } - - public String getClientServerTypeID(){ - return clientServerTypeID; - } - - /** - * This is the IServer if required - * @param sampleExistingServer - */ - public void setServiceExistingServer(IServer serviceExistingServer){ - this.serviceExistingServer = serviceExistingServer; - } - - public IServer getServiceExistingServer(){ - return serviceExistingServer; - } - - /** - * This is the String if required - * @param clientEARProject - */ - public void setClientEARProject(String clientEARProject){ - this.clientEARProject = clientEARProject; - } - - public String getClientEARProject(){ - return clientEARProject; - } - - - /** - * This is the String if required - * @param clientEARProject - */ - public void setClientEARModule(String clientEARModule){ - this.clientEARModule = clientEARModule; - } - - public String getClientEARModule(){ - return clientEARModule; - } - - /** - * This is the IServer if required - * @param sampleExistingServer - */ - public void setClientExistingServer(IServer clientExistingServer){ - this.clientExistingServer = clientExistingServer; - } - - public IServer getClientExistingServer(){ - return clientExistingServer; - } - - /** - * This is the endpoints if monitor service is enabled - * @param endpoints - */ - public void setEndpoint(List endpoints){ - this.endpoints = endpoints; - } - public List getEndpoint(){ - return endpoints; - } - - /** - * This is the project that should be used when dealing with - * wsdl - * @param serviceProject - */ - public void setServiceProject(String serviceProject){ - this.serviceProject = serviceProject; - } - - public String getServiceProject(){ - return serviceProject; - } - - /** - * WSDL URL - */ - public void setWsdlServiceURL(String wsdlServiceURL){ - this.wsdlServiceURL = wsdlServiceURL; - } - - public String getWsdlServiceURL(){ - return wsdlServiceURL; - } - - /** - * clientNeedEAR - */ - public boolean getClientNeedEAR() { - return clientNeedEAR; - } - - public void setClientNeedEAR(boolean clientNeedEAR) { - this.clientNeedEAR = clientNeedEAR; - } - - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java deleted file mode 100644 index 29b779feb..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceClientInfo.java +++ /dev/null @@ -1,73 +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.wst.ws.internal.provisional.wsrt; - -public class WebServiceClientInfo { - - private WebServiceState state; - private java.lang.String servletLevel; - private java.lang.String j2eeLevel; - private java.lang.String serverFactoryId; - private java.lang.String serverInstanceId; - private java.lang.String webServiceRuntimeId; - private java.lang.String wsdlURL; - private java.lang.String implURL; - - public java.lang.String getImplURL() { - return implURL; - } - public void setImplURL(java.lang.String implURL) { - this.implURL = implURL; - } - public java.lang.String getJ2eeLevel() { - return j2eeLevel; - } - public void setJ2eeLevel(java.lang.String level) { - j2eeLevel = level; - } - public java.lang.String getServerFactoryId() { - return serverFactoryId; - } - public void setServerFactoryId(java.lang.String serverFactoryId) { - this.serverFactoryId = serverFactoryId; - } - public java.lang.String getServerInstanceId() { - return serverInstanceId; - } - public void setServerInstanceId(java.lang.String serverInstanceId) { - this.serverInstanceId = serverInstanceId; - } - public java.lang.String getServletLevel() { - return servletLevel; - } - public void setServletLevel(java.lang.String servletLevel) { - this.servletLevel = servletLevel; - } - public WebServiceState getState() { - return state; - } - public void setState(WebServiceState state) { - this.state = state; - } - public java.lang.String getWebServiceRuntimeId() { - return webServiceRuntimeId; - } - public void setWebServiceRuntimeId(java.lang.String webServiceRuntimeId) { - this.webServiceRuntimeId = webServiceRuntimeId; - } - public java.lang.String getWsdlURL() { - return wsdlURL; - } - public void setWsdlURL(java.lang.String wsdlURL) { - this.wsdlURL = wsdlURL; - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java deleted file mode 100644 index 2657c2cca..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceInfo.java +++ /dev/null @@ -1,99 +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.wst.ws.internal.provisional.wsrt; - -public class WebServiceInfo { - - private WebServiceState state; - private java.lang.String servletLevel; - private java.lang.String j2eeLevel; - private java.lang.String serverFactoryId; - private java.lang.String serverInstanceId; - private java.lang.String webServiceRuntimeId; - private java.lang.String wsdlURL; - private java.lang.String endPointURL; - private java.lang.String implURL; - public java.lang.String getEndPointURL() - { - return endPointURL; - } - public void setEndPointURL(java.lang.String endPointURL) - { - this.endPointURL = endPointURL; - } - public java.lang.String getImplURL() - { - return implURL; - } - public void setImplURL(java.lang.String implURL) - { - this.implURL = implURL; - } - public java.lang.String getJ2eeLevel() - { - return j2eeLevel; - } - public void setJ2eeLevel(java.lang.String level) - { - j2eeLevel = level; - } - public java.lang.String getServerFactoryId() - { - return serverFactoryId; - } - public void setServerFactoryId(java.lang.String serverFactoryId) - { - this.serverFactoryId = serverFactoryId; - } - public java.lang.String getServerInstanceId() - { - return serverInstanceId; - } - public void setServerInstanceId(java.lang.String serverInstanceId) - { - this.serverInstanceId = serverInstanceId; - } - public java.lang.String getServletLevel() - { - return servletLevel; - } - public void setServletLevel(java.lang.String servletLevel) - { - this.servletLevel = servletLevel; - } - public WebServiceState getState() - { - return state; - } - public void setState(WebServiceState state) - { - this.state = state; - } - public java.lang.String getWebServiceRuntimeId() - { - return webServiceRuntimeId; - } - public void setWebServiceRuntimeId(java.lang.String webServiceRuntimeId) - { - this.webServiceRuntimeId = webServiceRuntimeId; - } - public java.lang.String getWsdlURL() - { - return wsdlURL; - } - public void setWsdlURL(java.lang.String wsdlURL) - { - this.wsdlURL = wsdlURL; - } - - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java deleted file mode 100644 index f935d5947..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceScenario.java +++ /dev/null @@ -1,83 +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.wst.ws.internal.provisional.wsrt; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import org.eclipse.emf.common.util.AbstractEnumerator; - - -public final class WebServiceScenario extends AbstractEnumerator -{ - - public static final int BOTTOMUP = 0; - public static final int TOPDOWN = 1; - public static final int CLIENT = 2; - - public static final String BOTTOMUP_LABEL = "BOTTOMUP_LABEL"; - public static final String TOPDOWN_LABEL = "TOPDOWN_LABEL"; - public static final String CLIENT_LABEL = "CLIENT_LABEL"; - - public static final WebServiceScenario BOTTOMUP_LITERAL = new WebServiceScenario(BOTTOMUP, "BOTTOMUP"); - public static final WebServiceScenario TOPDOWN_LITERAL = new WebServiceScenario(TOPDOWN, "TOPDOWN"); - public static final WebServiceScenario CLIENT_LITERAL = new WebServiceScenario(CLIENT, "CLIENT"); - - - private static final WebServiceScenario[] VALUES_ARRAY = - new WebServiceScenario[] - { - BOTTOMUP_LITERAL, - TOPDOWN_LITERAL, - CLIENT_LITERAL, - }; - - public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); - - - public static WebServiceScenario get(String name) - { - for (int i = 0; i < VALUES_ARRAY.length; ++i) - { - WebServiceScenario result = VALUES_ARRAY[i]; - if (result.toString().equals(name)) - { - return result; - } - } - return null; - } - - - public static WebServiceScenario get(int value) - { - switch (value) - { - case BOTTOMUP: return BOTTOMUP_LITERAL; - case TOPDOWN: return TOPDOWN_LITERAL; - case CLIENT: return CLIENT_LITERAL; - } - return null; - } - - /** - * Only this class can construct instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private WebServiceScenario(int value, String name) - { - super(value, name); - } - - -} //WebServiceScenario diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java deleted file mode 100644 index c3b8891ad..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/provisional/wsrt/WebServiceState.java +++ /dev/null @@ -1,91 +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.wst.ws.internal.provisional.wsrt; - -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import org.eclipse.emf.common.util.AbstractEnumerator; - - -public final class WebServiceState extends AbstractEnumerator -{ - - public static final int UNKNOWN = 0; - public static final int DEVELOPED = 1; - public static final int ASSEMBLED = 2; - public static final int DEPLOYED = 3; - public static final int INSTALLED = 4; - public static final int RUNNING = 5; - - - public static final WebServiceState UNKNOWN_LITERAL = new WebServiceState(UNKNOWN, "UNKNOWN"); - public static final WebServiceState DEVELOPED_LITERAL = new WebServiceState(DEVELOPED, "DEVELOPED"); - public static final WebServiceState ASSEMBLED_LITERAL = new WebServiceState(ASSEMBLED, "ASSEMBLED"); - public static final WebServiceState DEPLOYED_LITERAL = new WebServiceState(DEPLOYED, "DEPLOYED"); - public static final WebServiceState INSTALLED_LITERAL = new WebServiceState(INSTALLED, "INSTALLED"); - public static final WebServiceState RUNNING_LITERAL = new WebServiceState(RUNNING, "RUNNING"); - - private static final WebServiceState[] VALUES_ARRAY = - new WebServiceState[] - { - UNKNOWN_LITERAL, - DEVELOPED_LITERAL, - ASSEMBLED_LITERAL, - DEPLOYED_LITERAL, - INSTALLED_LITERAL, - RUNNING_LITERAL, - }; - - public static final List VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY)); - - - public static WebServiceState get(String name) - { - for (int i = 0; i < VALUES_ARRAY.length; ++i) - { - WebServiceState result = VALUES_ARRAY[i]; - if (result.toString().equals(name)) - { - return result; - } - } - return null; - } - - - public static WebServiceState get(int value) - { - switch (value) - { - case UNKNOWN: return UNKNOWN_LITERAL; - case DEVELOPED: return DEVELOPED_LITERAL; - case ASSEMBLED: return ASSEMBLED_LITERAL; - case DEPLOYED: return DEPLOYED_LITERAL; - case INSTALLED: return INSTALLED_LITERAL; - case RUNNING: return RUNNING_LITERAL; - } - return null; - } - - /** - * Only this class can construct instances. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> - * @generated - */ - private WebServiceState(int value, String name) - { - super(value, name); - } - -} //WebServiceState - diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java deleted file mode 100644 index ff499a36e..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/AbstractWebServiceLocator.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.eclipse.wst.ws.internal.wsfinder; - -import java.util.List; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; - -/** - * @author joan - * - * Implementation of IWebServiceLocator. Extenders must implement the abstract method getWebServices(). - * This class will be used to provide methods useful to locator implementers. Extenders should register their - * locator implementation with their plugin using the org.eclipse.wst.ws.locator extension point. - * - */ - - -public abstract class AbstractWebServiceLocator implements IWebServiceLocator { - - public AbstractWebServiceLocator() - { - super(); - } - - /** - * Must return a list of WebServiceInfo objects. Method will be called by WebServiceFinder.getWebServices() - * - * @return list of WebServiceInfo objects - */ - public abstract List getWebServices(); - - /** - * - * @return array of all projects in the workspace resource tree - */ - public IProject[] getWorkspaceProjects() - { - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - return root.getProjects(); - } - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java deleted file mode 100644 index 5b2637852..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/IWebServiceLocator.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.eclipse.wst.ws.internal.wsfinder; - -import java.util.List; - -/** - * @author joan - * - * Interface for web service locators that will be retrieved by the WebServiceFinder. This interface must - * not be implemented directly. Subclasses should extend the AbstractWebServiceLocator and implement the - * getWebServices() method. - */ - -public interface IWebServiceLocator { - - public List getWebServices(); -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java deleted file mode 100644 index 3bf71140b..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceFinder.java +++ /dev/null @@ -1,84 +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.wst.ws.internal.wsfinder; - -import java.util.Iterator; -import java.util.List; -import java.util.Vector; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; - -/** - * @author joan - * - * WebServiceFinder is a singleton which finds all extenders and returns a comprehensive list of WebServiceInfo objects. - * Finds web services by calling locators extending {@link org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator} - * which have been registered with {@link org.eclipse.wst.ws.internal.wsfinder.WebServiceLocatorRegistry}. - */ - -public class WebServiceFinder { - - private static WebServiceFinder instance = null; - - private static final String CLASS_ATTRIBUTE= "class"; //$NON-NLS-1$ - - public WebServiceFinder() - { - super(); - } - - public static WebServiceFinder instance() - { - if (instance == null) - { - instance = new WebServiceFinder(); - } - return instance; - } - - /** - * Returns an iterator of WebServiceInfo objects which represent web services found by locators that - * have registered using the org.eclipse.wst.ws.locator extension point. Currently returns all web - * services found for all registered locators. Locators must extend {@link AbstractWebServiceLocator}. - * - * Callers can use the getter methods on the WebServiceInfo object to retrieve information on the - * web services found. The WebServiceFinder cannot guarantee the level of detail contained in WebServiceInfo - * objects returned. This is left to the locator implementations. - * - * @return iterator of WebServiceInfo objects - */ - public Iterator getWebServices() - { - Vector webServices = new Vector(); - - WebServiceLocatorRegistry wslr = WebServiceLocatorRegistry.getInstance(); - - IConfigurationElement[] regElements = wslr.getConfigElements(); - for (int i = 0; i < regElements.length; i++) { - try{ - Object obj = regElements[i].createExecutableExtension(CLASS_ATTRIBUTE); - - if (obj instanceof IWebServiceLocator) - { - IWebServiceLocator wsl = (IWebServiceLocator)obj; - List wsList = wsl.getWebServices(); - webServices.addAll(wsList); - } - } - catch (CoreException ex){ - - } - } - return webServices.iterator(); - } - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java deleted file mode 100644 index da10e491e..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorExtension.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.eclipse.wst.ws.internal.wsfinder; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.wst.ws.internal.ext.WebServiceExtensionImpl; - -/** - * @author joan - * - * This class is provided for the addition of locator extension specific functions - * - */ - -public class WebServiceLocatorExtension extends WebServiceExtensionImpl { - -// Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - - public WebServiceLocatorExtension(IConfigurationElement configElement) - { - super(configElement); - } -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java deleted file mode 100644 index d78c558f5..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WebServiceLocatorRegistry.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.eclipse.wst.ws.internal.wsfinder; - -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; -import org.eclipse.core.runtime.Platform; -import org.eclipse.wst.ws.internal.ext.WebServiceExtension; -import org.eclipse.wst.ws.internal.ext.WebServiceExtensionRegistryImpl; - -/** - * @author joan - * - * Retrieves locators which extend {@link org.eclipse.wst.ws.internal.wsfinder.AbstractWebServiceLocator}. - * Locators must create an extension for the org.eclipse.wst.ws.locator extension point in order to be retrieved by - * the registry. - */ - - -public class WebServiceLocatorRegistry extends WebServiceExtensionRegistryImpl { - - // Copyright - public static final String copyright = "(c) Copyright IBM Corporation 2000, 2002."; - /* - * This is a singleton becasue it was decided that the memory foot print - * is not as expensive as the time taken retrieving the data - * - */ - - - private static WebServiceLocatorRegistry wslr; - - public static WebServiceLocatorRegistry getInstance() - { - if(wslr == null) wslr = new WebServiceLocatorRegistry(); - return wslr; - } - - private WebServiceLocatorRegistry() - { - super(); - } - - /** - * Children registries will have different extension types - * @return WebserviceExtension holds a config elem - * for that extension capable of creating an executable file - */ - public WebServiceExtension createWebServiceExtension(IConfigurationElement configElement) - { - return new WebServiceLocatorExtension(configElement); - } - - /** - * Contacts platform registry and gets all locators which have registered - * using the org.eclipse.wst.ws.locator extension point. - * @return IConfigurationElement[] an array of elements which contain locators - * extending AbstractWebServiceLocator. - */ - public IConfigurationElement[] getConfigElements() - { - IExtensionRegistry reg = Platform.getExtensionRegistry(); - IConfigurationElement[] config = reg.getConfigurationElementsFor( - "org.eclipse.wst.ws", - "locator"); - return config; - } - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java deleted file mode 100644 index 04784f42b..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsfinder/WorkspaceWSDLLocator.java +++ /dev/null @@ -1,105 +0,0 @@ -package org.eclipse.wst.ws.internal.wsfinder; - -import java.util.List; -import java.util.Vector; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceInfo; - -/** - * Extends the Web Services Finder Framework. - * Finds all .wsdl files in the workspace. - * Not intended to be used directly. WorkspaceWSDLLocator registers with WebServiceLocatorRegistry - * and is accessed by the {@link WebServiceFinder}. - */ - -public class WorkspaceWSDLLocator extends AbstractWebServiceLocator { - - protected List wsdlServices = null; - private static final String PLATFORM_RES = "platform:/resource"; //$NON-NLS-1$ - private static final String WSDL_EXT = "wsdl"; //$NON-NLS-1$ - - public WorkspaceWSDLLocator() - { - super(); - } - - /** - * Returns the collection of all .wsdl files in the workspace. Currently does not eliminate multiple - * occurences of the same web service. - * - * TODO: add a listener to the workspace resource tree so that getWebServices doesn't always - * use the WSDLVisitor to walk the entire resource tree. That should only happen once. After - * that the resource tree can be monitored for modifications to .wsdl files and changes made to a cache. - * - * @return list of WebServiceInfo objects - */ - public List getWebServices() { - - if (wsdlServices == null) - { - try{ - IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - - WSDLVisitor visitor = new WSDLVisitor(); - root.accept(visitor); - visitor.visit(root); - wsdlServices = visitor.getWSDL(); - } - catch (Exception ex){ - - } - } - - return wsdlServices; - } - - /** - * Uses the Visitor pattern to walk the workspace resource tree - */ - - private class WSDLVisitor implements IResourceVisitor - { - - private Vector wsdl = new Vector(); - - /** - * - * visits every node on the resource tree stopping a file resources - * if file resource has extension .wsdl a WebServiceInfo object is created and added to a vector - * TODO: look at caching to eliminate duplicate web service definitions in the vector returned - * TODO: add more information to the WebServiceInfo object. Currently only the qualified filename is added. - */ - - public boolean visit(IResource resource) - { - if (resource.getType() == IResource.FILE) - { - String ext = resource.getFileExtension(); - if (ext != null && ext.equalsIgnoreCase(WSDL_EXT)) - { - String urlString = resource.getFullPath().toString(); - urlString = PLATFORM_RES + urlString; - - WebServiceInfo wsInfo = new WebServiceInfo(); - wsInfo.setWsdlURL(urlString); - - wsdl.add(wsInfo); - } - } - return true; - } - - /** - * - * @return vector of WebServiceInfo objects - */ - public Vector getWSDL() - { - return wsdl; - } - } - -} diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java deleted file mode 100644 index e703fc1af..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsil/AddWSDLToWSILCommand.java +++ /dev/null @@ -1,518 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.internal.wsil; - -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.OutputStream; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.Map; -import java.util.ResourceBundle; -import javax.wsdl.Definition; -import javax.xml.parsers.ParserConfigurationException; -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.apache.wsil.Abstract; -import org.apache.wsil.Description; -import org.apache.wsil.Inspection; -import org.apache.wsil.QName; -import org.apache.wsil.Service; -import org.apache.wsil.WSILDocument; -import org.apache.wsil.WSILException; -import org.apache.wsil.extension.ExtensionBuilder; -import org.apache.wsil.extension.wsdl.ImplementedBinding; -import org.apache.wsil.extension.wsdl.Reference; -import org.apache.wsil.extension.wsdl.ReferencedService; -import org.apache.wsil.extension.wsdl.WSDLConstants; -import org.apache.wsil.xml.XMLWriter; -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.command.internal.provisional.env.core.AbstractDataModelOperation; -import org.eclipse.wst.command.internal.provisional.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Environment; -import org.eclipse.wst.common.environment.uri.URIException; -import org.eclipse.wst.common.environment.uri.URIFactory; -import org.eclipse.wst.ws.internal.parser.wsil.IllegalArgumentsException; -import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationException; -import org.eclipse.wst.ws.internal.parser.wsil.WWWAuthenticationHandler; -import org.eclipse.wst.ws.internal.parser.wsil.WebServicesParser; -import org.w3c.dom.Element; -import org.xml.sax.SAXException; - -public class AddWSDLToWSILCommand extends AbstractDataModelOperation -{ - public static final String ARG_WSIL = "-wsil"; - public static final String ARG_WSDL = "-wsdl"; - public static final String ARG_RESOLVE_WSDL = "-resolvewsdl"; - public static final String ARG_HTTP_BASIC_AUTH_USERNAME = "-httpusername"; - public static final String ARG_HTTP_BASIC_AUTH_PASSWORD = "-httppassword"; - private ResourceBundle resBundle_; - private WWWAuthenticationHandler wwwAuthHandler_; - private String[] args_; - private String wsil_; - private ArrayList wsdls_; - private boolean resolveWSDL_; - private String httpUsername_; - private String httpPassword_; - - public AddWSDLToWSILCommand() - { - resBundle_ = ResourceBundle.getBundle("org.eclipse.wst.ws.internal.parser.wsil.wsil"); - wwwAuthHandler_ = null; - args_ = new String[0]; - clearParsedArgs(); - } - - private void clearParsedArgs() - { - wsil_ = null; - if (wsdls_ == null) - wsdls_ = new ArrayList(); - else - wsdls_.clear(); - resolveWSDL_ = false; - httpUsername_ = null; - httpPassword_ = null; - } - - /** - * Executes the Command. - * - * @param environment - * The environment. Must not be null. - * @return A <code>Status</code> object indicating the degree to which the - * <code>execute</code> method was successful. A valud of <code>null</code>, - * or a Status with a severity of less than <code>Status.ERROR</code> - * signifies success. - */ - public IStatus execute( IProgressMonitor monitor, IAdaptable adaptable ) - { - Environment environment = getEnvironment(); - - URIFactory uriFactory = environment.getURIFactory(); - // Parse arguments - try - { - parseArguments(); - } - catch (IllegalArgumentsException iae) - { - return StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_ILLEGAL_ARGUMENTS"), iae); - } - catch (ArrayIndexOutOfBoundsException e) - { - return StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_INVALID_ARGUMENTS"), e); - } - // Create new WSIL document - WSILDocument wsilDocument = null; - URL wsilURL = null; - try - { - wsilDocument = WSILDocument.newInstance(); - wsilURL = new URL(wsil_); - } - catch (MalformedURLException murle) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_INVALID_WSIL_URI"), murle); - environment.getStatusHandler().reportError(status); - return status; - } - catch (WSILException wsile) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), wsile); - environment.getStatusHandler().reportError(status); - return status; - } - // Read WSIL - try - { - InputStream is = uriFactory.newURI(wsilURL).getInputStream(); - if (is != null) - { - wsilDocument.read(new InputStreamReader(is)); - is.close(); - } - } - catch (URIException urie) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), urie); - environment.getStatusHandler().reportError(status); - return status; - } - catch (IOException ioe) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), ioe); - environment.getStatusHandler().reportError(status); - return status; - } - catch (WSILException wsile) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), wsile); - environment.getStatusHandler().reportError(status); - return status; - } - // internalExecute - String httpUsername = null; - String httpPassword = null; - if (wsdls_.size() == 1 && httpUsername_ != null && httpPassword_ != null) - { - httpUsername = httpUsername_; - httpPassword = httpPassword_; - } - for (Iterator it = wsdls_.iterator(); it.hasNext();) - { - String wsdl = (String) it.next(); - IStatus status = null; - try - { - status = internalExecute(environment, wsilDocument, platform2File(uriFactory, wsil_), wsdl, httpUsername, httpPassword); - } - catch (WWWAuthenticationException wwwae) - { - if (wwwAuthHandler_ != null && httpUsername == null && httpPassword == null) - { - wwwAuthHandler_.handleWWWAuthentication(wwwae); - String handlerUsername = wwwAuthHandler_.getUsername(); - String handlerPassword = wwwAuthHandler_.getPassword(); - if (handlerUsername != null && handlerPassword != null) - { - try - { - status = internalExecute(environment, wsilDocument, platform2File(uriFactory, wsil_), wsdl, handlerUsername, handlerPassword); - } - catch (WWWAuthenticationException wwwae2) - { - IStatus wwwaeStatus = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNRESOLVABLE_WSDL"), wwwae2.getIOException()); - environment.getStatusHandler().reportError(wwwaeStatus); - return wwwaeStatus; - } - } - } - if (status == null) - { - IStatus s = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNRESOLVABLE_WSDL"), wwwae.getIOException()); - environment.getStatusHandler().reportError(s); - return s; - } - } - if (status.getSeverity() != Status.OK) - return status; - } - // Write WSIL - try - { - XMLWriter xmlWriter = new XMLWriter(); - OutputStream os = uriFactory.newURI(wsilURL).getOutputStream(); - if (os != null) - xmlWriter.writeDocument(wsilDocument, os); - else - throw new IOException(); - os.close(); - } - catch (URIException urie) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_WRITE_WSIL"), urie); - environment.getStatusHandler().reportError(status); - return status; - } - catch (IOException ioe) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_WRITE_WSIL"), ioe); - environment.getStatusHandler().reportError(status); - return status; - } - catch (WSILException wsile) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_WRITE_WSIL"), wsile); - environment.getStatusHandler().reportError(status); - return status; - } - return Status.OK_STATUS; - } - - private IStatus internalExecute(Environment environment, WSILDocument wsilDocument, String wsil, String wsdl, String httpUsername, String httpPassword) throws WWWAuthenticationException - { - Definition definition = null; - ArrayList wsdlService = new ArrayList(); - ArrayList wsdlBinding = new ArrayList(); - if (resolveWSDL_) - { - // Parse WSDL - try - { - definition = parseWSDL(wsdl, wsdlService, wsdlBinding, httpUsername, httpPassword); - } - catch (MalformedURLException murle) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_INVALID_WSDL_URI"), murle); - environment.getStatusHandler().reportError(status); - return status; - } - catch (IOException ioe) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNRESOLVABLE_WSDL"), ioe); - environment.getStatusHandler().reportError(status); - return status; - } - catch (ParserConfigurationException pce) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), pce); - environment.getStatusHandler().reportError(status); - return status; - } - catch (SAXException saxe) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_MALFORMED_WSDL"), saxe); - environment.getStatusHandler().reportError(status); - return status; - } - } - // Add WSDL to WSIL - try - { - Inspection inspection = wsilDocument.getInspection(); - Service service = wsilDocument.createService(); - if (definition != null) - { - Element documentation = definition.getDocumentationElement(); - Abstract serviceAbstract = wsilDocument.createAbstract(); - serviceAbstract.setText(Element2String(documentation)); - service.addAbstract(serviceAbstract); - } - Description desc = wsilDocument.createDescription(); - desc.setReferencedNamespace(WSDLConstants.NS_URI_WSDL); - desc.setLocation(getRelativeURI(wsil, wsdl)); - ExtensionBuilder extBuilder = wsilDocument.getExtensionRegistry().getBuilder(WSDLConstants.NS_URI_WSIL_WSDL); - if (definition == null || endpointPresent(definition)) - { - for (Iterator it = wsdlService.iterator(); it.hasNext();) - { - Reference reference = (Reference) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_REFERENCE)); - reference.setEndpointPresent(new Boolean(true)); - ReferencedService refService = (ReferencedService) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_REF_SERVICE)); - refService.setReferencedServiceName((QName) it.next()); - reference.setReferencedService(refService); - desc.setExtensionElement(reference); - } - } - else - { - Reference reference = (Reference) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_REFERENCE)); - reference.setEndpointPresent(new Boolean(false)); - for (Iterator it = wsdlBinding.iterator(); it.hasNext();) - { - ImplementedBinding binding = (ImplementedBinding) extBuilder.createElement(new QName(WSDLConstants.NS_URI_WSIL_WSDL, WSDLConstants.ELEM_IMPL_BINDING)); - binding.setBindingName((QName) it.next()); - reference.addImplementedBinding(binding); - } - } - service.addDescription(desc); - inspection.addService(service); - } - catch (WSILException wsile) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), wsile); - environment.getStatusHandler().reportError(status); - return status; - } - catch (Throwable t) - { - IStatus status = StatusUtils.errorStatus( resBundle_.getString("MSG_ERROR_UNEXPECTED_EXCEPTION"), t); - environment.getStatusHandler().reportError(status); - return status; - } - return Status.OK_STATUS; - } - - /** - * Returns <code>true</code> if, and only if, the Command's <code>undo</code> - * method is supported. - * - * @return True if the Command supports being undone. - */ - public boolean isUndoable() - { - return false; - } - - /** - * Undoes the Command. - * - * @param environment - * The environment. Must not be null. - * @return A <code>Status</code> object indicating the degree to which the - * <code>undo</code> method was successful. A valud of <code>null</code>, - * or a Status with a severity of less than <code>Status.ERROR</code> - * signifies success. - */ - public IStatus undo(Environment environment) - { - return Status.OK_STATUS; - } - - private Definition parseWSDL(String wsdl, ArrayList wsdlService, ArrayList wsdlBinding, String httpUsername, String httpPassword) throws MalformedURLException, IOException, ParserConfigurationException, SAXException, WWWAuthenticationException - { - WebServicesParser wsParser = new WebServicesParser(wsdl); - if (httpUsername != null && httpPassword != null) - { - wsParser.setHTTPBasicAuthUsername(httpUsername); - wsParser.setHTTPBasicAuthPassword(httpPassword); - } - wsParser.parse(WebServicesParser.PARSE_NONE); - Definition definition = wsParser.getWSDLDefinition(wsdl); - if (definition != null) - { - Map services = definition.getServices(); - for (Iterator it = services.keySet().iterator(); it.hasNext();) - wsdlService.add(parseQName((javax.xml.namespace.QName) it.next())); - Map bindings = definition.getBindings(); - for (Iterator it = bindings.keySet().iterator(); it.hasNext();) - wsdlBinding.add(parseQName((javax.xml.namespace.QName) it.next())); - } - return definition; - } - - private boolean endpointPresent(Definition definition) - { - return (definition.getServices().size() > 0); - } - - public String[] getArguments() - { - return args_; - } - - public void setArguments(String[] args) - { - args_ = args; - } - - public WWWAuthenticationHandler getWWWAuthenticationHandler() - { - return wwwAuthHandler_; - } - - public void setWWWAuthenticationHandler(WWWAuthenticationHandler wwwAuthHandler) - { - wwwAuthHandler_ = wwwAuthHandler; - } - - private void parseArguments() throws IllegalArgumentsException - { - clearParsedArgs(); - for (int i = 0; i < args_.length; i++) - { - if (ARG_WSIL.equals(args_[i])) - wsil_ = args_[++i]; - else if (ARG_WSDL.equals(args_[i])) - wsdls_.add(args_[++i]); - else if (ARG_RESOLVE_WSDL.equals(args_[i])) - resolveWSDL_ = true; - else if (ARG_HTTP_BASIC_AUTH_USERNAME.equals(args_[i])) - httpUsername_ = args_[++i]; - else if (ARG_HTTP_BASIC_AUTH_PASSWORD.equals(args_[i])) - httpPassword_ = args_[++i]; - else - throw new IllegalArgumentsException(args_[i]); - } - } - - private QName parseQName(javax.xml.namespace.QName qname) - { - return new QName(qname.getNamespaceURI(), qname.getLocalPart()); - } - - private String Element2String(Element e) throws TransformerConfigurationException, TransformerException, IOException - { - byte[] b = new byte[0]; - if (e != null) - { - DOMSource domSource = new DOMSource(e); - Transformer serializer = TransformerFactory.newInstance().newTransformer(); - serializer.setOutputProperty(OutputKeys.INDENT, "yes"); - serializer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2"); - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - serializer.transform(domSource, new StreamResult(baos)); - baos.close(); - b = baos.toByteArray(); - } - return new String(b); - } - - private String platform2File(URIFactory uriFactory, String uri) - { - try - { - return uriFactory.newURI(uri).asFile().toURL().toString(); - } - catch (Throwable t) - { - t.printStackTrace(); - } - return uri; - } - - private final char FWD_SLASH = '/'; - private final char BWD_SLASH = '\\'; - private final String parentDir = "../"; - - private String getRelativeURI(String baseURI, String targetURI) - { - try - { - String baseURICopy = baseURI.replace(BWD_SLASH, FWD_SLASH); - String targetURICopy = targetURI.replace(BWD_SLASH, FWD_SLASH); - int matchingIndex = -1; - int index = targetURICopy.indexOf(FWD_SLASH); - while (index != -1) - { - if (baseURICopy.startsWith(targetURICopy.substring(0, index + 1))) - { - matchingIndex = index; - index = targetURICopy.indexOf(FWD_SLASH, index + 1); - } - else - break; - } - if (matchingIndex != -1) - { - int slashCount = -1; - int fromIndex = matchingIndex; - while (fromIndex != -1) - { - slashCount++; - fromIndex = baseURICopy.indexOf(FWD_SLASH, fromIndex + 1); - } - StringBuffer relativeURI = new StringBuffer(); - for (int i = 0; i < slashCount; i++) - relativeURI.append(parentDir); - relativeURI.append(targetURI.substring(matchingIndex + 1, targetURI.length())); - return relativeURI.toString(); - } - } - catch (Throwable t) - { - } - return targetURI; - } -}
\ No newline at end of file diff --git a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java b/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java deleted file mode 100644 index fe0626bb1..000000000 --- a/bundles/org.eclipse.wst.ws/src/org/eclipse/wst/ws/internal/wsrt/SimpleContext.java +++ /dev/null @@ -1,120 +0,0 @@ -package org.eclipse.wst.ws.internal.wsrt; - -import org.eclipse.wst.ws.internal.provisional.wsrt.IContext; -import org.eclipse.wst.ws.internal.provisional.wsrt.WebServiceScenario; - -public class SimpleContext implements IContext { - - boolean develop; - boolean assemble; - boolean deploy; - boolean install; - boolean run; - boolean client; - boolean test; - boolean publish; - - WebServiceScenario scenario; - - boolean overwriteFiles; - boolean createFolders; - boolean checkOutFiles; - - - - - public SimpleContext() - { - super(); - // TODO Auto-generated constructor stub - } - - public SimpleContext(boolean develop, boolean assemble, boolean deploy, boolean install, boolean run, boolean client, boolean test, boolean publish, WebServiceScenario scenario, boolean overwriteFiles, boolean folders, boolean checkOutFiles) { - super(); - this.develop = develop; - this.assemble = assemble; - this.deploy = deploy; - this.install = install; - this.run = run; - this.client = client; - this.test = test; - this.publish = publish; - this.scenario = scenario; - this.overwriteFiles = overwriteFiles; - this.createFolders = folders; - this.checkOutFiles = checkOutFiles; - } - - public boolean getAssemble() { - return assemble; - } - public void setAssemble(boolean assemble) { - this.assemble = assemble; - } - public boolean getCheckOutFiles() { - return checkOutFiles; - } - public void setCheckOutFiles(boolean checkOutFiles) { - this.checkOutFiles = checkOutFiles; - } - public boolean getClient() { - return client; - } - public void setClient(boolean client) { - this.client = client; - } - public boolean getCreateFolders() { - return createFolders; - } - public void setCreateFolders(boolean createFolders) { - this.createFolders = createFolders; - } - public boolean getDeploy() { - return deploy; - } - public void setDeploy(boolean deploy) { - this.deploy = deploy; - } - public boolean getDevelop() { - return develop; - } - public void setDevelop(boolean develop) { - this.develop = develop; - } - public boolean getInstall() { - return install; - } - public void setInstall(boolean install) { - this.install = install; - } - public boolean getOverWriteFiles() { - return overwriteFiles; - } - public void setOverWriteFiles(boolean overwriteFiles) { - this.overwriteFiles = overwriteFiles; - } - public boolean getPublish() { - return publish; - } - public void setPublish(boolean publish) { - this.publish = publish; - } - public boolean getRun() { - return run; - } - public void setRun(boolean run) { - this.run = run; - } - public WebServiceScenario getScenario() { - return scenario; - } - public void setScenario(WebServiceScenario scenario) { - this.scenario = scenario; - } - public boolean getTest() { - return test; - } - public void setTest(boolean test) { - this.test = test; - } -} |