diff options
Diffstat (limited to 'tests')
131 files changed, 0 insertions, 9067 deletions
diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath deleted file mode 100644 index 9f4b4d1d5..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="tests"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore deleted file mode 100644 index 57763eb9b..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -tests.jar diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project deleted file mode 100644 index 202e7cf4e..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.ws.axis.consumption.core.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0fd1048cf..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,57 +0,0 @@ -#Mon Jan 30 10:29:14 EST 2006 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 577040239..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Mon Jan 30 10:41:39 EST 2006 -compilers.p.deprecated=1 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=1 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=1 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF deleted file mode 100644 index 3069cd0d7..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,14 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.jst.ws.axis.consumption.core.tests -Bundle-Version: 1.0.0 -Bundle-Vendor: %PLUGIN_PROVIDER -Bundle-Localization: plugin -Require-Bundle: org.junit, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.jdt.core, - org.eclipse.wst.ws, - org.eclipse.jst.ws, - org.eclipse.wst.common.uriresolver diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html deleted file mode 100644 index 4ec598958..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>May 2, 2006</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties deleted file mode 100644 index ad188ef9c..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -source.. = tests/ -output.. = bin/ -bin.includes = META-INF/,\ - .,\ - about.html diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java deleted file mode 100644 index 7523659b6..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceProxy.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.tempuri.AreaService; - -public class AreaServiceProxy implements org.tempuri.AreaService.AreaService_PortType { - private String _endpoint = null; - private org.tempuri.AreaService.AreaService_PortType areaService_PortType = null; - - public AreaServiceProxy() { - _initAreaServiceProxy(); - } - - private void _initAreaServiceProxy() { - try { - areaService_PortType = (new org.tempuri.AreaService.AreaService_ServiceLocator()).getAreaServiceSOAP(); - if (areaService_PortType != null) { - if (_endpoint != null) - ((javax.xml.rpc.Stub)areaService_PortType)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint); - else - _endpoint = (String)((javax.xml.rpc.Stub)areaService_PortType)._getProperty("javax.xml.rpc.service.endpoint.address"); - } - - } - catch (javax.xml.rpc.ServiceException serviceException) {} - } - - public String getEndpoint() { - return _endpoint; - } - - public void setEndpoint(String endpoint) { - _endpoint = endpoint; - if (areaService_PortType != null) - ((javax.xml.rpc.Stub)areaService_PortType)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint); - - } - - public org.tempuri.AreaService.AreaService_PortType getAreaService_PortType() { - if (areaService_PortType == null) - _initAreaServiceProxy(); - return areaService_PortType; - } - - public float calculateRectArea(org.tempuri.AreaService.Dimensions parameters) throws java.rmi.RemoteException{ - if (areaService_PortType == null) - _initAreaServiceProxy(); - return areaService_PortType.calculateRectArea(parameters); - } - - -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java deleted file mode 100644 index 5708a4597..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaServiceSOAPStub.java +++ /dev/null @@ -1,175 +0,0 @@ -/** - * AreaServiceSOAPStub.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package org.tempuri.AreaService; - -public class AreaServiceSOAPStub extends org.apache.axis.client.Stub implements org.tempuri.AreaService.AreaService_PortType { - private java.util.Vector cachedSerClasses = new java.util.Vector(); - private java.util.Vector cachedSerQNames = new java.util.Vector(); - private java.util.Vector cachedSerFactories = new java.util.Vector(); - private java.util.Vector cachedDeserFactories = new java.util.Vector(); - - static org.apache.axis.description.OperationDesc [] _operations; - - static { - _operations = new org.apache.axis.description.OperationDesc[1]; - _initOperationDesc1(); - } - - private static void _initOperationDesc1(){ - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("CalculateRectArea"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "parameters"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "dimensions"), org.tempuri.AreaService.Dimensions.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float")); - oper.setReturnClass(float.class); - oper.setReturnQName(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "area")); - oper.setStyle(org.apache.axis.constants.Style.DOCUMENT); - oper.setUse(org.apache.axis.constants.Use.LITERAL); - _operations[0] = oper; - - } - - public AreaServiceSOAPStub() throws org.apache.axis.AxisFault { - this(null); - } - - public AreaServiceSOAPStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - this(service); - super.cachedEndpoint = endpointURL; - } - - public AreaServiceSOAPStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - if (service == null) { - super.service = new org.apache.axis.client.Service(); - } else { - super.service = service; - } - ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2"); - java.lang.Class cls; - javax.xml.namespace.QName qName; - javax.xml.namespace.QName qName2; - java.lang.Class beansf = org.apache.axis.encoding.ser.BeanSerializerFactory.class; - java.lang.Class beandf = org.apache.axis.encoding.ser.BeanDeserializerFactory.class; - java.lang.Class enumsf = org.apache.axis.encoding.ser.EnumSerializerFactory.class; - java.lang.Class enumdf = org.apache.axis.encoding.ser.EnumDeserializerFactory.class; - java.lang.Class arraysf = org.apache.axis.encoding.ser.ArraySerializerFactory.class; - java.lang.Class arraydf = org.apache.axis.encoding.ser.ArrayDeserializerFactory.class; - java.lang.Class simplesf = org.apache.axis.encoding.ser.SimpleSerializerFactory.class; - java.lang.Class simpledf = org.apache.axis.encoding.ser.SimpleDeserializerFactory.class; - java.lang.Class simplelistsf = org.apache.axis.encoding.ser.SimpleListSerializerFactory.class; - java.lang.Class simplelistdf = org.apache.axis.encoding.ser.SimpleListDeserializerFactory.class; - qName = new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "dimensions"); - cachedSerQNames.add(qName); - cls = org.tempuri.AreaService.Dimensions.class; - cachedSerClasses.add(cls); - cachedSerFactories.add(beansf); - cachedDeserFactories.add(beandf); - - } - - protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { - try { - org.apache.axis.client.Call _call = super._createCall(); - if (super.maintainSessionSet) { - _call.setMaintainSession(super.maintainSession); - } - if (super.cachedUsername != null) { - _call.setUsername(super.cachedUsername); - } - if (super.cachedPassword != null) { - _call.setPassword(super.cachedPassword); - } - if (super.cachedEndpoint != null) { - _call.setTargetEndpointAddress(super.cachedEndpoint); - } - if (super.cachedTimeout != null) { - _call.setTimeout(super.cachedTimeout); - } - if (super.cachedPortName != null) { - _call.setPortName(super.cachedPortName); - } - java.util.Enumeration keys = super.cachedProperties.keys(); - while (keys.hasMoreElements()) { - java.lang.String key = (java.lang.String) keys.nextElement(); - _call.setProperty(key, super.cachedProperties.get(key)); - } - // All the type mapping information is registered - // when the first call is made. - // The type mapping information is actually registered in - // the TypeMappingRegistry of the service, which - // is the reason why registration is only needed for the first call. - synchronized (this) { - if (firstCall()) { - // must set encoding style before registering serializers - _call.setEncodingStyle(null); - for (int i = 0; i < cachedSerFactories.size(); ++i) { - java.lang.Class cls = (java.lang.Class) cachedSerClasses.get(i); - javax.xml.namespace.QName qName = - (javax.xml.namespace.QName) cachedSerQNames.get(i); - java.lang.Object x = cachedSerFactories.get(i); - if (x instanceof Class) { - java.lang.Class sf = (java.lang.Class) - cachedSerFactories.get(i); - java.lang.Class df = (java.lang.Class) - cachedDeserFactories.get(i); - _call.registerTypeMapping(cls, qName, sf, df, false); - } - else if (x instanceof javax.xml.rpc.encoding.SerializerFactory) { - org.apache.axis.encoding.SerializerFactory sf = (org.apache.axis.encoding.SerializerFactory) - cachedSerFactories.get(i); - org.apache.axis.encoding.DeserializerFactory df = (org.apache.axis.encoding.DeserializerFactory) - cachedDeserFactories.get(i); - _call.registerTypeMapping(cls, qName, sf, df, false); - } - } - } - } - return _call; - } - catch (java.lang.Throwable _t) { - throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); - } - } - - public float calculateRectArea(org.tempuri.AreaService.Dimensions parameters) throws java.rmi.RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[0]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI("http://tempuri.org/AreaService/NewOperation"); - _call.setEncodingStyle(null); - _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("", "CalculateRectArea")); - - setRequestHeaders(_call); - setAttachments(_call); - try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {parameters}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException)_resp; - } - else { - extractAttachments(_call); - try { - return ((java.lang.Float) _resp).floatValue(); - } catch (java.lang.Exception _exception) { - return ((java.lang.Float) org.apache.axis.utils.JavaUtils.convert(_resp, float.class)).floatValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - throw axisFaultException; -} - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java deleted file mode 100644 index c8b7dccbb..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_PortType.java +++ /dev/null @@ -1,12 +0,0 @@ -/** - * AreaService_PortType.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package org.tempuri.AreaService; - -public interface AreaService_PortType extends java.rmi.Remote { - public float calculateRectArea(org.tempuri.AreaService.Dimensions parameters) throws java.rmi.RemoteException; -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java deleted file mode 100644 index 981f659bf..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_Service.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * AreaService_Service.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package org.tempuri.AreaService; - -public interface AreaService_Service extends javax.xml.rpc.Service { - public java.lang.String getAreaServiceSOAPAddress(); - - public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP() throws javax.xml.rpc.ServiceException; - - public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java deleted file mode 100644 index 23d22c86a..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/AreaService_ServiceLocator.java +++ /dev/null @@ -1,142 +0,0 @@ -/** - * AreaService_ServiceLocator.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package org.tempuri.AreaService; - -public class AreaService_ServiceLocator extends org.apache.axis.client.Service implements org.tempuri.AreaService.AreaService_Service { - - public AreaService_ServiceLocator() { - } - - - public AreaService_ServiceLocator(org.apache.axis.EngineConfiguration config) { - super(config); - } - - public AreaService_ServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException { - super(wsdlLoc, sName); - } - - // Use to get a proxy class for AreaServiceSOAP - private java.lang.String AreaServiceSOAP_address = "http://localhost:8080/AreaProj/services/AreaServiceSOAP"; - - public java.lang.String getAreaServiceSOAPAddress() { - return AreaServiceSOAP_address; - } - - // The WSDD service name defaults to the port name. - private java.lang.String AreaServiceSOAPWSDDServiceName = "AreaServiceSOAP"; - - public java.lang.String getAreaServiceSOAPWSDDServiceName() { - return AreaServiceSOAPWSDDServiceName; - } - - public void setAreaServiceSOAPWSDDServiceName(java.lang.String name) { - AreaServiceSOAPWSDDServiceName = name; - } - - public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP() throws javax.xml.rpc.ServiceException { - java.net.URL endpoint; - try { - endpoint = new java.net.URL(AreaServiceSOAP_address); - } - catch (java.net.MalformedURLException e) { - throw new javax.xml.rpc.ServiceException(e); - } - return getAreaServiceSOAP(endpoint); - } - - public org.tempuri.AreaService.AreaService_PortType getAreaServiceSOAP(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { - try { - org.tempuri.AreaService.AreaServiceSOAPStub _stub = new org.tempuri.AreaService.AreaServiceSOAPStub(portAddress, this); - _stub.setPortName(getAreaServiceSOAPWSDDServiceName()); - return _stub; - } - catch (org.apache.axis.AxisFault e) { - return null; - } - } - - public void setAreaServiceSOAPEndpointAddress(java.lang.String address) { - AreaServiceSOAP_address = address; - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - try { - if (org.tempuri.AreaService.AreaService_PortType.class.isAssignableFrom(serviceEndpointInterface)) { - org.tempuri.AreaService.AreaServiceSOAPStub _stub = new org.tempuri.AreaService.AreaServiceSOAPStub(new java.net.URL(AreaServiceSOAP_address), this); - _stub.setPortName(getAreaServiceSOAPWSDDServiceName()); - return _stub; - } - } - catch (java.lang.Throwable t) { - throw new javax.xml.rpc.ServiceException(t); - } - throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - if (portName == null) { - return getPort(serviceEndpointInterface); - } - java.lang.String inputPortName = portName.getLocalPart(); - if ("AreaServiceSOAP".equals(inputPortName)) { - return getAreaServiceSOAP(); - } - else { - java.rmi.Remote _stub = getPort(serviceEndpointInterface); - ((org.apache.axis.client.Stub) _stub).setPortName(portName); - return _stub; - } - } - - public javax.xml.namespace.QName getServiceName() { - return new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "AreaService"); - } - - private java.util.HashSet ports = null; - - public java.util.Iterator getPorts() { - if (ports == null) { - ports = new java.util.HashSet(); - ports.add(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "AreaServiceSOAP")); - } - return ports.iterator(); - } - - /** - * Set the endpoint address for the specified port name. - */ - public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { - -if ("AreaServiceSOAP".equals(portName)) { - setAreaServiceSOAPEndpointAddress(address); - } - else -{ // Unknown Port Name - throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); - } - } - - /** - * Set the endpoint address for the specified port name. - */ - public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException { - setEndpointAddress(portName.getLocalPart(), address); - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java deleted file mode 100644 index ea8eb5288..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource1/org/tempuri/AreaService/Dimensions.java +++ /dev/null @@ -1,146 +0,0 @@ -/** - * Dimensions.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package org.tempuri.AreaService; - -public class Dimensions implements java.io.Serializable { - private float width; - private float height; - - public Dimensions() { - } - - public Dimensions( - float width, - float height) { - this.width = width; - this.height = height; - } - - - /** - * Gets the width value for this Dimensions. - * - * @return width - */ - public float getWidth() { - return width; - } - - - /** - * Sets the width value for this Dimensions. - * - * @param width - */ - public void setWidth(float width) { - this.width = width; - } - - - /** - * Gets the height value for this Dimensions. - * - * @return height - */ - public float getHeight() { - return height; - } - - - /** - * Sets the height value for this Dimensions. - * - * @param height - */ - public void setHeight(float height) { - this.height = height; - } - - private java.lang.Object __equalsCalc = null; - public synchronized boolean equals(java.lang.Object obj) { - if (!(obj instanceof Dimensions)) return false; - Dimensions other = (Dimensions) obj; - if (obj == null) return false; - if (this == obj) return true; - if (__equalsCalc != null) { - return (__equalsCalc == obj); - } - __equalsCalc = obj; - boolean _equals; - _equals = true && - this.width == other.getWidth() && - this.height == other.getHeight(); - __equalsCalc = null; - return _equals; - } - - private boolean __hashCodeCalc = false; - public synchronized int hashCode() { - if (__hashCodeCalc) { - return 0; - } - __hashCodeCalc = true; - int _hashCode = 1; - _hashCode += new Float(getWidth()).hashCode(); - _hashCode += new Float(getHeight()).hashCode(); - __hashCodeCalc = false; - return _hashCode; - } - - // Type metadata - private static org.apache.axis.description.TypeDesc typeDesc = - new org.apache.axis.description.TypeDesc(Dimensions.class, true); - - static { - typeDesc.setXmlType(new javax.xml.namespace.QName("http://tempuri.org/AreaService/", "dimensions")); - org.apache.axis.description.ElementDesc elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("width"); - elemField.setXmlName(new javax.xml.namespace.QName("", "width")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - elemField = new org.apache.axis.description.ElementDesc(); - elemField.setFieldName("height"); - elemField.setXmlName(new javax.xml.namespace.QName("", "height")); - elemField.setXmlType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float")); - elemField.setNillable(false); - typeDesc.addFieldDesc(elemField); - } - - /** - * Return type metadata object - */ - public static org.apache.axis.description.TypeDesc getTypeDesc() { - return typeDesc; - } - - /** - * Get Custom Serializer - */ - public static org.apache.axis.encoding.Serializer getSerializer( - java.lang.String mechType, - java.lang.Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanSerializer( - _javaType, _xmlType, typeDesc); - } - - /** - * Get Custom Deserializer - */ - public static org.apache.axis.encoding.Deserializer getDeserializer( - java.lang.String mechType, - java.lang.Class _javaType, - javax.xml.namespace.QName _xmlType) { - return - new org.apache.axis.encoding.ser.BeanDeserializer( - _javaType, _xmlType, typeDesc); - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java deleted file mode 100644 index e09491120..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/Converter.java +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Converter.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package wtp; - -public interface Converter extends java.rmi.Remote { - public float celsiusToFarenheit(float celsius) throws java.rmi.RemoteException; - public float farenheitToCelsius(float farenheit) throws java.rmi.RemoteException; -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java deleted file mode 100644 index 62f100011..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterProxy.java +++ /dev/null @@ -1,55 +0,0 @@ -package wtp; - -public class ConverterProxy implements wtp.Converter { - private String _endpoint = null; - private wtp.Converter converter = null; - - public ConverterProxy() { - _initConverterProxy(); - } - - private void _initConverterProxy() { - try { - converter = (new wtp.ConverterServiceLocator()).getConverter(); - if (converter != null) { - if (_endpoint != null) - ((javax.xml.rpc.Stub)converter)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint); - else - _endpoint = (String)((javax.xml.rpc.Stub)converter)._getProperty("javax.xml.rpc.service.endpoint.address"); - } - - } - catch (javax.xml.rpc.ServiceException serviceException) {} - } - - public String getEndpoint() { - return _endpoint; - } - - public void setEndpoint(String endpoint) { - _endpoint = endpoint; - if (converter != null) - ((javax.xml.rpc.Stub)converter)._setProperty("javax.xml.rpc.service.endpoint.address", _endpoint); - - } - - public wtp.Converter getConverter() { - if (converter == null) - _initConverterProxy(); - return converter; - } - - public float celsiusToFarenheit(float celsius) throws java.rmi.RemoteException{ - if (converter == null) - _initConverterProxy(); - return converter.celsiusToFarenheit(celsius); - } - - public float farenheitToCelsius(float farenheit) throws java.rmi.RemoteException{ - if (converter == null) - _initConverterProxy(); - return converter.farenheitToCelsius(farenheit); - } - - -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java deleted file mode 100644 index 993df7ecc..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterService.java +++ /dev/null @@ -1,16 +0,0 @@ -/** - * ConverterService.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package wtp; - -public interface ConverterService extends javax.xml.rpc.Service { - public java.lang.String getConverterAddress(); - - public wtp.Converter getConverter() throws javax.xml.rpc.ServiceException; - - public wtp.Converter getConverter(java.net.URL portAddress) throws javax.xml.rpc.ServiceException; -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java deleted file mode 100644 index 02fbe6958..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterServiceLocator.java +++ /dev/null @@ -1,142 +0,0 @@ -/** - * ConverterServiceLocator.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package wtp; - -public class ConverterServiceLocator extends org.apache.axis.client.Service implements wtp.ConverterService { - - public ConverterServiceLocator() { - } - - - public ConverterServiceLocator(org.apache.axis.EngineConfiguration config) { - super(config); - } - - public ConverterServiceLocator(java.lang.String wsdlLoc, javax.xml.namespace.QName sName) throws javax.xml.rpc.ServiceException { - super(wsdlLoc, sName); - } - - // Use to get a proxy class for Converter - private java.lang.String Converter_address = "http://localhost:8080/ConverterProj/services/Converter"; - - public java.lang.String getConverterAddress() { - return Converter_address; - } - - // The WSDD service name defaults to the port name. - private java.lang.String ConverterWSDDServiceName = "Converter"; - - public java.lang.String getConverterWSDDServiceName() { - return ConverterWSDDServiceName; - } - - public void setConverterWSDDServiceName(java.lang.String name) { - ConverterWSDDServiceName = name; - } - - public wtp.Converter getConverter() throws javax.xml.rpc.ServiceException { - java.net.URL endpoint; - try { - endpoint = new java.net.URL(Converter_address); - } - catch (java.net.MalformedURLException e) { - throw new javax.xml.rpc.ServiceException(e); - } - return getConverter(endpoint); - } - - public wtp.Converter getConverter(java.net.URL portAddress) throws javax.xml.rpc.ServiceException { - try { - wtp.ConverterSoapBindingStub _stub = new wtp.ConverterSoapBindingStub(portAddress, this); - _stub.setPortName(getConverterWSDDServiceName()); - return _stub; - } - catch (org.apache.axis.AxisFault e) { - return null; - } - } - - public void setConverterEndpointAddress(java.lang.String address) { - Converter_address = address; - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - try { - if (wtp.Converter.class.isAssignableFrom(serviceEndpointInterface)) { - wtp.ConverterSoapBindingStub _stub = new wtp.ConverterSoapBindingStub(new java.net.URL(Converter_address), this); - _stub.setPortName(getConverterWSDDServiceName()); - return _stub; - } - } - catch (java.lang.Throwable t) { - throw new javax.xml.rpc.ServiceException(t); - } - throw new javax.xml.rpc.ServiceException("There is no stub implementation for the interface: " + (serviceEndpointInterface == null ? "null" : serviceEndpointInterface.getName())); - } - - /** - * For the given interface, get the stub implementation. - * If this service has no port for the given interface, - * then ServiceException is thrown. - */ - public java.rmi.Remote getPort(javax.xml.namespace.QName portName, Class serviceEndpointInterface) throws javax.xml.rpc.ServiceException { - if (portName == null) { - return getPort(serviceEndpointInterface); - } - java.lang.String inputPortName = portName.getLocalPart(); - if ("Converter".equals(inputPortName)) { - return getConverter(); - } - else { - java.rmi.Remote _stub = getPort(serviceEndpointInterface); - ((org.apache.axis.client.Stub) _stub).setPortName(portName); - return _stub; - } - } - - public javax.xml.namespace.QName getServiceName() { - return new javax.xml.namespace.QName("http://wtp", "ConverterService"); - } - - private java.util.HashSet ports = null; - - public java.util.Iterator getPorts() { - if (ports == null) { - ports = new java.util.HashSet(); - ports.add(new javax.xml.namespace.QName("http://wtp", "Converter")); - } - return ports.iterator(); - } - - /** - * Set the endpoint address for the specified port name. - */ - public void setEndpointAddress(java.lang.String portName, java.lang.String address) throws javax.xml.rpc.ServiceException { - -if ("Converter".equals(portName)) { - setConverterEndpointAddress(address); - } - else -{ // Unknown Port Name - throw new javax.xml.rpc.ServiceException(" Cannot set Endpoint Address for Unknown Port" + portName); - } - } - - /** - * Set the endpoint address for the specified port name. - */ - public void setEndpointAddress(javax.xml.namespace.QName portName, java.lang.String address) throws javax.xml.rpc.ServiceException { - setEndpointAddress(portName.getLocalPart(), address); - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java deleted file mode 100644 index f6d2c2926..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/data/axisSource2/wtp/ConverterSoapBindingStub.java +++ /dev/null @@ -1,169 +0,0 @@ -/** - * ConverterSoapBindingStub.java - * - * This file was auto-generated from WSDL - * by the Apache Axis 1.2.1 Jun 14, 2005 (09:15:57 EDT) WSDL2Java emitter. - */ - -package wtp; - -public class ConverterSoapBindingStub extends org.apache.axis.client.Stub implements wtp.Converter { - private java.util.Vector cachedSerClasses = new java.util.Vector(); - private java.util.Vector cachedSerQNames = new java.util.Vector(); - private java.util.Vector cachedSerFactories = new java.util.Vector(); - private java.util.Vector cachedDeserFactories = new java.util.Vector(); - - static org.apache.axis.description.OperationDesc [] _operations; - - static { - _operations = new org.apache.axis.description.OperationDesc[2]; - _initOperationDesc1(); - } - - private static void _initOperationDesc1(){ - org.apache.axis.description.OperationDesc oper; - org.apache.axis.description.ParameterDesc param; - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("celsiusToFarenheit"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://wtp", "celsius"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"), float.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float")); - oper.setReturnClass(float.class); - oper.setReturnQName(new javax.xml.namespace.QName("http://wtp", "celsiusToFarenheitReturn")); - oper.setStyle(org.apache.axis.constants.Style.WRAPPED); - oper.setUse(org.apache.axis.constants.Use.LITERAL); - _operations[0] = oper; - - oper = new org.apache.axis.description.OperationDesc(); - oper.setName("farenheitToCelsius"); - param = new org.apache.axis.description.ParameterDesc(new javax.xml.namespace.QName("http://wtp", "farenheit"), org.apache.axis.description.ParameterDesc.IN, new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float"), float.class, false, false); - oper.addParameter(param); - oper.setReturnType(new javax.xml.namespace.QName("http://www.w3.org/2001/XMLSchema", "float")); - oper.setReturnClass(float.class); - oper.setReturnQName(new javax.xml.namespace.QName("http://wtp", "farenheitToCelsiusReturn")); - oper.setStyle(org.apache.axis.constants.Style.WRAPPED); - oper.setUse(org.apache.axis.constants.Use.LITERAL); - _operations[1] = oper; - - } - - public ConverterSoapBindingStub() throws org.apache.axis.AxisFault { - this(null); - } - - public ConverterSoapBindingStub(java.net.URL endpointURL, javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - this(service); - super.cachedEndpoint = endpointURL; - } - - public ConverterSoapBindingStub(javax.xml.rpc.Service service) throws org.apache.axis.AxisFault { - if (service == null) { - super.service = new org.apache.axis.client.Service(); - } else { - super.service = service; - } - ((org.apache.axis.client.Service)super.service).setTypeMappingVersion("1.2"); - } - - protected org.apache.axis.client.Call createCall() throws java.rmi.RemoteException { - try { - org.apache.axis.client.Call _call = super._createCall(); - if (super.maintainSessionSet) { - _call.setMaintainSession(super.maintainSession); - } - if (super.cachedUsername != null) { - _call.setUsername(super.cachedUsername); - } - if (super.cachedPassword != null) { - _call.setPassword(super.cachedPassword); - } - if (super.cachedEndpoint != null) { - _call.setTargetEndpointAddress(super.cachedEndpoint); - } - if (super.cachedTimeout != null) { - _call.setTimeout(super.cachedTimeout); - } - if (super.cachedPortName != null) { - _call.setPortName(super.cachedPortName); - } - java.util.Enumeration keys = super.cachedProperties.keys(); - while (keys.hasMoreElements()) { - java.lang.String key = (java.lang.String) keys.nextElement(); - _call.setProperty(key, super.cachedProperties.get(key)); - } - return _call; - } - catch (java.lang.Throwable _t) { - throw new org.apache.axis.AxisFault("Failure trying to get the Call object", _t); - } - } - - public float celsiusToFarenheit(float celsius) throws java.rmi.RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[0]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setEncodingStyle(null); - _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://wtp", "celsiusToFarenheit")); - - setRequestHeaders(_call); - setAttachments(_call); - try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Float(celsius)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException)_resp; - } - else { - extractAttachments(_call); - try { - return ((java.lang.Float) _resp).floatValue(); - } catch (java.lang.Exception _exception) { - return ((java.lang.Float) org.apache.axis.utils.JavaUtils.convert(_resp, float.class)).floatValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - throw axisFaultException; -} - } - - public float farenheitToCelsius(float farenheit) throws java.rmi.RemoteException { - if (super.cachedEndpoint == null) { - throw new org.apache.axis.NoEndPointException(); - } - org.apache.axis.client.Call _call = createCall(); - _call.setOperation(_operations[1]); - _call.setUseSOAPAction(true); - _call.setSOAPActionURI(""); - _call.setEncodingStyle(null); - _call.setProperty(org.apache.axis.client.Call.SEND_TYPE_ATTR, Boolean.FALSE); - _call.setProperty(org.apache.axis.AxisEngine.PROP_DOMULTIREFS, Boolean.FALSE); - _call.setSOAPVersion(org.apache.axis.soap.SOAPConstants.SOAP11_CONSTANTS); - _call.setOperationName(new javax.xml.namespace.QName("http://wtp", "farenheitToCelsius")); - - setRequestHeaders(_call); - setAttachments(_call); - try { java.lang.Object _resp = _call.invoke(new java.lang.Object[] {new java.lang.Float(farenheit)}); - - if (_resp instanceof java.rmi.RemoteException) { - throw (java.rmi.RemoteException)_resp; - } - else { - extractAttachments(_call); - try { - return ((java.lang.Float) _resp).floatValue(); - } catch (java.lang.Exception _exception) { - return ((java.lang.Float) org.apache.axis.utils.JavaUtils.convert(_resp, float.class)).floatValue(); - } - } - } catch (org.apache.axis.AxisFault axisFaultException) { - throw axisFaultException; -} - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties deleted file mode 100644 index 96ef6c48d..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# yyyymmdd bug Email and other contact information -# -------- -------- ----------------------------------------------------------- -# 20060424 138060 kathy@ca.ibm.com - Kathy Chan -############################################################################### - -# -# Messages in plugin.xml. -# -PLUGIN_NAME=JST Web Services Axis Consumption Core Test -PLUGIN_PROVIDER=Eclipse.org diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java deleted file mode 100644 index 0c7a60bd1..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/unittest/LocatorTests.java +++ /dev/null @@ -1,120 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey - * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey - * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey - *******************************************************************************/ - -package org.eclipse.jst.ws.axis.consumption.core.tests.unittest; - -import java.util.Iterator; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jst.ws.axis.consumption.core.tests.util.JavaFilter; -import org.eclipse.jst.ws.axis.consumption.core.tests.util.StdoutProgressMonitor; -import org.eclipse.jst.ws.axis.consumption.core.tests.util.Util; -import org.eclipse.jst.ws.internal.wsrt.WebServiceJavaClientInfo; -import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder; -import org.eclipse.wst.ws.internal.wsrt.WebServiceClientInfo; - -public class LocatorTests extends TestCase -{ - public static Test suite () - { - return new TestSuite(LocatorTests.class); - } - - public void test_AxisClientLocator () - { - System.out.println("BEGIN test_AxisClientLocator"); - try - { - String[] projectNames = new String[] {"Java1","Java2","Java3"}; - IProject[] projects = new IProject[projectNames.length]; - for (int x=0; x<projectNames.length; x++) - { - projects[x] = ResourcesPlugin.getWorkspace().getRoot().getProject(projectNames[x]); - } - Util.init(); - try - { - for (int i=0; i<projects.length; i++) - { - IJavaProject javaProject = Util.createJavaProject(projectNames[i]); - Util.addRequiredJarsToJavaProject(javaProject); - Util.copyExamplesToJavaProject(javaProject,new JavaFilter()); - } - } - catch (Throwable t) - { - t.printStackTrace(); - fail("Failed to access or create prerequisite projects"); - } - WebServiceFinder finder = WebServiceFinder.instance(); - String[] categoryIds = finder.getWebServiceCategoryIds(); - int n = -1; - IProgressMonitor monitor = new StdoutProgressMonitor(); - for (int i=0; i<categoryIds.length; i++) - { - System.out.println("Category ID = ["+categoryIds[i]+"]"); - if (categoryIds[i].equals("org.eclipse.jst.ws.internal.axis.consumption.core.locator.category.axis")) - { - n = i; - Iterator iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],monitor); - assertFoundClients(iter,6); - iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],projects,monitor); - assertFoundClients(iter,6); - iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],new IProject[] {projects[0]},monitor); - assertFoundClients(iter,2); - iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],new IProject[] {projects[1],projects[2]},monitor); - assertFoundClients(iter,4); - IProject noSuchProject = ResourcesPlugin.getWorkspace().getRoot().getProject("noSuchProject"); - iter = finder.getWebServiceClientsByCategoryId(categoryIds[i],new IProject[] {noSuchProject},monitor); - assertFoundClients(iter,0); - } - } - assertTrue("Axis locator extension missing.",n >= 0); - } - finally - { - System.out.println("ENDED test_AxisClientLocator"); - } - } - - private void assertFoundClients ( Iterator iter, int x ) - { - int p = 0; - while (iter.hasNext()) - { - Object obj = iter.next(); - assertTrue("Finder returned a "+obj.getClass().getName()+" instead of a WebServiceClientInfo.",obj instanceof WebServiceClientInfo); - p++; - WebServiceClientInfo wscInfo = (WebServiceClientInfo)obj; - String proxyClassURL = wscInfo.getImplURL(); - System.out.println("Axis client proxy class = ["+proxyClassURL+"]"); - if (wscInfo instanceof WebServiceJavaClientInfo) - { - WebServiceJavaClientInfo wscJInfo = (WebServiceJavaClientInfo)wscInfo; - assertNotNull("Found an unexpected null IType",wscJInfo.getType()); - System.out.println("Axis client proxy IType = ["+wscJInfo.getType()+"]"); - } - } - assertTrue("Found "+p+" proxies instead of the expected "+x+".",p == x); - } -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java deleted file mode 100644 index ba6c04471..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Filter.java +++ /dev/null @@ -1,21 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey - * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey - *******************************************************************************/ - -package org.eclipse.jst.ws.axis.consumption.core.tests.util; - -public interface Filter -{ - public boolean accept ( Object object ); -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java deleted file mode 100644 index f76206f47..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/JavaFilter.java +++ /dev/null @@ -1,25 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey - * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey - *******************************************************************************/ - -package org.eclipse.jst.ws.axis.consumption.core.tests.util; - -public class JavaFilter implements Filter { - - public boolean accept ( Object object ) - { - return object.toString().endsWith(".java"); - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java deleted file mode 100644 index b188b17e0..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/StdoutProgressMonitor.java +++ /dev/null @@ -1,47 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey - *******************************************************************************/ - -package org.eclipse.jst.ws.axis.consumption.core.tests.util; - -import org.eclipse.core.runtime.NullProgressMonitor; - -public class StdoutProgressMonitor extends NullProgressMonitor -{ - - public void beginTask(String name, int totalWork) - { - System.out.println("[Progress] "+name+", "+totalWork+" unit(s) remaining)."); - } - - public void done() - { - System.out.println("[Progress] Done."); - } - - public void setTaskName(String name) - { - System.out.println("[Progress] "+name); - } - - public void subTask(String name) - { - System.out.println("[Progress] "+name); - } - - public void worked(int work) - { - System.out.println("[Progress] "+work+" unit(s) completed."); - } - -} diff --git a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java b/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java deleted file mode 100644 index e79026830..000000000 --- a/tests/org.eclipse.jst.ws.axis.consumption.core.tests/tests/org/eclipse/jst/ws/axis/consumption/core/tests/util/Util.java +++ /dev/null @@ -1,259 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey - * 20060711 147862 cbrealey@ca.ibm.com - Chris Brealey - * 20060711 147864 cbrealey@ca.ibm.com - Chris Brealey - * 20061211 162288 makandre@ca.ibm.com - Andrew Mak, workspace paths with spaces break Java Editor Launch - *******************************************************************************/ - -package org.eclipse.jst.ws.axis.consumption.core.tests.util; - -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.UnsupportedEncodingException; -import java.net.URI; -import java.net.URISyntaxException; -import java.net.URL; -import java.util.Enumeration; -import java.util.LinkedList; -import java.util.List; - -import org.eclipse.core.resources.ICommand; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IProjectDescription; -import org.eclipse.core.resources.IWorkspace; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.FileLocator; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder; -import org.osgi.framework.Bundle; - -public class Util -{ - /** - * Initializes this testsuite. - */ - public static void init () - { - String workspaceOSPath = ResourcesPlugin.getWorkspace().getRoot().getLocation().toString(); - System.out.println("Workspace = ["+workspaceOSPath+"]"); - } - - /** - * Create a Java project if it doesn't already exist. - * @param name The name of the project to create. - * @throws CoreException If the project could not be created. - */ - public static IJavaProject createJavaProject ( String name ) - throws CoreException - { - IWorkspace workspace = ResourcesPlugin.getWorkspace(); - IWorkspaceRoot root = workspace.getRoot(); - IProject project = root.getProject(name); - if (!project.exists()) - { - System.out.println("Creating project ["+name+"]"); - project.create(null); - project.open(null); - IProjectDescription desc = project.getDescription(); - desc.setNatureIds(new String[] {JavaCore.NATURE_ID}); - ICommand cmd = desc.newCommand(); - cmd.setBuilderName(JavaCore.BUILDER_ID); - desc.setBuildSpec(new ICommand[] {cmd}); - project.setDescription(desc,null); - } - System.out.println("Creating Java project ["+name+"]"); - IJavaProject javaProject = JavaCore.create(project); - javaProject.open(null); - return javaProject; - } - - /** - * Adds Axis jars and the JRE to the classpath of the given project. - * @param javaProject The project to add axis.jar to. - * @throws JavaModelException If the jar could not be added. - */ - public static void addRequiredJarsToJavaProject ( IJavaProject javaProject ) - throws CoreException - { - // Get the current classpath as a list. - IClasspathEntry[] classpath = javaProject.getRawClasspath(); - List list = new LinkedList(java.util.Arrays.asList(classpath)); - - // Add the JRE to the list. - IClasspathEntry con = JavaCore.newContainerEntry(new Path("org.eclipse.jdt.launching.JRE_CONTAINER")); - list.add(con); - - // Add the Axis jars to the list. - String[] jars = new String[] { - "org.apache.axis","axis.jar", - "org.apache.axis","commons-discovery-0.2.jar", - "org.apache.commons_logging","commons-logging-1.0.4.jar", - "org.apache.axis","jaxrpc.jar", - "org.apache.jakarta_log4j","log4j-1.2.8.jar", - "org.apache.axis","saaj.jar", - "org.apache.axis","wsdl4j-1.5.1.jar" - }; - - for (int i=0; i<jars.length; i+=2) - { - IPath jar = getAxisPluginJarPath(jars[i],jars[i+1]); - System.out.println("Adding jar ["+jar.toString()+"]"); - IClasspathEntry jarEntry = JavaCore.newLibraryEntry(jar,null,null); - list.add(jarEntry); - } - - // Update the current classpath from the list. - IClasspathEntry[] newClasspath = (IClasspathEntry[])list.toArray(new IClasspathEntry[0]); - javaProject.setRawClasspath(newClasspath,null); - } - - /** - * Returns the filesystem path to the named jar in the Axis plugin. - * @return The filesystem path to the named jar in the Axis plugin. - * @throws CoreException If the path could not be computed. - */ - public static IPath getAxisPluginJarPath ( String pluginName, String jarName ) - throws CoreException - { - Bundle bundle = Platform.getBundle(pluginName); - if (bundle == null) - { - throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin org.apache.axis",null)); - } - URL axisURL = FileLocator.find(bundle,new Path("lib/"+jarName),null); - try - { - URL localAxisURL = FileLocator.toFileURL(axisURL); - File file = new File(new URI(URIEncoder.encode(localAxisURL.toString(), "UTF-8"))); - return new Path(file.toString()); - } - catch (UnsupportedEncodingException uee) { - throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to encode jar path for plugin org.apache.axis",uee)); - } - catch (IOException ioe) - { - throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin org.apache.axis",ioe)); - } - catch (URISyntaxException use) - { - throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin org.apache.axis",use)); - } - } - - /** - * Copies examples to the given Java project. - * @param javaProject The project to copy the examples to. - */ - public static void copyExamplesToJavaProject ( IJavaProject javaProject, Filter filter ) - throws CoreException - { - IProject project = javaProject.getProject(); - String sourcePath = project.getName(); - copyExample("org.eclipse.jst.ws.axis.consumption.core.tests","data/axisSource1",sourcePath,filter); - copyExample("org.eclipse.jst.ws.axis.consumption.core.tests","data/axisSource2",sourcePath,filter); - project.build(IncrementalProjectBuilder.FULL_BUILD,null); - try - { - System.out.println("Waiting for build to complete"); - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,null); - } - catch (Throwable t) - { - //Do nothing. - } - } - - /** - * Recursively copies files from a plugin to the workspace. - * @param sourcePlugin The plugin to copy from. - * @param sourceRoot The plugin-related path to copy from. - * @param targetWorkspacePath The workspace path to copy to. - */ - public static void copyExample ( String sourcePlugin, String sourceRoot, String targetWorkspacePath, Filter filter ) - throws CoreException - { - Bundle bundle = Platform.getBundle(sourcePlugin); - if (bundle == null) - { - throw new CoreException(new Status(IStatus.ERROR,"",0,"Unable to locate plugin "+sourcePlugin,null)); - } - Enumeration e = bundle.getEntryPaths(sourceRoot); - while (e.hasMoreElements()) - { - String path = e.nextElement().toString(); - System.out.println("Bundle path = ["+path+"]"); - copyExampleFile(bundle,path,new Path(sourceRoot).segmentCount(),targetWorkspacePath,filter); - } - } - - public static void copyExampleFile ( Bundle bundle, String path, int offset, String targetWorkspacePath, Filter filter ) - throws CoreException - { - IPath reducedPath = new Path(path).removeFirstSegments(offset); - IPath targetPath = new Path(targetWorkspacePath).append(reducedPath); - if (path.endsWith("/")) - { - System.out.println("Folder = ["+path+"] Target = ["+targetPath+"]"); - IFolder folder = ResourcesPlugin.getWorkspace().getRoot().getFolder(targetPath); - if (!folder.exists()) - { - folder.create(true,true,null); - } - Enumeration e = bundle.getEntryPaths(path); - while (e.hasMoreElements()) - { - String subpath = e.nextElement().toString(); - copyExampleFile(bundle,subpath,offset,targetWorkspacePath,filter); - } - } - else - { - System.out.println("File = ["+path+"] Target = ["+targetPath+"]"); - if (filter.accept(path)) - { - System.out.println("Copied ["+path+"]"); - URL url = bundle.getEntry(path); - copyFile(url,targetPath); - } - } - } - - public static void copyFile ( URL url, IPath targetPath ) - throws CoreException - { - IFile file = ResourcesPlugin.getWorkspace().getRoot().getFile(targetPath); - try - { - InputStream stream = url.openStream(); - file.create(stream,true,null); - } - catch (IOException ioe) - { - throw new CoreException(new Status(IStatus.ERROR,"",0,"IOException copying file",ioe)); - } - } -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/.classpath b/tests/org.eclipse.jst.ws.tests.performance/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore b/tests/org.eclipse.jst.ws.tests.performance/.cvsignore deleted file mode 100644 index 434810902..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -axisPerfmsr.jar diff --git a/tests/org.eclipse.jst.ws.tests.performance/.project b/tests/org.eclipse.jst.ws.tests.performance/.project deleted file mode 100644 index 088e1a830..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.ws.tests.performance</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 515fbd762..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,57 +0,0 @@ -#Mon Jan 30 10:36:51 EST 2006 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 1463cd8d6..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Mon Jan 30 10:40:54 EST 2006 -compilers.p.deprecated=1 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=1 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=1 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF deleted file mode 100644 index 54ca3a88e..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.jst.ws.tests.performance -Bundle-Version: 1.0.100 -Bundle-ClassPath: axisPerfmsr.jar -Bundle-Activator: org.eclipse.jst.ws.tests.performance.plugin.PerformancePlugin -Bundle-Vendor: %PLUGIN_PROVIDER -Bundle-Localization: plugin -Export-Package: org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr, - org.eclipse.jst.ws.tests.performance, - org.eclipse.jst.ws.tests.performance.plugin, - org.eclipse.jst.ws.tests.performance.util -Require-Bundle: org.eclipse.jst.ws, - org.eclipse.jst.j2ee.core, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.eclipse.ui, - org.eclipse.wst.server.core, - org.junit, - org.eclipse.jst.ws.tests, - org.eclipse.jem.util, - org.eclipse.test.performance, - org.eclipse.wst.command.env.ui, - org.eclipse.wst.command.env.core, - org.eclipse.wst.common.environment, - org.eclipse.wst.common.modulecore, - org.eclipse.emf.ecore, - org.eclipse.jst.ws.consumption, - org.eclipse.wst.common.frameworks -Eclipse-LazyStart: true diff --git a/tests/org.eclipse.jst.ws.tests.performance/about.html b/tests/org.eclipse.jst.ws.tests.performance/about.html deleted file mode 100644 index 4ec598958..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>May 2, 2006</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/tests/org.eclipse.jst.ws.tests.performance/build.properties b/tests/org.eclipse.jst.ws.tests.performance/build.properties deleted file mode 100644 index 99ea6b51a..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/build.properties +++ /dev/null @@ -1,8 +0,0 @@ -bin.includes = plugin.xml,\ - test.xml,\ - axisPerfmsr.jar,\ - META-INF/,\ - about.html -jars.compile.order = axisPerfmsr.jar -source.axisPerfmsr.jar = src/ -output.axisPerfmsr.jar = bin/ diff --git a/tests/org.eclipse.jst.ws.tests.performance/plugin.properties b/tests/org.eclipse.jst.ws.tests.performance/plugin.properties deleted file mode 100644 index 99d89bbad..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# yyyymmdd bug Email and other contact information -# -------- -------- ----------------------------------------------------------- -# 20060424 138060 kathy@ca.ibm.com - Kathy Chan -############################################################################### - -# -# Messages in plugin.xml. -# -PLUGIN_NAME=JST Web Services Performance Plug-in -PLUGIN_PROVIDER=Eclipse.org diff --git a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml b/tests/org.eclipse.jst.ws.tests.performance/plugin.xml deleted file mode 100644 index 7bf65fb5f..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - -</plugin> diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java deleted file mode 100644 index 2e1340c33..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrBUJavaAxisTC50.java +++ /dev/null @@ -1,160 +0,0 @@ -package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test; -import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.jst.ws.tests.util.ScenarioConstants; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; - -/** - * Bottom up performance scenario with Axis and Tomcat v5.0 - */ -public final class PerfmsrBUJavaAxisTC50 extends WSWizardTomcat50Test { - // Constants - private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS; - private final String PROJECT_NAME = WSJUnitConstants.BU_PROJECT_NAME; - - private IFile sourceFile_; - - /** - * Sets up the input data; - * - create project(s), - * - copy resources to workspace - */ - protected void installInputData() throws Exception - { - - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IPath destPath = ResourceUtils.getJavaSourceLocation(webProject); - IFolder folder = (IFolder)ResourceUtils.findResource(destPath); - JUnitUtils.copyTestData("BUJava/src",folder,env_, null); - sourceFile_ = folder.getFile(new Path("foo/Echo.java")); - // Ensure that Echo.class is built in: - // <Web Project>/WebContent/WEB-INF/classes/foo/Echo.class - JUnitUtils.syncBuildProject(webProject,env_, null); - //assertTrue(JUnitUtils.getClassesFolderForWebProject(WEB_PROJECT_NAME).getFile(new Path("foo/Echo.class")).exists()); - - - } - - protected void createProjects() throws Exception{ - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - if (webProject==null || !webProject.exists()){ - createWebModule(PROJECT_NAME, PROJECT_NAME,J2EEVersionConstants.J2EE_1_4_ID); - } - } - - private void createWebModule(String projectNm, String componentName, int j2eeVersion){ - - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(j2eeVersion).toString()); - cmc.setModuleName(componentName); - cmc.setModuleType(CreateModuleCommand.WEB); - cmc.setProjectName(projectNm); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.setServerInstanceId(server_.getId()); - cmc.execute(null, null ); - - System.out.println("Done creating Web Project, "+projectNm); - - } - - - /** - * Set the persistent server runtime context preferences - */ - protected void initJ2EEWSRuntimeServerDefaults() throws Exception - { - // Set default preferences for Axis and Tomcat 5.0 - JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50); - } - - /** - * Set the initial selection - */ - protected void initInitialSelection() throws Exception - { - initialSelection_ = new StructuredSelection(sourceFile_); - } - - /** - * Launches the pop-up command to initiate the scenario - * @throws Exception - */ - public void testBUJavaAxisTC50() throws Exception - { - IStatus status = Status.OK_STATUS; - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - JUnitUtils.disableWSIDialog(webProject); - - Performance perf= Performance.getDefault(); - PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this)); - try { - - performanceMeter.start(); - PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_BOTTOM_UP,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_); - performanceMeter.stop(); - - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - } - finally { - if (performanceMeter==null) - performanceMeter.dispose(); - } - - if (status.getSeverity() == Status.OK) - verifyOutput(); - else - throw new Exception(status.getException()); - - } - - /** - * Verify the scenario completed successfully - * @throws Exception - */ - private final void verifyOutput() throws Exception - { - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - - IFolder wsdlFolder = webContentFolder.getFolder("wsdl"); - assertTrue(wsdlFolder.exists()); - assertTrue(wsdlFolder.members().length > 0); - assertTrue(webContentFolder.getFolder("wsdl").members().length > 0); - - //TODO Check if wsdd contains new Web service - //TODO Check if Web serivce can be invoked by a client - } - - /** - * Clear workspace if necessary - */ - protected void deleteInputData() throws Exception - { - // Remove the EAR from the server. - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - //JUnitUtils.removeModuleFromServer(server_,webProject,env_); - - // Delete the Web project. - webProject.delete(true,true, null); - assertFalse(webProject.exists()); - - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java deleted file mode 100644 index c8fae0745..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrClientAxisTC50.java +++ /dev/null @@ -1,148 +0,0 @@ -package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test; -import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.jst.ws.tests.util.ScenarioConstants; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; - -/** - * Client performance scenario with Axis and Tomcat v5.0 - */ -public class PerfmsrClientAxisTC50 extends WSWizardTomcat50Test { - - private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS; - - private final String CLIENT_PROJECT_NAME = WSJUnitConstants.CLIENT_PROJECT_NAME; - - private IFile sourceFile_; - - protected void createProjects() throws Exception{ - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - if (!webProject.exists()){ - createWebModule(CLIENT_PROJECT_NAME, CLIENT_PROJECT_NAME,J2EEVersionConstants.J2EE_1_4_ID); - } - } - - private void createWebModule(String projectNm, String componentName, int j2eeVersion){ - - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(j2eeVersion).toString()); - cmc.setModuleName(componentName); - cmc.setModuleType(CreateModuleCommand.WEB); - cmc.setProjectName(projectNm); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.setServerInstanceId(server_.getId()); - cmc.execute(null, null ); - - } - - /** - * Sets up the input data; - * - create project(s), - * - copy resources to workspace - */ - protected void installInputData() throws Exception { - - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - JUnitUtils.copyTestData("TDJava",destFolder,env_, null); - sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); - JUnitUtils.syncBuildProject(webProject,env_, null); - - } - - /** - * Set the persistent server runtime context preferences - */ - protected void initJ2EEWSRuntimeServerDefaults() throws Exception { - // Set default preferences for Axis and Tomcat 5.0 - JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50); - } - - /** - * Set the initial selection - */ - protected void initInitialSelection() throws Exception { - initialSelection_ = new StructuredSelection(sourceFile_); - } - - /** - * Launches the pop-up command to initiate the scenario - * @throws Exception - */ - public void testClientAxisTC50() throws Exception - { - IStatus status = Status.OK_STATUS; - - JUnitUtils.enableProxyGeneration(true); - JUnitUtils.enableOverwrite(true); - Performance perf= Performance.getDefault(); - PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this)); - try { - - performanceMeter.start(); - PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_CLIENT,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_); - performanceMeter.stop(); - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - } - finally { - if (performanceMeter==null) - performanceMeter.dispose(); - } - - if (status.getSeverity() == Status.OK) { - verifyOutput(); - } else { - throw new Exception(status.getException()); - } - - } - - /** - * Verify the scenario completed succesfully - * @throws Exception - */ - private final void verifyOutput() throws Exception { - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - - IPath destPath = ResourceUtils.getJavaSourceLocation(webProject); - IFolder srcFolder = (IFolder)ResourceUtils.findResource(destPath); - - //IFolder srcFolder = JUnitUtils.getSourceFolderForWebProject(CLIENT_PROJECT_NAME); - IFolder folder = srcFolder.getFolder("foo"); - assertTrue(folder.exists()); - assertTrue(folder.members().length > 0); - - //TODO Check that the client runs - - } - - /** - * Remove workspace if necessary - */ - protected void deleteInputData() throws Exception { - - // Delete the Web project. - IProject webProject = ProjectUtilities.getProject(CLIENT_PROJECT_NAME); - webProject.delete(true,true, null); - - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java deleted file mode 100644 index 07bf32e4e..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/axis/tomcat/v50/perfmsr/PerfmsrTDJavaAxisTC50.java +++ /dev/null @@ -1,141 +0,0 @@ -package org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.StructuredSelection; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.WSWizardTomcat50Test; -import org.eclipse.jst.ws.tests.performance.util.PerformanceJUnitUtils; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.jst.ws.tests.util.ScenarioConstants; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; - -/** - * Top down performance scenario with Axis and Tomcat v5.0 - */ -public class PerfmsrTDJavaAxisTC50 extends WSWizardTomcat50Test { - - private final String WS_RUNTIMEID_AXIS = WSJUnitConstants.WS_RUNTIMEID_AXIS; - - private final String PROJECT_NAME = WSJUnitConstants.TD_PROJECT_NAME; - - private IFile sourceFile_; - - protected void createProjects() throws Exception{ - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - if (!webProject.exists()){ - createWebModule(PROJECT_NAME, PROJECT_NAME,J2EEVersionConstants.J2EE_1_4_ID); - } - } - - private void createWebModule(String projectNm, String componentName, int j2eeVersion){ - - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(j2eeVersion).toString()); - cmc.setModuleName(componentName); - cmc.setModuleType(CreateModuleCommand.WEB); - cmc.setProjectName(projectNm); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.setServerInstanceId(server_.getId()); - cmc.execute(null, null ); - - System.out.println("Done creating Web Project, "+projectNm); - - } - - /** - * Sets up the input data; - * - create project(s), - * - copy resources to workspace - */ - protected void installInputData() throws Exception { - - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder destFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - JUnitUtils.copyTestData("TDJava",destFolder,env_, null); - sourceFile_ = destFolder.getFile(new Path("Echo.wsdl")); - JUnitUtils.syncBuildProject(webProject,env_, null); - } - - /** - * Set the persistent server runtime context preferences - */ - protected void initJ2EEWSRuntimeServerDefaults() throws Exception { - // Set default preferences for Axis and Tomcat v5.0 server - JUnitUtils.setWSRuntimeServer(WS_RUNTIMEID_AXIS, SERVERTYPEID_TC50); - } - - /** - * Set the initial selection - */ - protected void initInitialSelection() throws Exception { - initialSelection_ = new StructuredSelection(sourceFile_); - - } - - /** - * Launches the pop-up command to initiate the scenario - * @throws Exception - */ - public void testTDJavaAxisTC50() throws Exception { - - IStatus status = Status.OK_STATUS; - Performance perf= Performance.getDefault(); - PerformanceMeter performanceMeter= perf.createPerformanceMeter(perf.getDefaultScenarioId(this)); - try { - - performanceMeter.start(); - PerformanceJUnitUtils.launchCreationWizard(ScenarioConstants.WIZARDID_TOP_DOWN,ScenarioConstants.OBJECT_CLASS_ID_IFILE,initialSelection_); - performanceMeter.stop(); - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - } - finally { - if (performanceMeter==null) - performanceMeter.dispose(); - } - if (status.getSeverity() == Status.OK) - verifyOutput(); - else - throw new Exception(status.getException()); - - } - - /** - * Verify the scenario completed successfully - * @throws Exception - */ - private final void verifyOutput() throws Exception - { - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - IFolder webContentFolder = (IFolder)J2EEUtils.getWebContentContainer(webProject); - - - IFolder wsdlFolder = webContentFolder.getFolder("wsdl"); - assertTrue(wsdlFolder.exists()); - assertTrue(wsdlFolder.members().length > 0); - - //TODO Verify that wsdd contains this Web service - //TODO Verify that the service can be invoked by a client - } - - /** - * Clear workspace if required - */ - protected void deleteInputData() throws Exception { - // Delete the Web project. - IProject webProject = ProjectUtilities.getProject(PROJECT_NAME); - webProject.delete(true,true,null); - - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java deleted file mode 100644 index 17010224f..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/AllPerformanceTests.java +++ /dev/null @@ -1,32 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.performance; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50; -import org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50; - -public class AllPerformanceTests { - public static Test suite() { - - // TODO: Create a test suite - TestSuite suite = new TestSuite("Test for org.eclipse.jst.ws.tests.performance"); - //$JUnit-BEGIN$ - suite.addTestSuite(PerfmsrBUJavaAxisTC50.class); - suite.addTestSuite(PerfmsrTDJavaAxisTC50.class); - suite.addTestSuite(PerfmsrClientAxisTC50.class); - //$JUnit-END$ - return suite; - } -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java deleted file mode 100644 index 31f60773a..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/plugin/PerformancePlugin.java +++ /dev/null @@ -1,71 +0,0 @@ -package org.eclipse.jst.ws.tests.performance.plugin; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.ui.plugin.AbstractUIPlugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class PerformancePlugin extends AbstractUIPlugin { - //The shared instance. - private static PerformancePlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public PerformancePlugin() { - super(); - plugin = this; - try { - resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.internal.test.performance.PerformancePlugin"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - } - - /** - * Returns the shared instance. - */ - public static PerformancePlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = PerformancePlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - return resourceBundle; - } -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java deleted file mode 100644 index f48f1a3a4..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/EclipsePerformanceLog.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.eclipse.jst.ws.tests.performance.util; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.test.performance.Performance; -import org.eclipse.test.performance.PerformanceMeter; -import org.eclipse.wst.common.environment.ILog; - - -public class EclipsePerformanceLog implements ILog { - - private boolean runState = false; - Performance perf = null; - PerformanceMeter performanceMeter= null; - - public boolean isEnabled() { - // TODO Auto-generated method stub - return false; - } - - public boolean isEnabled(String option) { - // TODO Auto-generated method stub - return false; - } - - public void log(int severity, int messageNum, Object caller, String method, Throwable throwable) { - // TODO Auto-generated method stub - - } - - public void log(int severity, String option, int messageNum, Object caller, String method, Throwable throwable) { - // TODO Auto-generated method stub - - } - - public void log(int severity, int messageNum, Object caller, String method, IStatus status) { - // TODO Auto-generated method stub - - } - - public void log(int severity, String option, int messageNum, Object caller, String method, IStatus status) { - // TODO Auto-generated method stub - - } - - public void log(int severity, int messageNum, Object caller, String method, Object object) { - // TODO Auto-generated method stub - - } - - public void log(int severity, String option, int messageNum, Object caller, String method, Object object) { - - if (method.equals("runCommand")) { - - try { - if (!runState) { - // begin performance recording - perf = Performance.getDefault(); - performanceMeter = perf.createPerformanceMeter(((String)object).toString()); - performanceMeter.start(); - runState = true; - } - else { - // end performance recording - performanceMeter.stop(); - performanceMeter.commit(); - perf.assertPerformance(performanceMeter); - performanceMeter.dispose(); - runState = false; - } - } - catch(Exception e) { - // handle exception - } - } - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java b/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java deleted file mode 100644 index a896dc79a..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/src/org/eclipse/jst/ws/tests/performance/util/PerformanceJUnitUtils.java +++ /dev/null @@ -1,49 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.performance.util; - -import org.eclipse.jface.dialogs.ProgressMonitorDialog; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.tests.util.DynamicPopupJUnitWizard; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.common.environment.IStatusHandler; - - -public class PerformanceJUnitUtils { - - private static void launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - IStatusHandler statusHandler = new EclipseStatusHandler(); - - DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler); - wizard.setInitialData(wizardId); - ProgressMonitorDialog monitor = new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); - try { - wizard.runHeadLess(initialSelection, monitor); - } - catch (Exception e){ - e.printStackTrace(); - } - - } - - public static void launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection); - } - - public static void launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection); - } - -} diff --git a/tests/org.eclipse.jst.ws.tests.performance/test.xml b/tests/org.eclipse.jst.ws.tests.performance/test.xml deleted file mode 100644 index 183b4ea2d..000000000 --- a/tests/org.eclipse.jst.ws.tests.performance/test.xml +++ /dev/null @@ -1,189 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="performance" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.jst.ws.tests.performance"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="perf-tests-file" value="${testDir}/performance-tests.xml"/> - <property name="workspace" value="${eclipse-home}/workspace_ws_performance"/> - <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <delete dir="${workspace}" quiet="true"/> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="performance_suite"> - - <!-- Iteration 1 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <!-- Iteration 2 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <!-- Iteration 3 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <!-- Iteration 4 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <!-- Iteration 5 --> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrBUJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrClientAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - <delete dir="${workspace}" quiet="true"/> - <ant target="ui-test" antfile="${perf-tests-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${workspace}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.axis.tomcat.v50.perfmsr.PerfmsrTDJavaAxisTC50" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <delete dir="${workspace}" quiet="true"/> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="performance" depends="init,performance_suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.jst.ws.tests.performance*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project> diff --git a/tests/org.eclipse.jst.ws.tests/.classpath b/tests/org.eclipse.jst.ws.tests/.classpath deleted file mode 100644 index 9f4b4d1d5..000000000 --- a/tests/org.eclipse.jst.ws.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="tests"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.jst.ws.tests/.cvsignore b/tests/org.eclipse.jst.ws.tests/.cvsignore deleted file mode 100644 index 57763eb9b..000000000 --- a/tests/org.eclipse.jst.ws.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -tests.jar diff --git a/tests/org.eclipse.jst.ws.tests/.project b/tests/org.eclipse.jst.ws.tests/.project deleted file mode 100644 index fe80d54e4..000000000 --- a/tests/org.eclipse.jst.ws.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.jst.ws.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 8f43d8c78..000000000 --- a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,57 +0,0 @@ -#Mon Jan 30 10:36:41 EST 2006 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 0ea2a1a41..000000000 --- a/tests/org.eclipse.jst.ws.tests/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,12 +0,0 @@ -#Mon Jan 30 10:40:58 EST 2006 -compilers.p.deprecated=1 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=1 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=1 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF deleted file mode 100644 index db7001efd..000000000 --- a/tests/org.eclipse.jst.ws.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,42 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.jst.ws.tests -Bundle-Version: 1.0.100 -Bundle-ClassPath: tests.jar -Bundle-Activator: org.eclipse.jst.ws.tests.plugin.TestsPlugin -Bundle-Vendor: %PLUGIN_PROVIDER -Bundle-Localization: plugin -Export-Package: org.eclipse.jst.ws.tests, - org.eclipse.jst.ws.tests.axis.tomcat.v50, - org.eclipse.jst.ws.tests.plugin, - org.eclipse.jst.ws.tests.unittest, - org.eclipse.jst.ws.tests.util -Require-Bundle: org.eclipse.jst.ws.consumption.ui, - org.eclipse.jst.ws.consumption, - org.eclipse.jst.ws, - org.eclipse.wst.command.env.core, - org.eclipse.wst.command.env.ui, - org.eclipse.wst.command.env, - org.eclipse.jst.j2ee.core, - org.eclipse.jst.j2ee, - org.eclipse.jst.j2ee.web, - org.eclipse.wst.common.frameworks, - org.eclipse.core.runtime, - org.eclipse.core.resources, - org.junit, - org.eclipse.wst.ws.ui, - org.eclipse.ui, - org.eclipse.debug.core, - org.eclipse.wst.server.core, - org.eclipse.jem.util, - org.eclipse.wst.ws, - org.eclipse.wst.common.environment, - org.eclipse.wst.common.tests, - org.eclipse.emf.ecore, - org.eclipse.jst.server.core, - org.eclipse.jdt.launching, - org.eclipse.jdt.debug.ui, - org.eclipse.jst.server.tomcat.core, - org.eclipse.wst.common.project.facet.core -Eclipse-LazyStart: true diff --git a/tests/org.eclipse.jst.ws.tests/about.html b/tests/org.eclipse.jst.ws.tests/about.html deleted file mode 100644 index 4ec598958..000000000 --- a/tests/org.eclipse.jst.ws.tests/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>May 2, 2006</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/tests/org.eclipse.jst.ws.tests/build.properties b/tests/org.eclipse.jst.ws.tests/build.properties deleted file mode 100644 index f64a07bf5..000000000 --- a/tests/org.eclipse.jst.ws.tests/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -bin.includes = data/,\ - plugin.xml,\ - readme.txt,\ - tests.jar,\ - META-INF/,\ - test.xml,\ - about.html -jars.compile.order = tests.jar -source.tests.jar = tests/ -output.tests.jar = bin/ diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp b/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp deleted file mode 100644 index 7b0e3b344..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/BUJava/client/EchoProxyTest.jsp +++ /dev/null @@ -1,38 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.io.*" %> -<jsp:useBean id="echoProxy" class="foo.EchoProxy" scope="request"/> -<html> -<%@ include file = "/outputFilePath.jspf" %> -<% - // HTTP/POST parameter: - // testInput - the String argument to call the proxy with. - String testInput = request.getParameter("testInput"); - - // Execute the Web service. - String result = echoProxy.echoString(testInput); - - // Write the result to the outputFilePath. - PrintWriter pw = null; - try - { - pw = new PrintWriter(new FileOutputStream(outputFilePath)); - pw.print(result); - pw.flush(); - } - catch (Exception e) - { - } - finally - { - if (pw != null) - pw.close(); - } -%> -</body> -<p> -testInput: <%=testInput%> -<p> -outputFilePath: <%=outputFilePath%> -<p> -The result is <%=result%> -</body> -</html>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java b/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java deleted file mode 100644 index 4e893d2a5..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/BUJava/src/foo/Echo.java +++ /dev/null @@ -1,9 +0,0 @@ -package foo; - -public class Echo -{ - public String echoString(String input) - { - return input; - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl b/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl deleted file mode 100644 index 46df32f3d..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/TDJava/Echo.wsdl +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions targetNamespace="http://foo" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsi="http://ws-i.org/profiles/basic/1.1/xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <wsdl:types> - <schema targetNamespace="http://foo" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:impl="http://foo" xmlns:intf="http://foo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <element name="echoStringResponse"> - <complexType> - <sequence> - <element name="echoStringReturn" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - <element name="echoString"> - <complexType> - <sequence> - <element name="input" nillable="true" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="echoStringResponse"> - - <wsdl:part element="impl:echoStringResponse" name="parameters"/> - - </wsdl:message> - - <wsdl:message name="echoStringRequest"> - - <wsdl:part element="impl:echoString" name="parameters"/> - - </wsdl:message> - - <wsdl:portType name="Echo"> - - <wsdl:operation name="echoString"> - - <wsdl:input message="impl:echoStringRequest" name="echoStringRequest"/> - - <wsdl:output message="impl:echoStringResponse" name="echoStringResponse"/> - - </wsdl:operation> - - </wsdl:portType> - - <wsdl:binding name="EchoSoapBinding" type="impl:Echo"> - - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - - <wsdl:operation name="echoString"> - - <wsdlsoap:operation soapAction=""/> - - <wsdl:input name="echoStringRequest"> - - <wsdlsoap:body use="literal"/> - - </wsdl:input> - - <wsdl:output name="echoStringResponse"> - - <wsdlsoap:body use="literal"/> - - </wsdl:output> - - </wsdl:operation> - - </wsdl:binding> - - <wsdl:service name="EchoService"> - - <wsdl:port binding="impl:EchoSoapBinding" name="Echo"> - - <wsdlsoap:address location="http://localhost:9080/TestWeb/services/Echo"/> - - </wsdl:port> - - </wsdl:service> - -</wsdl:definitions> diff --git a/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip Binary files differdeleted file mode 100644 index f5d81f9d2..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/WSPerfProjects.zip +++ /dev/null diff --git a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip b/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip Binary files differdeleted file mode 100644 index 8f2e9eb85..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/WSTestProjects.zip +++ /dev/null diff --git a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf b/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf deleted file mode 100644 index c8a7aec67..000000000 --- a/tests/org.eclipse.jst.ws.tests/data/webclient/outputFilePath.jspf +++ /dev/null @@ -1,6 +0,0 @@ -<head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -</head> -<% - String outputFilePath = request.getParameter("outputFilePath"); -%>
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/plugin.properties b/tests/org.eclipse.jst.ws.tests/plugin.properties deleted file mode 100644 index 6f05835fc..000000000 --- a/tests/org.eclipse.jst.ws.tests/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# yyyymmdd bug Email and other contact information -# -------- -------- ----------------------------------------------------------- -# 20060424 138060 kathy@ca.ibm.com - Kathy Chan -############################################################################### - -# -# Messages in plugin.xml. -# -PLUGIN_NAME=Java Web Services Tools Tests -PLUGIN_PROVIDER=Eclipse.org diff --git a/tests/org.eclipse.jst.ws.tests/plugin.xml b/tests/org.eclipse.jst.ws.tests/plugin.xml deleted file mode 100644 index 7bf65fb5f..000000000 --- a/tests/org.eclipse.jst.ws.tests/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin> - - -</plugin> diff --git a/tests/org.eclipse.jst.ws.tests/readme.txt b/tests/org.eclipse.jst.ws.tests/readme.txt deleted file mode 100644 index 832954656..000000000 --- a/tests/org.eclipse.jst.ws.tests/readme.txt +++ /dev/null @@ -1,5 +0,0 @@ -The arguments to be passed in are: - --Dorg.eclipse.jst.server.tomcat.50=E:\\Tomcat\\Tomcat5.0 - -, where "org.eclipse.jst.server.tomcat.50" is the install directory of your Tomcat v5.0 server. diff --git a/tests/org.eclipse.jst.ws.tests/test.xml b/tests/org.eclipse.jst.ws.tests/test.xml deleted file mode 100644 index 57e4c5833..000000000 --- a/tests/org.eclipse.jst.ws.tests/test.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.jst.ws.tests"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org*.xml"/> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="jst-ws-folder" value="${eclipse-home}/jst_ws_folder"/> - <delete dir="${jst-folder}" quiet="true"/> - <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${jst-ws-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.jst.ws.tests.unittest.AllWSJUnitTests" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - <property name="extraVMargs" value="${extraVMargs}"/> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project> diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java deleted file mode 100644 index 3d8402a94..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/WSWizardTest.java +++ /dev/null @@ -1,206 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests; - -import junit.framework.TestCase; - -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.tests.unittest.WSJUnitConstants; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IServer; - -public abstract class WSWizardTest extends TestCase implements WSJUnitConstants -{ - protected IEnvironment env_; - protected IRuntime serverRuntime_; - protected IServer server_; - protected IStructuredSelection initialSelection_; - - public String defaultURL_ = "http://localhost:8080/"; - - /** - * Set up the workspace for the Web Service Wizard JUnit test. Setup consists of the following steps: - * 1) Obtain an instance of the environment. - * 2) Install the server runtime. - * 3) Install the input data. This may include projects, source files etc. - * 4) Install an instance of the server if required. This may also include configuration of the input data on the server. - * 5) Initialize the J2EE, Web Service Runtime and Server type defaults for the Web Service wizard to use. - * 6) Initialize the initial selection object to set the context for the Web Service wizard. - * @throws Exception - */ - protected void setUp() throws Exception - { - // Get an instance of the default environment with the AccumulateStatusHandler to minimize UI dialog blocks. - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseStatusHandler handler = new EclipseStatusHandler(); - EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler ); - - env_ = environment; - assertTrue(env_ != null); - - server_ = null; - JUnitUtils.hideActionDialogs(); - installServerRuntime(); - installServer(); - - // unzip pre-configured workspace projects - if (!ProjectUtilities.getProject(WSJUnitConstants.BU_PROJECT_NAME).exists()) - createProjects(); - - installInputData(); - initJ2EEWSRuntimeServerDefaults(); - initInitialSelection(); - } - - /** - * Install the server runtime. - * @throws Exception - */ - protected abstract void installServerRuntime() throws Exception; - - /** - * Installs the input data from an aggregator. This ensures that the environment, runtime - * and server are correctly set on the aggregate since its lifecycle methods are not necessarily - * called. - * @param env - * @param serverRuntime - * @param server - * @throws Exception - */ - public void installInputData(IEnvironment env,IRuntime serverRuntime,IServer server) throws Exception - { - env_ = env; - serverRuntime_ = serverRuntime; - server_ = server; - //installInputData(); - } - - // Creates projects from the provided ZIP file. -// public static boolean createProjects() { -// IPath localZipPath = getLocalPath(); -// ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, perf_projectNames); -// return util.createProjects(); -// } - -// private static IPath getLocalPath() { -// URL url = TestsPlugin.getDefault().find(perf_zipFilePath); -// try { -// url = Platform.asLocalURL(url); -// } catch (IOException e) { -// e.printStackTrace(); -// } -// return new Path(url.getPath()); -// } - - /** - * Create the necessary projects for the tests. This could be Web, Java, or other J2EE projects. - * @throws Exception - */ - protected abstract void createProjects() throws Exception; - - /** - * Install the input data for the test. This may include projects, source files etc. - * @throws Exception - */ - protected abstract void installInputData() throws Exception; - - /** - * Install an instance of the server. This may also configure input data on the server. - * @throws Exception - */ - protected abstract void installServer() throws Exception; - - /** - * Initialize the J2EE level, Web Service runtime type and Server defaults for the test case. - * @throws Exception - */ - protected abstract void initJ2EEWSRuntimeServerDefaults() throws Exception; - - /** - * Initialize the initial selection which drives the Web Service wizard. This could include source Java files, - * WSDL URLs and even EJBs. - * @throws Exception - */ - protected abstract void initInitialSelection() throws Exception; - - /** - * Clean up the workspace. Cleanup consists of the following steps: - * 1) Delete the input data. This should include removal of configuration data on the server if necessary. - * 2) Stop the server. - * 3) Delete the server. - * 4) Delete the server runtime. - */ - protected void tearDown() throws Exception - { - stopServer(); -// deleteServer(); -// deleteInputData(); -// deleteServerRuntime(); - } - - /** - * Delete the input data. This should include removal of projects, src files etc. as well as removal of any server configured data. - * @throws Exception - */ - protected abstract void deleteInputData() throws Exception; - - /** - * Stop the server if it is running. - * @throws Exception - */ - protected void stopServer() throws Exception - { - if (server_ != null && server_.getServerState() == IServer.STATE_STARTED) - server_.stop(true); - assertTrue(server_.getServerState() == IServer.STATE_STOPPED); - } - - /** - * Delete the server. - * @throws Exception - */ - protected void deleteServer() throws Exception - { - if (server_ != null) - server_.delete(); - } - - /** - * Delete the server runtime. - * @throws Exception - */ - protected void deleteServerRuntime() throws Exception - { - if (serverRuntime_ != null) - serverRuntime_.delete(); - } - - /** - * Get the default URL in the form of: http://localhost:9080/<contextRoot>/<path> - * @param path - a file or URL relative path. - * @param contextRoot - the context root of the Web module for this URL. - * @return - */ - protected String getDefaultURL(String path,String contextRoot) - { - StringBuffer url = new StringBuffer(defaultURL_); - url.append(contextRoot); - url.append('/'); - url.append(path); - return url.toString(); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java deleted file mode 100644 index 87d78c297..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/axis/tomcat/v50/WSWizardTomcat50Test.java +++ /dev/null @@ -1,41 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.axis.tomcat.v50; - -import org.eclipse.jst.ws.tests.WSWizardTest; -import org.eclipse.jst.ws.tests.util.JUnitUtils; - - -public abstract class WSWizardTomcat50Test extends WSWizardTest { - - protected final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50"); - protected final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - protected final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - - - /* (non-Javadoc) - * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServerRuntime() - */ - protected void installServerRuntime() throws Exception { - - serverRuntime_ = JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH); - } - - - /* (non-Javadoc) - * @see com.ibm.etools.webservice.was.tests.WSWizardTest#installServer() - */ - protected void installServer() throws Exception { - - server_ = JUnitUtils.createServer("Apache Tomcat v50", SERVERTYPEID_TC50, serverRuntime_, env_, null ); - } - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java deleted file mode 100644 index f76825569..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/plugin/TestsPlugin.java +++ /dev/null @@ -1,81 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.plugin; - -import java.util.MissingResourceException; -import java.util.ResourceBundle; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class TestsPlugin extends Plugin { - //The shared instance. - private static TestsPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - /** - * The constructor. - */ - public TestsPlugin() { - super(); - plugin = this; - try { - resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.ws.tests.plugin.TestsPlugin"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - } - - /** - * Returns the shared instance. - */ - public static TestsPlugin getDefault() { - return plugin; - } - - /** - * Returns the string from the plugin's resource bundle, - * or 'key' if not found. - */ - public static String getResourceString(String key) { - ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - return resourceBundle; - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java deleted file mode 100644 index edd8b1cb1..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/AllWSJUnitTests.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - -import org.eclipse.jst.ws.tests.util.JUnitUtils; - -/** - * This class is to run all the unittest tests. - */ -public class AllWSJUnitTests extends TestCase implements WSJUnitConstants -{ - /** - * Method parseArgs. - * - * @param args - */ - private void parseArgs(Object args) - { - // typicially args is an array of strings, - // not sure when it wouldn't be. - } - - public static void main(String[] args) - { - new AllWSJUnitTests().runMain(args); - } - - - public Object runMain(Object args) - { - Object result = null; - try - { - TestRunner testRunner = null; - - parseArgs(args); - - testRunner = new TestRunner(System.out); - - Test suite = suite(); - TestResult testResult = testRunner.doRun(suite, false); - printHeader(testResult); - } - catch (Exception e) - { - result = e; - } - - return result; - } - - public static Test suite() - { - JUnitUtils.enableOverwrite(true); - - TestSuite testSuite = new TestSuite(); - testSuite.addTest( ComponentCreationTests.suite() ); - testSuite.addTest( J2EEUtilsTests.suite() ); - - String s = System.getProperty("org.eclipse.jst.server.tomcat.50"); - if (s != null && s.length() > 0) { - testSuite.addTest( ServerCreationTests.suite()); - } - testSuite.addTest( ResourceUtilsTests.suite() ); - - - return testSuite; - } - - /** - * Prints the header of the report - */ - protected void printHeader(TestResult result) - { - if (result.wasSuccessful()) - { - System.out.println(); - System.out.print("OK"); - System.out.println(" (" + result.runCount() + " tests)"); - - } - else - { - System.out.println(); - System.out.println("FAILURES!!!"); - System.out.println( - "Tests run: " - + result.runCount() - + ", Failures: " - + result.failureCount() - + ", Errors: " - + result.errorCount()); - } - } -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java deleted file mode 100644 index f4780b14d..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ComponentCreationTests.java +++ /dev/null @@ -1,117 +0,0 @@ -/** - * - */ -package org.eclipse.jst.ws.tests.unittest; - -import java.io.IOException; -import java.net.URL; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.tests.plugin.TestsPlugin; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -/** - * Tests the various Component creation commands - */ -public class ComponentCreationTests extends TestCase implements WSJUnitConstants { - - public static Test suite(){ - return new TestSuite(ComponentCreationTests.class); - } - - public void testWebComponentCreation(){ - - createServerRuntime(); - createProjects(); - //createWebModule(projectName, projectName, J2EEVersionConstants.J2EE_1_4_ID); - //createWebModule(project2Name, project2Name, J2EEVersionConstants.J2EE_1_3_ID); - - } - - // Creates projects from the provided ZIP file. - public static boolean createProjects() { - IPath localZipPath = getLocalPath(); - ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, projectNames); - return util.createProjects(); - } - - private static IPath getLocalPath() { - URL url = TestsPlugin.getDefault().find(zipFilePath); - try { - url = Platform.asLocalURL(url); - } catch (IOException e) { - e.printStackTrace(); - } - return new Path(url.getPath()); - } - - public void createServerRuntime(){ - - try { - JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH); - } - catch(Exception e){ - e.printStackTrace(); - } - - } - - public void dtestCreateEJBModule(){ - - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString()); - cmc.setModuleName(ejbComponentName); - cmc.setModuleType(CreateModuleCommand.EJB); - cmc.setProjectName(ejbProjectName); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null ); - - System.out.println("Done creating EJB component."); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(ejbProjectName); - IVirtualComponent vc = ComponentCore.createComponent(p); - assertTrue(vc.exists()); - } - - public void dtestCreateAppClientModule(){ - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString()); - cmc.setModuleName(appClientCompName); - cmc.setModuleType(CreateModuleCommand.APPCLIENT); - cmc.setProjectName(appClientProjectName); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null); - - System.out.println("Done creating App client component."); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(appClientProjectName); - IVirtualComponent vc = ComponentCore.createComponent(p); - assertTrue(vc.exists()); - } - - public void dtestCreateEARModule(){ - CreateModuleCommand cmc = new CreateModuleCommand(); - cmc.setJ2eeLevel(new Integer(J2EEVersionConstants.J2EE_1_3_ID).toString()); - cmc.setModuleName(earCompName); - cmc.setModuleType(CreateModuleCommand.EAR); - cmc.setProjectName(projectName); - cmc.setServerFactoryId(SERVERTYPEID_TC50); - cmc.execute(null, null); - - System.out.println("Done creating EAR component."); - IProject p = ResourceUtils.getWorkspaceRoot().getProject(projectName); - IVirtualComponent vc = ComponentCore.createComponent(p); - assertTrue(vc.exists()); - } -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java deleted file mode 100644 index 18a135465..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/J2EEUtilsTests.java +++ /dev/null @@ -1,205 +0,0 @@ -/** - * - */ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.ws.internal.common.J2EEUtils; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.AssociateModuleWithEARCommand; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -/** - * @author sengpl - * - */ -public class J2EEUtilsTests extends TestCase implements WSJUnitConstants{ - - private IProject project1 = null; - private IProject project2 = null; - private IProject ejbProject = null; - - private String comp1 = webComponentName; - - protected void setUp() throws Exception { - super.setUp(); - - // Project and component names initialized here! - project1 = ProjectUtilities.getProject(projectName); - assertNotNull(project1); - - project2 = ProjectUtilities.getProject(project2Name); - assertNotNull(project2); - - ejbProject = ProjectUtilities.getProject(ejbProjectName); - assertNotNull(ejbProject); - - } - - protected void tearDown() throws Exception { - super.tearDown(); - // TODO Clear the workspace - - } - - public static Test suite() - { - return new TestSuite(J2EEUtilsTests.class); - } - - public void testComponentsExist(){ - System.out.println("< BEGIN: testComponentExists ..."); - IVirtualComponent vc1 = J2EEUtils.getVirtualComponent(project1); - IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2.getName()); - - assertTrue(vc1.exists()); - assertTrue(J2EEUtils.exists(project1)); - assertTrue(vc2.exists()); - assertTrue(J2EEUtils.exists(project2.getName(), project2Name)); - System.out.println("< END: testComponentExists ..."); - } - - public void testLocationGetterMethods(){ - - System.out.println("< BEGIN: testLocationGetterMethods ..."); - IPath loc1 = J2EEUtils.getWebContentPath(project1); - System.out.println("WebContentPath of project1 = "+loc1); - IResource res = ResourceUtils.getWorkspaceRoot().findMember(loc1); - assertTrue(res.exists()); - assertTrue(res.toString().endsWith("WebContent")); - - IPath loc2 = J2EEUtils.getWebContentPath(project2); - System.out.println("WebContentPath of project2 = "+loc2); - IResource res2 = ResourceUtils.getWorkspaceRoot().findMember(loc2); - assertTrue(res2.exists()); - assertTrue(res2.toString().endsWith("WebContent")); - - IPath loc3 = J2EEUtils.getWebInfPath(project1); - System.out.println("Web-INF path = "+loc3); - IResource res3 = ResourceUtils.getWorkspaceRoot().findMember(loc3); - assertTrue(res3.exists()); - assertTrue(res3.toString().endsWith("WEB-INF")); - - IContainer container = J2EEUtils.getWebContentContainer(project2); - IResource res4 = ResourceUtils.getWorkspaceRoot().findMember(container.getFullPath()); - assertEquals(res2, res4); - - System.out.println("< END: testLocationGetterMethods ..."); - - } - - public void testJ2EEVersionMethods(){ - - System.out.println("< BEGIN: testJ2EEVersionMethods ..."); - - String j3 = J2EEUtils.getJ2EEVersionAsString(project1); - System.out.println("J2EEVersion p1 as String: "+j3); - assertEquals(J2EEVersionConstants.VERSION_2_4_TEXT, j3); - - IVirtualComponent vc2 = J2EEUtils.getVirtualComponent(project2); - int j2 = J2EEUtils.getJ2EEVersion(vc2); - System.out.println("J2EEVersions p1: "+j2); - assertEquals(J2EEVersionConstants.SERVLET_2_3, j2); - - System.out.println("< END: testJ2EEVersionMethods ..."); - } - - public void testComponentGetterMethods(){ - - System.out.println("< BEGIN: testComponentGetterMethods ..."); - - IVirtualComponent[] vcs = J2EEUtils.getAllComponents(); - checkVirtualComponentsExists(vcs); - - IVirtualComponent[] vcs2 = J2EEUtils.getAllEARComponents(); - checkVirtualComponentsExists(vcs2); - - IVirtualComponent[] vcs3 = J2EEUtils.getAllWebComponents(); - checkVirtualComponentsExists(vcs3); - - IVirtualComponent[] vcs4 = J2EEUtils.getWebComponents(project1); - checkVirtualComponentsExists(vcs4); - - String[] names = J2EEUtils.getWebComponentNames(project2); - printNameStrings(names); - - String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getComponentsByType(project1, J2EEUtils.WEB | J2EEUtils.EJB)); - printNameStrings(names2); - - IProject[] projects = J2EEUtils.getAllFlexibleProjects(); - for (int i=0;i<projects.length;i++){ - System.out.println("Flex project "+i+" = "+projects[i]); - } - - System.out.println("< END: testComponentGetterMethods ..."); - } - - private void checkVirtualComponentsExists(IVirtualComponent[] vcs){ - for (int i=0; i<vcs.length;i++){ - IVirtualComponent vc = vcs[i]; - System.out.println("VC: Project = "+vc.getProject()+" Name = "+vc.getName()); - assertTrue(vc.exists()); - - } - } - - private void printNameStrings(String[] names){ - for (int i=0;i<names.length;i++){ - System.out.println("Name"+i+" = "+names[i]); - } - } - - public void dtestAssociateComponentCommand(){ - - System.out.println("< BEGIN: testAssociateComponentCommand ..."); - - AssociateModuleWithEARCommand amwe = new AssociateModuleWithEARCommand(); - amwe.setEar(earCompName); - amwe.setEARProject(projectName); - amwe.setModule(comp1); - amwe.setProject(projectName); - amwe.execute(null, null); - - System.out.println("< END: testAssociateComponentCommand ..."); - } - - public void dtestReferencingGetterMethods(){ - - System.out.println("< BEGIN: testReferencingGetterMethods ..."); - - System.out.println("isComponentAssociated .."); - J2EEUtils.isComponentAssociated(project1, project1); - - String[] names = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project1)); - printNameStrings(names); - String[] names2 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingEARComponents(project2)); - printNameStrings(names2); - - String[] names3 = J2EEUtils.toComponentNamesArray(J2EEUtils.getReferencingWebComponentsFromEAR(project1)); - printNameStrings(names3); - - System.out.println("< END: testReferencingGetterMethods ..."); - } - - public void dtestIsComponentMethods(){ - - System.out.println("< BEGIN: testIsComponentMethods ..."); - - //assertFalse(J2EEUtils.isEJB20Component(ejbProject, ejbComponentName)); - assertTrue(J2EEUtils.isEJB20Component(ejbProject)); - - System.out.println("< END: testIsComponentMethods ..."); - } - - - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java deleted file mode 100644 index ec2f6aa5b..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/LaunchTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import org.eclipse.core.runtime.IPlatformRunnable; - -/** - * Minimal app to run as Eclipse "application" - */ -public class LaunchTest implements IPlatformRunnable -{ - /** - * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object) - */ - public Object run(Object args) throws Exception - { - - Object result = new AllWSJUnitTests().runMain(args); - - if (result != null) - { - if (result instanceof Throwable) - { - ((Throwable) result).printStackTrace(); - } - else - { - System.out.println("tests didn't return 'ok'"); - } - return result; - } - else - return IPlatformRunnable.EXIT_OK; - } -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java deleted file mode 100644 index 69b8ef3f2..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ResourceUtilsTests.java +++ /dev/null @@ -1,100 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.Path; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.ws.internal.common.ResourceUtils; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.eclipse.EclipseStatusHandler; -import org.eclipse.wst.common.componentcore.ComponentCore; -import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; -import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; - -/** - * JUnit tests for selective ResourceUtils methods. Calls which return a simple String or rely on a IResource - * API need not be tested. The focus is mainly to exercise Component and Flexible project APIs. - * - */ -public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ - - - public static Test suite(){ - return new TestSuite(ResourceUtilsTests.class); - } - - public void testComponentType(){ - IProject project = ProjectUtilities.getProject(projectName); - String componentType = ResourceUtils.getComponentType(project); - assertEquals(IModuleConstants.JST_WEB_MODULE, componentType); - } - - public void testComponentOf(){ - IProject project = ProjectUtilities.getProject(projectName); - IPath destPath = ResourceUtils.getJavaSourceLocation(project); - IFolder folder = (IFolder)ResourceUtils.findResource(destPath); - try { - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseStatusHandler handler = new EclipseStatusHandler(); - EclipseEnvironment env = new EclipseEnvironment( null, resourceContext, handler ); - - IFile file = folder.getFile(new Path("foo/Echo.java")); - if (!file.exists()) { - JUnitUtils.copyTestData("BUJava/src", folder, env, null ); - } - } - catch (Exception ex){ - ex.printStackTrace(); - } - - IPath javaFilePath = folder.getFile(new Path("foo/Echo.java")).getFullPath(); - IVirtualComponent vc = ResourceUtils.getComponentOf(javaFilePath); - assertTrue(vc.exists()); - - - } - - public void testJavaSourceLocation(){ - IProject project = ProjectUtilities.getProject(projectName); - String javaSourceLoc = ResourceUtils.getJavaSourceLocation(project).toString(); - System.out.println("Java source location = "+javaSourceLoc); - assertTrue(javaSourceLoc.endsWith("src")); - - // get all the JavaSourceLocations via the VirtualComponent - IVirtualComponent vc1 = ComponentCore.createComponent(project); - IVirtualComponent vc2 = ComponentCore.createComponent(project); - IVirtualComponent[] vcs = new IVirtualComponent[]{vc1, vc2}; - IPath[] paths = ResourceUtils.getAllJavaSourceLocations(vcs); - - // verify first folder exists - IPath path1 = (IPath)paths[0]; - IResource resource = ResourceUtils.findResource(path1); - if (resource.exists()){ - assertEquals(IResource.FOLDER, resource.getType()); - } - - // verify second folder exists - IPath path2 = (IPath)paths[1]; - IResource resource2 = ResourceUtils.findResource(path2); - if (resource2.exists()){ - assertEquals(IResource.FOLDER, resource2.getType()); - } - } - - public void testWebComponentServerRoot() { - IProject project = ProjectUtilities.getProject(projectName); - IFolder folder = ResourceUtils.getWebComponentServerRoot(project); - assertTrue(folder.exists()); - - } - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java deleted file mode 100644 index 12041b6ee..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/ServerCreationTests.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * - */ -package org.eclipse.jst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.jst.ws.internal.consumption.command.common.CreateServerCommand; -import org.eclipse.jst.ws.tests.util.JUnitUtils; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.ServerCore; - -public class ServerCreationTests extends TestCase implements WSJUnitConstants{ - - - public static Test suite(){ - return new TestSuite(ServerCreationTests.class); - } - - public void init(){ - try { - assertNotNull(SERVER_INSTALL_PATH); - JUnitUtils.createServerRuntime(RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH); - } - catch(Exception e){ - e.printStackTrace(); - } - } - - public void testCreateTomcatv5Server(){ - init(); - - System.out.println("Creating Tomcat v5 server."); - CreateServerCommand csc = new CreateServerCommand(); - csc.setServerFactoryid(SERVERTYPEID_TC50); - csc.execute(null, null ); - - IServer server = null; - String instId = csc.getServerInstanceId(); - System.out.println("Server instance Id = "+instId); - if (instId!=null){ - server = ServerCore.findServer(instId); - } - assertNotNull(server); - - System.out.println("Done creating Tomcat v5 server."); - } - - public void testReattemptCreateTomcatv5Server(){ - System.out.println("Attempting to create 2nd Tomcat v5 server."); - CreateServerCommand csc = new CreateServerCommand(); - csc.setServerFactoryid(SERVERTYPEID_TC50); - csc.execute(null, null ); - - IServer server = null; - String instId = csc.getServerInstanceId(); - if (instId!=null) { - server = ServerCore.findServer(instId); - } - assertNotNull(server); - - System.out.println("Done attempting 2nd Tomcat v5 server creation."); - } -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java deleted file mode 100644 index 9ba293bfa..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WSJUnitConstants.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.eclipse.jst.ws.tests.unittest; - -import org.eclipse.core.runtime.Path; - - -public interface WSJUnitConstants { - - public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50"); - public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - - public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11"; - - public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - - public final String webProjectName = "WebProject"; - - // flexible project structure 1 - public final String projectName = "FlexProject"; - public final String webComponentName = "webComponent"; - public final String webComponent2Name = "webComp2"; - - // flexible project structure 2 - public final String project2Name = "FlexProject2"; - public final String webComp3Name = "webComp3"; - public final String webComp4Name = "webComp4"; - - public final String ejbProjectName = "FlexEJBProject"; - public final String ejbComponentName = "ejbComponent"; - - public final String appClientProjectName = "FlexAppClientProject"; - public final String appClientCompName = "appClientComponent"; - - public final String earCompName = "EARComponent"; - - public final Path zipFilePath = new Path("/data/WSTestProjects.zip"); - public final String[] projectNames = new String[]{projectName, project2Name}; - - // performance constants - public final String BU_PROJECT_NAME = "TestWeb"; - public final String TD_PROJECT_NAME = "TestTDProject"; - public final String CLIENT_PROJECT_NAME = "TestWebClient"; - - public final Path perf_zipFilePath = new Path("/data/WSPerfProjects.zip"); - public final String[] perf_projectNames = new String[]{BU_PROJECT_NAME, TD_PROJECT_NAME, CLIENT_PROJECT_NAME}; - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java deleted file mode 100644 index 43ac04f65..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/unittest/WebServiceRuntimeTests.java +++ /dev/null @@ -1,529 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060518 127189 rsinha@ca.ibm.com - Rupam Kuehner - *******************************************************************************/ -package org.eclipse.jst.ws.tests.unittest; - -import java.io.File; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Status; -import org.eclipse.jdt.internal.debug.ui.jres.JREsUpdater; -import org.eclipse.jdt.launching.IVMInstall; -import org.eclipse.jdt.launching.IVMInstall2; -import org.eclipse.jdt.launching.IVMInstallType; -import org.eclipse.jdt.launching.JavaRuntime; -import org.eclipse.jdt.launching.VMStandin; -import org.eclipse.jem.util.emf.workbench.ProjectUtilities; -import org.eclipse.jst.j2ee.internal.J2EEVersionConstants; -import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants; -import org.eclipse.jst.server.core.FacetUtil; -import org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateFacetedProjectCommand; -import org.eclipse.jst.ws.internal.consumption.common.FacetUtils; -import org.eclipse.jst.ws.internal.consumption.common.RequiredFacetVersion; -import org.eclipse.jst.ws.internal.consumption.datamodel.validate.ValidationManager; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.FacetMatchCache; -import org.eclipse.jst.ws.internal.consumption.ui.wsrt.WebServiceRuntimeExtensionUtils2; -import org.eclipse.wst.common.project.facet.core.IFacetedProject; -import org.eclipse.wst.common.project.facet.core.IFacetedProjectTemplate; -import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IRuntimeType; -import org.eclipse.wst.server.core.IRuntimeWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.ws.internal.wsrt.WebServiceScenario; - -/** - * WebServiceRuntimeTests contains the JUnit tests which cover project - * creation, project filtering, and project type filtering for the Axis - * Web service runtime. In order for the test to run successfully: - * <ol> - * <li>The Eclipse test environment must be launched with JDK1.4.2</li> - * <li>The following VM arguments must be specified: - * <ul> - * <li>org.eclipse.jst.server.tomcat.55: the install location of a Tomcat 5.5 server,<br> - * for example, use -Dorg.eclipse.jst.server.tomcat.55=d:\jakarta-tomcat-5.5.9 - * <li>org.eclipse.jst.server.tomcat.50: the install location of a Tomcat 5.0 server,<br> - * for example, use -Dorg.eclipse.jst.server.tomcat.50=d:\jakarta-tomcat-5.0.28 - * <li>org.eclipse.jst.server.tomcat.41: the install location of a Tomcat 4.1 server,<br> - * for example, use -Dorg.eclipse.jst.server.tomcat.41=d:\jakarta-tomcat-4.1.29 - * <li>java.15.install.path: the install location of a Java 1.5 JDK,<br> - * for example, use -Djava.15.install.path=d:\jdk1.5.0_02 - * </ul></li> - * </ol> - * - * - */ -public class WebServiceRuntimeTests extends TestCase -{ - - //Server install paths - private final String SERVER_INSTALL_PATH_TC55 = System.getProperty("org.eclipse.jst.server.tomcat.55"); - private final String SERVER_INSTALL_PATH_TC50 = System.getProperty("org.eclipse.jst.server.tomcat.50"); - private final String SERVER_INSTALL_PATH_TC41 = System.getProperty("org.eclipse.jst.server.tomcat.41"); - - //JDK 1.5 install info - private final String JAVA15_VM_INSTALL_PATH = System.getProperty("java.15.install.path"); - private final String JAVA15_VM_INSTALL_TYPE = "org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"; - private final String JAVA15_VM_INSTALL_NAME = "Java15"; - private final String JAVA15_VM_INSTALL_JAVADOC = "http://java.sun.com/j2se/1.5.0/docs/api/"; - - //Runtime type ids ans server type ids - private final String RUNTIMETYPEID_TC55 = "org.eclipse.jst.server.tomcat.runtime.55"; - private final String SERVERTYPEID_TC55 = "org.eclipse.jst.server.tomcat.55"; - private final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - private final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - private final String RUNTIMETYPEID_TC41 = "org.eclipse.jst.server.tomcat.runtime.41"; - private final String SERVERTYPEID_TC41 = "org.eclipse.jst.server.tomcat.41"; - - //Runtime ids for runtimes that will be created - private final String RUNTIMEID_TC55 = "Tomcat55Runtime"; - private final String RUNTIMEID_TC50 = "Tomcat50Runtime"; - private final String RUNTIMEID_TC41 = "Tomcat41Runtime"; - - //Web service runtime extension ids for Axis - private final String AXIS_RUNTIME = "org.eclipse.jst.ws.axis.creation.axisWebServiceRT"; - private final String SERVICE_IMPL_JAVA = "org.eclipse.jst.ws.wsImpl.java"; - private final String AXIS_SERVICE_RUNTIME = "org.eclipse.jst.ws.axis.creation.java"; - private final String CLIENT_IMPL_JAVA = "org.eclipse.jst.ws.client.type.java"; - private final String AXIS_CLIENT_RUNTIME_WEB = "org.eclipse.jst.ws.axis.consumption.web"; - private final String AXIS_CLIENT_RUNTIME_JAVA = "org.eclipse.jst.ws.axis.consumption.java"; - - //Various constants used by the test case for identifying service/client side and - //for setting names on created projects. - private final String SERVICE_SIDE = "s"; - private final String CLIENT_SIDE = "c"; - private final String PROJECT_NAME_PREFIX = "tc"; - private final String PROJECT_NAME_SUFFIX = "project"; - - //IProjectFacetVersions used in the expected results - private final IProjectFacetVersion WEB23 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE).getVersion(J2EEVersionConstants.VERSION_2_3_TEXT); - private final IProjectFacetVersion WEB24 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_WEB_MODULE).getVersion(J2EEVersionConstants.VERSION_2_4_TEXT); - private final IProjectFacetVersion JAVA14 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_JAVA).getVersion(J2EEVersionConstants.VERSION_1_4_TEXT); - private final IProjectFacetVersion JAVA50 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_JAVA).getVersion("5.0"); - private final IProjectFacetVersion UTILITY10 = ProjectFacetsManager.getProjectFacet(IJ2EEModuleConstants.JST_UTILITY_MODULE).getVersion(J2EEVersionConstants.VERSION_1_0_TEXT); - - private final IFacetedProjectTemplate TEMPLATE_WEB = ProjectFacetsManager.getTemplate(IJ2EEModuleConstants.JST_WEB_TEMPLATE); - private final IFacetedProjectTemplate TEMPLATE_UTILITY = ProjectFacetsManager.getTemplate(IJ2EEModuleConstants.JST_UTILITY_TEMPLATE); - - private int multiplesForProjectCreation; - - public static Test suite() - { - return new TestSuite(WebServiceRuntimeTests.class); - } - - private void init() - { - try - { - assertNotNull(SERVER_INSTALL_PATH_TC55); - assertNotNull(SERVER_INSTALL_PATH_TC50); - assertNotNull(SERVER_INSTALL_PATH_TC41); - assertNotNull(JAVA15_VM_INSTALL_PATH); - - //Create a server runtime: Tomcat 4.1 with JDK 1.4.2 - createTomcatServerRuntime(RUNTIMEID_TC41, RUNTIMETYPEID_TC41, SERVER_INSTALL_PATH_TC41); - - //Create a server runtime: Tomcat 5.0 with JDK 1.4.2 - createTomcatServerRuntime(RUNTIMEID_TC50, RUNTIMETYPEID_TC50, SERVER_INSTALL_PATH_TC50); - - //Create a server runtime: Tomcat 5.5 with JDK 1.5 - createTomcatServerRuntime(RUNTIMEID_TC55, RUNTIMETYPEID_TC55, SERVER_INSTALL_PATH_TC55); - - - - String multiples = System.getProperty("multiples"); //this is an optional propery - defaulted to 1 - if (multiples != null && (Integer.parseInt(multiples) > 0)) - { - multiplesForProjectCreation = Integer.parseInt(multiples); - } - else - { - multiplesForProjectCreation = 1; - } - - } catch (Exception e) - { - e.printStackTrace(); - fail(); - } - } - - private IRuntime createTomcatServerRuntime(String runtimeId, String runtimeTypeId, String serverInstallPath) throws Exception - { - IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId); - IRuntimeWorkingCopy wc = rt.createRuntime(runtimeId, null); - wc.setLocation(new Path(serverInstallPath)); - IRuntime runtime = wc.save(true, null); - - if (runtimeTypeId.equals(RUNTIMETYPEID_TC55)) - { - //Create a new IVMInstall - IVMInstallType type = JavaRuntime.getVMInstallType(JAVA15_VM_INSTALL_TYPE); - IVMInstall newVM = new VMStandin(type, createUniqueId(type)); - newVM.setInstallLocation(new File(JAVA15_VM_INSTALL_PATH).getAbsoluteFile()); - newVM.setName(JAVA15_VM_INSTALL_NAME); - newVM.setJavadocLocation(new URL(JAVA15_VM_INSTALL_JAVADOC)); - if (newVM instanceof IVMInstall2) - { - IVMInstall2 newVM2 = (IVMInstall2) newVM; - newVM2.setVMArgs(null); - } - newVM.setLibraryLocations(null); - - //Add the new IVMInstall to the master list. - IVMInstall[] vms = new IVMInstall[]{newVM}; - //TODO Replace use of the internal class org.eclipse.jdt.internal.debug.ui.jres.JREsUpdater - //with something public. Not sure if something public is available at this time. Need to check. - JREsUpdater updater = new JREsUpdater(); - IVMInstall defaultVM = JavaRuntime.getDefaultVMInstall(); - updater.updateJRESettings(vms, defaultVM); - - //Get the new IVMInstall - IVMInstallType vmType = JavaRuntime.getVMInstallType(JAVA15_VM_INSTALL_TYPE); - IVMInstall java15VM = vmType.findVMInstallByName(JAVA15_VM_INSTALL_NAME); - - //Set the tomcat runtime to use the new Java 15 JDK. - IRuntimeWorkingCopy wc2 = runtime.createWorkingCopy(); - //TODO Replace use of the internal class - //org.eclipse.jst.server.tomcat.core.internal.ITomcatRuntimeWorkingCopy - //with something public. Enhancement 127884 has been opened to request API - //for this. - ITomcatRuntimeWorkingCopy tcwc = (ITomcatRuntimeWorkingCopy)wc2.loadAdapter(ITomcatRuntimeWorkingCopy.class, new NullProgressMonitor()); - tcwc.setVMInstall(java15VM); - wc2.save(true, null); - } - - return ServerCore.findRuntime(runtimeId); - } - - private String createUniqueId(IVMInstallType vmType) - { - String id = null; - do - { - id = String.valueOf(System.currentTimeMillis()); - } while (vmType.findVMInstall(id) != null); - return id; - } - - /** - * Tests project creation and filtering for the Axis Web service - * runtime. Tests cover all valid combinations of ServiceRuntimes, - * Tomcat servers, and J2EE project types and well as all valid - * combinations of ClientRuntimes, Tomcat servers, and J2EE project types. - */ - public void testProjectCreationAndFiltering() - { - init(); - - String[] templateIds = new String[]{IJ2EEModuleConstants.JST_WEB_TEMPLATE, - IJ2EEModuleConstants.JST_WEB_TEMPLATE, - IJ2EEModuleConstants.JST_WEB_TEMPLATE, - IJ2EEModuleConstants.JST_WEB_TEMPLATE, - IJ2EEModuleConstants.JST_WEB_TEMPLATE, - IJ2EEModuleConstants.JST_WEB_TEMPLATE, - IJ2EEModuleConstants.JST_UTILITY_TEMPLATE, - IJ2EEModuleConstants.JST_UTILITY_TEMPLATE, - IJ2EEModuleConstants.JST_UTILITY_TEMPLATE}; - String[] scenarios = new String[]{SERVICE_SIDE, - SERVICE_SIDE, - SERVICE_SIDE, - CLIENT_SIDE, - CLIENT_SIDE, - CLIENT_SIDE, - CLIENT_SIDE, - CLIENT_SIDE, - CLIENT_SIDE}; - String[] serviceClientRuntimeIds = new String[]{AXIS_SERVICE_RUNTIME, - AXIS_SERVICE_RUNTIME, - AXIS_SERVICE_RUNTIME, - AXIS_CLIENT_RUNTIME_WEB, - AXIS_CLIENT_RUNTIME_WEB, - AXIS_CLIENT_RUNTIME_WEB, - AXIS_CLIENT_RUNTIME_JAVA, - AXIS_CLIENT_RUNTIME_JAVA, - AXIS_CLIENT_RUNTIME_JAVA}; - String[] serverTypes = new String[]{SERVERTYPEID_TC41, - SERVERTYPEID_TC50, - SERVERTYPEID_TC55, - SERVERTYPEID_TC41, - SERVERTYPEID_TC50, - SERVERTYPEID_TC55, - SERVERTYPEID_TC41, - SERVERTYPEID_TC50, - SERVERTYPEID_TC55}; - - - //Expected Results: - - IProjectFacetVersion[][] expectedFacets = new IProjectFacetVersion[][]{ new IProjectFacetVersion[]{WEB23, JAVA14}, - new IProjectFacetVersion[]{WEB24, JAVA14}, - new IProjectFacetVersion[]{WEB24, JAVA50}, - new IProjectFacetVersion[]{WEB23, JAVA14}, - new IProjectFacetVersion[]{WEB24, JAVA14}, - new IProjectFacetVersion[]{WEB24, JAVA50}, - new IProjectFacetVersion[]{UTILITY10, JAVA14}, - new IProjectFacetVersion[]{UTILITY10, JAVA14}, - new IProjectFacetVersion[]{UTILITY10, JAVA50}, - }; - - String[] expectedRuntimes = new String[] {RUNTIMEID_TC41, - RUNTIMEID_TC50, - RUNTIMEID_TC55, - RUNTIMEID_TC41, - RUNTIMEID_TC50, - RUNTIMEID_TC55, - RUNTIMEID_TC41, - RUNTIMEID_TC50, - RUNTIMEID_TC55 - }; - - String bigPrefix = PROJECT_NAME_PREFIX+"0"+PROJECT_NAME_SUFFIX; - String[] expectedProjectsForAxisService = new String[] { bigPrefix+"0", - bigPrefix+"1", - bigPrefix+"2", - bigPrefix+"3", - bigPrefix+"4", - bigPrefix+"5" - }; - - String[] expectedProjectsForAxisClient = new String[] { bigPrefix+"0", - bigPrefix+"1", - bigPrefix+"2", - bigPrefix+"3", - bigPrefix+"4", - bigPrefix+"5", - bigPrefix+"6", - bigPrefix+"7", - bigPrefix+"8", - }; - - boolean[] expectedBooleansForAxisService = new boolean[] {true, true, true, true, true, true, false, false, false}; - boolean[] expectedBooleansForAxisClientWeb = new boolean[] {true, true, true, true, true, true, false, false, false}; - boolean[] expectedBooleansForAxisClientJava = new boolean[] {false, false, false, false, false, false, true, true, true}; - - - //Turn auto-build off - ValidationManager manager = new ValidationManager(); - manager.disableAutoBuild(); - - //Create the projects - for (int i=0; i<multiplesForProjectCreation; i++) - { - createProjects(templateIds, scenarios, serviceClientRuntimeIds, serverTypes, PROJECT_NAME_PREFIX+i); - } - - //Restore auto-build - manager.restoreAutoBuild(); - - //Check Expected Results: - - //Check facets and runtime on the first "0"th set of created projects. Ignore higher multiples since they - //are duplicates. - for (int j=0; j<expectedFacets.length; j++) - { - String projectName = bigPrefix+j; - IProject project = ProjectUtilities.getProject(projectName); - assertNotNull(project); - assertTrue(project.exists()); - try - { - IFacetedProject fProject = ProjectFacetsManager.create(project); - assertNotNull(fProject); - - //Check facets - //begin debug - Iterator pfacets = fProject.getProjectFacets().iterator(); - while (pfacets.hasNext()) - { - IProjectFacetVersion pfv = (IProjectFacetVersion)pfacets.next(); - System.out.println("facet="+pfv.getProjectFacet().getId()+", version="+pfv.getVersionString()); - } - - for (int k=0; k<expectedFacets[j].length; k++) - { - assertTrue(fProject.hasProjectFacet(expectedFacets[j][k])); - - } - - //Check runtime - org.eclipse.wst.common.project.facet.core.runtime.IRuntime fRuntime = fProject.getRuntime(); - assertNotNull(fRuntime); - IRuntime sRuntime = FacetUtil.getRuntime(fRuntime); - assertNotNull(sRuntime); - assertTrue(sRuntime.getId().equals(expectedRuntimes[j])); - - } catch (CoreException ce) - { - fail(); - } - - } - - //Check that WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(..) returns - //the right set of projects - String serviceType = String.valueOf(WebServiceScenario.BOTTOMUP) + "/" + SERVICE_IMPL_JAVA; - String[] projectsForAxisService = WebServiceRuntimeExtensionUtils2.getProjectsForServiceTypeAndRuntime(serviceType, AXIS_RUNTIME); - assertEquals(expectedProjectsForAxisService.length, projectsForAxisService.length); - List projectsForAxisServiceList = new ArrayList(); - for (int i=0; i<projectsForAxisService.length; i++) - { - projectsForAxisServiceList.add(projectsForAxisService[i]); - } - for (int i=0; i<expectedProjectsForAxisService.length; i++) - { - assertTrue(projectsForAxisServiceList.contains(expectedProjectsForAxisService[i])); - } - - //Check that WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(..) returns - //the right set of projects - String[] projectsForAxisClient = WebServiceRuntimeExtensionUtils2.getProjectsForClientTypeAndRuntime(CLIENT_IMPL_JAVA, AXIS_RUNTIME); - assertEquals(expectedProjectsForAxisClient.length, projectsForAxisClient.length); - List projectsForAxisClientList = new ArrayList(); - for (int i=0; i<projectsForAxisClient.length; i++) - { - projectsForAxisClientList.add(projectsForAxisClient[i]); - } - for (int i=0; i<expectedProjectsForAxisClient.length; i++) - { - assertTrue(projectsForAxisClientList.contains(expectedProjectsForAxisClient[i])); - } - - //Check that the Axis service and client runtimes' project compatibility checking is working - for (int i=0; i<expectedBooleansForAxisService.length; i++) - { - String projectName = bigPrefix+i; - assertEquals(expectedBooleansForAxisService[i], WebServiceRuntimeExtensionUtils2.doesServiceRuntimeSupportProject(AXIS_SERVICE_RUNTIME, projectName)); - assertEquals(expectedBooleansForAxisClientWeb[i], WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportProject(AXIS_CLIENT_RUNTIME_WEB, projectName)); - assertEquals(expectedBooleansForAxisClientJava[i], WebServiceRuntimeExtensionUtils2.doesClientRuntimeSupportProject(AXIS_CLIENT_RUNTIME_JAVA, projectName)); - } - - //Turn auto-build off - manager.disableAutoBuild(); - - //Delete the projects - for (int i=0; i<multiplesForProjectCreation; i++) - { - deleteProjects(templateIds.length, PROJECT_NAME_PREFIX+i); - } - - //Restore auto-build - manager.restoreAutoBuild(); - } - - private void deleteProjects(int n, String namePrefix) - { - for (int i=0; i<n; i++) - { - String name = namePrefix + PROJECT_NAME_SUFFIX + i; - IProject project = ProjectUtilities.getProject(name); - try - { - project.delete(true, null); - } - catch (CoreException ce) - { - //Don't fail the test case if project deletion fails. - } - } - } - - private void createProjects(String[] templateIds, String[] scenarios, String[] serviceClientRuntimeIds, String[] serverTypes, String namePrefix ) - { - int n = templateIds.length; - for (int i=0; i<n; i++) - { - String name = namePrefix + PROJECT_NAME_SUFFIX + i; - RequiredFacetVersion[] rfvs = null; - if (scenarios[i].equals(CLIENT_SIDE)) - { - - rfvs = WebServiceRuntimeExtensionUtils2.getClientRuntimeDescriptorById(serviceClientRuntimeIds[i]).getRequiredFacetVersions(); - - } - else - { - if (scenarios[i].equals(SERVICE_SIDE)) - { - rfvs = WebServiceRuntimeExtensionUtils2.getServiceRuntimeDescriptorById(serviceClientRuntimeIds[i]).getRequiredFacetVersions(); - } - else - { - rfvs = new RequiredFacetVersion[0]; - } - } - - CreateFacetedProjectCommand command = new CreateFacetedProjectCommand(); - command.setProjectName(name); - command.setTemplateId(templateIds[i]); - command.setRequiredFacetVersions(rfvs); - command.setServerFactoryId(serverTypes[i]); - IStatus status = command.execute( new NullProgressMonitor(), null ); - if (status.getSeverity() == Status.ERROR) - { - fail(); - } - - IProject project = ProjectUtilities.getProject(name); - FacetUtils.addRequiredFacetsToProject(project, rfvs, new NullProgressMonitor()); - } - } - - /** - * Tests project type filtering for the Axis Web service runtime. - * Tests cover all ServiceRuntimes and ClientRuntimes. - */ - public void testProjectTypeFiltering() - { - IFacetedProjectTemplate[] expectedTemplatesForAxisService = new IFacetedProjectTemplate[] {TEMPLATE_WEB}; - IFacetedProjectTemplate[] expectedTemplatesForAxisClientWeb = new IFacetedProjectTemplate[] {TEMPLATE_WEB}; - IFacetedProjectTemplate[] expectedTemplatesForAxisClientJava = new IFacetedProjectTemplate[] {TEMPLATE_UTILITY}; - - Set templatesForAxisService = FacetMatchCache.getInstance().getTemplatesForServiceRuntime(AXIS_SERVICE_RUNTIME); - assertEquals(expectedTemplatesForAxisService.length,templatesForAxisService.size()); - for (int i=0; i<expectedTemplatesForAxisService.length; i++) - { - assertTrue(templatesForAxisService.contains(expectedTemplatesForAxisService[i])); - } - Set templatesForAxisClientWeb = FacetMatchCache.getInstance().getTemplatesForClientRuntime(AXIS_CLIENT_RUNTIME_WEB); - assertEquals(expectedTemplatesForAxisClientWeb.length, templatesForAxisClientWeb.size()); - for (int i=0; i<expectedTemplatesForAxisClientWeb.length; i++) - { - assertTrue(templatesForAxisClientWeb.contains(expectedTemplatesForAxisClientWeb[i])); - } - Set templatesForAxisClientJava = FacetMatchCache.getInstance().getTemplatesForClientRuntime(AXIS_CLIENT_RUNTIME_JAVA); - assertEquals(expectedTemplatesForAxisClientJava.length, templatesForAxisClientJava.size()); - for (int i=0; i<expectedTemplatesForAxisClientJava.length; i++) - { - assertTrue(templatesForAxisClientJava.contains(expectedTemplatesForAxisClientJava[i])); - } - - - } -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java deleted file mode 100644 index 5441127d5..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/AccumulateStatusHandler.java +++ /dev/null @@ -1,100 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -import java.util.Vector; - -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Choice; -import org.eclipse.wst.common.environment.IStatusHandler; -import org.eclipse.wst.common.environment.StatusException; - -public class AccumulateStatusHandler implements IStatusHandler { - Vector statusList_; - - public AccumulateStatusHandler() - { - resetStatus(); - } - - /** - * Resets the status so that it starts out empty again. - * - */ - public void resetStatus() - { - statusList_ = new Vector(); - } - - public IStatus getStatus() - { - IStatus worstStatus = Status.OK_STATUS; - - // Find the worst error status code - for( int index = 0; index < statusList_.size(); index++ ) - { - IStatus status = (IStatus)statusList_.elementAt( index ); - - if( status.getSeverity() > worstStatus.getSeverity() ) - { - worstStatus = status; - } - } - - return StatusUtils.multiStatus( worstStatus.getMessage(), - (IStatus[])statusList_.toArray( new IStatus[0] ) ); - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[]) - */ - public Choice report(IStatus status, Choice[] choices) - { - Choice result = null; - - // Always take the first choice if available. - if( choices != null && choices.length > 0 ) - { - result = choices[0]; - } - - statusList_.add( status ); - - return result; - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status) - */ - public void report(IStatus status) throws StatusException - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportError(com.ibm.env.common.Status) - */ - public void reportError(IStatus status) - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportInfo(com.ibm.env.common.Status) - */ - public void reportInfo(IStatus status) - { - statusList_.add( status ); - } - -} diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java deleted file mode 100644 index d52cba00f..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/DynamicPopupJUnitWizard.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.widgets.CommandWidgetBinding; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager; -import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard; -import org.eclipse.wst.common.environment.ILog; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class DynamicPopupJUnitWizard extends DynamicPopupWizard { - private IStatusHandler handler_; - private ILog log_; - public DynamicPopupJUnitWizard(IStatusHandler handler) - { - handler_ = handler; - } - - public DynamicPopupJUnitWizard(IStatusHandler handler, ILog log) - { - handler_ = handler; - log_ = log; - } - - public void runHeadLess(IStructuredSelection selection,IRunnableContext context) { - - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler_ ); - if (log_!=null) - environment.setLog(log_); - - DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl(); - DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment ); - SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager); - - try - { - commandWidgetBinding_ = (CommandWidgetBinding)wizardElement_.createExecutableExtension( "class" ); - } - catch( CoreException exc ) - { - exc.printStackTrace(); - } - - commandWidgetBinding_.registerDataMappings( dataRegistry_ ); - - CommandFragment rootFragment = getRootFragment( selection, null ); - manager.setRootFragment( rootFragment ); - manager.runForwardToNextStop( context ); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java deleted file mode 100644 index 1ec8b4aee..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/JUnitUtils.java +++ /dev/null @@ -1,358 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -import java.lang.reflect.InvocationTargetException; -import java.util.Enumeration; - -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtension; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Status; -import org.eclipse.debug.core.ILaunchManager; -import org.eclipse.jface.operation.IRunnableWithProgress; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.jst.ws.internal.common.ServerUtils; -import org.eclipse.jst.ws.internal.consumption.command.common.CreateModuleCommand; -import org.eclipse.jst.ws.internal.consumption.ui.plugin.WebServiceConsumptionUIPlugin; -import org.eclipse.jst.ws.internal.consumption.ui.preferences.PersistentServerRuntimeContext; -import org.eclipse.jst.ws.internal.context.ScenarioContext; -import org.eclipse.jst.ws.internal.plugin.WebServicePlugin; -import org.eclipse.jst.ws.tests.plugin.TestsPlugin; -import org.eclipse.ui.PlatformUI; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; -import org.eclipse.wst.command.internal.env.context.PersistentActionDialogsContext; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.command.internal.env.core.context.ResourceContext; -import org.eclipse.wst.command.internal.env.preferences.ActionDialogPreferenceType; -import org.eclipse.wst.command.internal.env.ui.eclipse.EnvironmentUtils; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.server.core.IModule; -import org.eclipse.wst.server.core.IRuntime; -import org.eclipse.wst.server.core.IRuntimeType; -import org.eclipse.wst.server.core.IRuntimeWorkingCopy; -import org.eclipse.wst.server.core.IServer; -import org.eclipse.wst.server.core.IServerType; -import org.eclipse.wst.server.core.IServerWorkingCopy; -import org.eclipse.wst.server.core.ServerCore; -import org.eclipse.wst.server.core.ServerUtil; -import org.eclipse.wst.ws.internal.plugin.WSPlugin; -import org.eclipse.wst.ws.internal.preferences.PersistentWSIContext; - - -public class JUnitUtils { - // Begin Server Utilities - public static IRuntime createServerRuntime(String runtimeTypeId,String serverInstallPath) throws Exception - { - IRuntimeType rt = ServerCore.findRuntimeType(runtimeTypeId); - IRuntimeWorkingCopy wc = rt.createRuntime("aRuntime", null); - wc.setLocation(new Path(serverInstallPath)); - - return wc.save(true, null); - } - - public static IServer createServer(String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - IServerType serverType = ServerCore.findServerType(serverTypeId); - IServer[] servers = ServerCore.getServers(); - for (int i=0;i<servers.length;i++){ - if(servers[i].getServerType().getId().equals(serverType.getId())){ - return servers[i]; - } - } - - IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor ); - serverWc.setName(name); - serverWc.setRuntime(runtime); - IServer server = serverWc.saveAll(true, monitor ); - return server; - } - - /** - * createServer and install JRE for Servers requiring a specific JRE - * @param javaRuntimePath JRE install location; i.e. E:\\Java141 - * @param jreID JRE id; i.e. java141 - * @param name server name - * @param serverTypeId server type id - * @param runtime IRuntime - * @param env IEnvironment - * @return server IServer - * @throws Exception - * - * @deprecated - */ - public static IServer createServer(String javaRuntimePath, String jreID, String name,String serverTypeId,IRuntime runtime,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - IServerType serverType = ServerCore.findServerType(serverTypeId); - IServer[] servers = ServerCore.getServers(); - for (int i=0;i<servers.length;i++){ - if(servers[i].getServerType().getId().equals(serverType.getId())){ - return servers[i]; - } - } - - IServerWorkingCopy serverWc = serverType.createServer(serverTypeId,null, monitor ); - serverWc.setName(name); - serverWc.setRuntime(runtime); - - IServer server = serverWc.saveAll(true, monitor ); - - return server; - } - - public static void startServer(IServer server,IEnvironment env) throws Exception - { - final IServer currentServer = server; - IRunnableWithProgress runnable = new IRunnableWithProgress() - { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - try - { - currentServer.start(ILaunchManager.RUN_MODE, monitor ); - } - catch (CoreException e) - { - InterruptedException wrapper = new InterruptedException(e.getMessage()); - wrapper.setStackTrace(e.getStackTrace()); - throw wrapper; - } - } - }; - PlatformUI.getWorkbench().getProgressService().run(true,false,runnable); - } - - public static boolean removeEARFromServer(IServer server,IProject earProject,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - int numberOfModules = server.getModules().length; - if (server != null) - { - final IModule earProjectModule = ServerUtil.getModule(earProject); - final IModule[] modules = {earProjectModule}; - new ServerUtils().modifyModules(env, server,earProjectModule,false, monitor ); - final IServer currentServer = server; - IRunnableWithProgress runnable = new IRunnableWithProgress() - { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - for (int i=0;i<1000;i++) - { - int moduleState = currentServer.getModuleState(modules); - if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING) - { - try - { - Thread.sleep(300); - } - catch (InterruptedException e) - { - e.printStackTrace(System.err); - } - } - else - break; - } - } - }; - PlatformUI.getWorkbench().getProgressService().run(true,false,runnable); - return (server.getModules().length == (numberOfModules-1)); - } - return false; - } - - public static boolean removeModuleFromServer(IServer server, IProject webProject, IEnvironment env, IProgressMonitor monitor ) throws Exception { - - int numberOfModules = server.getModules().length; - if (server != null) - { - final IModule webProjectModule = ServerUtil.getModule(webProject); - final IModule[] modules = {webProjectModule}; - - new ServerUtils().modifyModules(env, server,webProjectModule,false, monitor ); - final IServer currentServer = server; - IRunnableWithProgress runnable = new IRunnableWithProgress() - { - public void run(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException - { - for (int i=0;i<1000;i++) - { - int moduleState = currentServer.getModuleState(modules); - if (moduleState == IServer.STATE_STARTED || moduleState == IServer.STATE_STOPPING) - { - try - { - Thread.sleep(300); - } - catch (InterruptedException e) - { - e.printStackTrace(System.err); - } - } - else - break; - } - } - }; - PlatformUI.getWorkbench().getProgressService().run(true,false,runnable); - //Thread.sleep(6000); - return (server.getModules().length == (numberOfModules-1)); - } - return false; - } - - // Begin: General Eclipse Utilities - - public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - project.build(IncrementalProjectBuilder.FULL_BUILD, monitor ); - WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand(); - cmd.setEnvironment( env ); - cmd.execute( monitor, null ); - } - - private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString); - while (e.hasMoreElements()) - { - String filePath = (String)e.nextElement(); - if (filePath.endsWith("/")) - copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor ); - else - { - IPath fileIPath = new Path(filePath); - FileResourceUtils.copyFile(EnvironmentUtils.getResourceContext(env), - TestsPlugin.getDefault(), - fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir> - (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir> - destFolder.getFullPath(), - monitor, - env.getStatusHandler()); - } - } - } - - public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - String pathString = "/data/"+dataSubdirectory; - copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor); - - } - - // Begin: Web Services Utilities - public static void hideActionDialogs() - { - PersistentActionDialogsContext actionDialogsCtx = PersistentActionDialogsContext.getInstance(); - ActionDialogPreferenceType[] actionDialogPrefs = actionDialogsCtx.getDialogs(); - for (int i=0;i<actionDialogPrefs.length;i++) - actionDialogsCtx.setActionDialogEnabled(actionDialogPrefs[i].getId(),true); - } - - - public static boolean enableProxyGeneration(boolean enable) - { - ScenarioContext ctx = WebServicePlugin.getInstance().getScenarioContext(); - boolean previousSetting = ctx.getGenerateProxy(); - ctx.setGenerateProxy(enable); - return previousSetting; - } - - public static boolean enableOverwrite(boolean enable) - { - ResourceContext ctx = WebServicePlugin.getInstance().getResourceContext(); - boolean previousSetting = ctx.isOverwriteFilesEnabled(); - ctx.setOverwriteFilesEnabled(enable); - return previousSetting; - } - - public static void disableWSIDialog(IProject project){ - - PersistentWSIContext ctx = WSPlugin.getInstance().getWSIAPContext(); - ctx.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI); - - PersistentWSIContext ctx2 = WSPlugin.getInstance().getWSISSBPContext(); - ctx2.updateProjectWSICompliances(project, PersistentWSIContext.IGNORE_NON_WSI); - - } - - public static void setWSRuntimeServer(String wsRuntimeId,String serverTypeId) - { - PersistentServerRuntimeContext serverRuntimeCtx = WebServiceConsumptionUIPlugin.getInstance().getServerRuntimeContext(); - serverRuntimeCtx.setRuntimeId(wsRuntimeId); - serverRuntimeCtx.setServerFactoryId(serverTypeId); - } - - private static IStatus launchWizard(String pluginNS,String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - IExtension[] extensions = Platform.getExtensionRegistry().getExtensionPoint("org.eclipse.ui.popupMenus").getExtensions(); - for (int i=0;i<extensions.length;i++) - { - if (extensions[i].getNamespace().equals(pluginNS)); - { - IConfigurationElement[] configElements = extensions[i].getConfigurationElements(); - for (int j=0;j<configElements.length;j++) - { - if (configElements[j].getAttribute("id").equals(wizardId) && configElements[j].getAttribute("objectClass").equals(objectClassId)) - { - IConfigurationElement actionElement = configElements[j].getChildren()[0]; - AccumulateStatusHandler statusHandler = new AccumulateStatusHandler(); - DynamicPopupJUnitWizard wizard = new DynamicPopupJUnitWizard(statusHandler); - wizard.setInitializationData(actionElement,null,null); - wizard.selectionChanged(null,initialSelection); - wizard.run(null); - return statusHandler.getStatus(); - } - } - } - } - return StatusUtils.errorStatus( "No wizard found for: " ); - } - - public static IStatus launchCreationWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - return launchWizard("org.eclipse.jst.ws.creation.ui",wizardId,objectClassId,initialSelection); - } - - public static IStatus launchConsumptionWizard(String wizardId,String objectClassId,IStructuredSelection initialSelection) throws Exception - { - return launchWizard("org.eclipse.jst.ws.internal.consumption.ui",wizardId,objectClassId,initialSelection); - } - - public static IStatus createWebModule(String webProjectName, String moduleName, String serverFactoryId, String j2eeVersion, IEnvironment env, IProgressMonitor monitor ){ - - IStatus status = Status.OK_STATUS; - try{ - CreateModuleCommand createWeb = new CreateModuleCommand(); - createWeb.setProjectName(webProjectName); - createWeb.setModuleName(moduleName); - createWeb.setModuleType(CreateModuleCommand.WEB); - createWeb.setJ2eeLevel(j2eeVersion); - createWeb.setServerFactoryId(serverFactoryId); - createWeb.setEnvironment( env ); - return createWeb.execute( monitor, null ); - } - catch (Exception e){ - status = StatusUtils.errorStatus( e ); - } - return status; - - } - -}
\ No newline at end of file diff --git a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java deleted file mode 100644 index 015fa39dc..000000000 --- a/tests/org.eclipse.jst.ws.tests/tests/org/eclipse/jst/ws/tests/util/ScenarioConstants.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.jst.ws.tests.util; - -public class ScenarioConstants { - // Bottom up Java or EJB to Web Service wizard ID. - public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard"; - - // Top down WSDL to Skeleton Web Service wizard ID. - public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard"; - - // Web Service client wizard ID. - public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard"; - - // Object class for: - // 1) Java source (bottom-up) - // 2) WSDL or WSIL (top-down or client). - public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile"; - - // Object class for Java compilation units (i.e. Java classes selected in the Java perspective). - public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit"; - - // Object class for a service selected in the J2EE perspective (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service"; - - // Object class for a WSDLResourceImpl (top-down or client). - public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl"; - - // Object class for a ServiceRef (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"; - - // Object class for a ServiceImplBean (bottom-up). - public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"; - - // Object class for a BeanLink (bottom-up). - public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"; -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/.classpath b/tests/org.eclipse.wst.ws.tests/.classpath deleted file mode 100644 index 9f4b4d1d5..000000000 --- a/tests/org.eclipse.wst.ws.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="tests"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.ws.tests/.cvsignore b/tests/org.eclipse.wst.ws.tests/.cvsignore deleted file mode 100644 index 57763eb9b..000000000 --- a/tests/org.eclipse.wst.ws.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -tests.jar diff --git a/tests/org.eclipse.wst.ws.tests/.project b/tests/org.eclipse.wst.ws.tests/.project deleted file mode 100644 index 55f2bcd81..000000000 --- a/tests/org.eclipse.wst.ws.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.ws.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 0fd1048cf..000000000 --- a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,57 +0,0 @@ -#Mon Jan 30 10:29:14 EST 2006 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.4 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning -org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning -org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.deprecation=ignore -org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled -org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled -org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore -org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore -org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning -org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore -org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning -org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning -org.eclipse.jdt.core.compiler.problem.forbiddenReference=error -org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning -org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning -org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore -org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore -org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore -org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning -org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore -org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning -org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning -org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning -org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore -org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning -org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore -org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled -org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning -org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled -org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore -org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning -org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning -org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore -org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning -org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore -org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore -org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore -org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled -org.eclipse.jdt.core.compiler.problem.unusedImport=warning -org.eclipse.jdt.core.compiler.problem.unusedLocal=warning -org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled -org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled -org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning -org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.3 diff --git a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs deleted file mode 100644 index 9e87a8a85..000000000 --- a/tests/org.eclipse.wst.ws.tests/.settings/org.eclipse.pde.prefs +++ /dev/null @@ -1,13 +0,0 @@ -#Mon Apr 24 10:27:54 EDT 2006 -compilers.p.build=1 -compilers.p.deprecated=1 -compilers.p.no-required-att=0 -compilers.p.not-externalized-att=1 -compilers.p.unknown-attribute=0 -compilers.p.unknown-class=0 -compilers.p.unknown-element=1 -compilers.p.unknown-resource=0 -compilers.p.unresolved-ex-points=0 -compilers.p.unresolved-import=0 -compilers.use-project=true -eclipse.preferences.version=1 diff --git a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF deleted file mode 100644 index b415c407f..000000000 --- a/tests/org.eclipse.wst.ws.tests/META-INF/MANIFEST.MF +++ /dev/null @@ -1,31 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: %PLUGIN_NAME -Bundle-SymbolicName: org.eclipse.wst.ws.tests -Bundle-Version: 1.0.100 -Bundle-Activator: org.eclipse.wst.ws.tests.plugin.TestsPlugin -Bundle-Vendor: %PLUGIN_PROVIDER -Bundle-Localization: plugin -Require-Bundle: org.eclipse.wst.ws, - org.eclipse.core.runtime, - org.junit, - org.eclipse.core.resources, - org.eclipse.debug.core, - org.eclipse.jem.util, - org.eclipse.jface, - org.eclipse.ui, - org.eclipse.wst.command.env, - org.eclipse.wst.command.env.core, - org.eclipse.wst.common.frameworks, - org.eclipse.wst.server.core, - org.eclipse.wst.ws.ui, - org.eclipse.wst.command.env.ui, - org.eclipse.wst.common.environment, - org.eclipse.emf.ecore, - org.eclipse.emf.ecore.xmi -Eclipse-LazyStart: true -Export-Package: org.eclipse.wst.ws.tests.data, - org.eclipse.wst.ws.tests.plugin, - org.eclipse.wst.ws.tests.unittest, - org.eclipse.wst.ws.tests.util -Bundle-ClassPath: tests.jar diff --git a/tests/org.eclipse.wst.ws.tests/about.html b/tests/org.eclipse.wst.ws.tests/about.html deleted file mode 100644 index 4ec598958..000000000 --- a/tests/org.eclipse.wst.ws.tests/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>May 2, 2006</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/tests/org.eclipse.wst.ws.tests/build.properties b/tests/org.eclipse.wst.ws.tests/build.properties deleted file mode 100644 index f64a07bf5..000000000 --- a/tests/org.eclipse.wst.ws.tests/build.properties +++ /dev/null @@ -1,10 +0,0 @@ -bin.includes = data/,\ - plugin.xml,\ - readme.txt,\ - tests.jar,\ - META-INF/,\ - test.xml,\ - about.html -jars.compile.order = tests.jar -source.tests.jar = tests/ -output.tests.jar = bin/ diff --git a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl b/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl deleted file mode 100644 index 0bd31ca44..000000000 --- a/tests/org.eclipse.wst.ws.tests/data/locator/test.wsdl +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://tempuri.org/AreaService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="AreaService" targetNamespace="http://tempuri.org/AreaService/"> - <wsdl:types> - <xsd:schema targetNamespace="http://tempuri.org/AreaService/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - <xsd:element name="area" type="xsd:float"/> - <xsd:element name="parameters" type="tns:dimensions"/> - <xsd:complexType name="dimensions"> - <xsd:sequence> - <xsd:element name="width" type="xsd:float"></xsd:element> - <xsd:element name="height" type="xsd:float"></xsd:element> - </xsd:sequence> - </xsd:complexType> - - </xsd:schema> - </wsdl:types> - <wsdl:message name="CalculateRectAreaResponse"> - <wsdl:part element="tns:area" name="area"/> - </wsdl:message> - <wsdl:message name="CalculateRectAreaRequest"> - <wsdl:part element="tns:parameters" name="parameters"/> - </wsdl:message> - <wsdl:portType name="AreaService"> - <wsdl:operation name="CalculateRectArea"> - <wsdl:input message="tns:CalculateRectAreaRequest"/> - <wsdl:output message="tns:CalculateRectAreaResponse"/> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="AreaServiceSOAP" type="tns:AreaService"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="CalculateRectArea"> - <soap:operation soapAction="http://tempuri.org/AreaService/NewOperation"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="AreaService"> - <wsdl:port binding="tns:AreaServiceSOAP" name="AreaServiceSOAP"> - <soap:address location="http://tempuri.org"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> diff --git a/tests/org.eclipse.wst.ws.tests/plugin.properties b/tests/org.eclipse.wst.ws.tests/plugin.properties deleted file mode 100644 index 2933ec177..000000000 --- a/tests/org.eclipse.wst.ws.tests/plugin.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2006 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -# yyyymmdd bug Email and other contact information -# -------- -------- ----------------------------------------------------------- -# 20060424 138060 kathy@ca.ibm.com - Kathy Chan -############################################################################### - -# -# Messages in plugin.xml. -# -PLUGIN_NAME=WST Web Services Test -PLUGIN_PROVIDER=Eclipse.org diff --git a/tests/org.eclipse.wst.ws.tests/plugin.xml b/tests/org.eclipse.wst.ws.tests/plugin.xml deleted file mode 100644 index 8c7e48a06..000000000 --- a/tests/org.eclipse.wst.ws.tests/plugin.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> - -<plugin> - -</plugin> diff --git a/tests/org.eclipse.wst.ws.tests/readme.txt b/tests/org.eclipse.wst.ws.tests/readme.txt deleted file mode 100644 index 91de03792..000000000 --- a/tests/org.eclipse.wst.ws.tests/readme.txt +++ /dev/null @@ -1,2 +0,0 @@ -Currently no arguments to be passed in. See org.eclipse.jst.ws.tests for adding -arguments when running test suite (i.e. server install location...) diff --git a/tests/org.eclipse.wst.ws.tests/test.xml b/tests/org.eclipse.wst.ws.tests/test.xml deleted file mode 100644 index f291ace0f..000000000 --- a/tests/org.eclipse.wst.ws.tests/test.xml +++ /dev/null @@ -1,52 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.."/> --> - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.ws.tests"/> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/> - <!-- commented for now until such a time as we need to call a server for wst tests --> - <!--<property name="extraVMargs" value="-Dorg.eclipse.jst.server.tomcat.50=${testDir}/${tomcat50Dir}"/> --> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org*.xml"/> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="wst-ws-folder" value="${eclipse-home}/wst_ws_folder"/> - <delete dir="${wst-folder}" quiet="true"/> - <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${wst-ws-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.ws.tests.unittest.AllWSJUnitTests" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> -<!-- <property name="extraVMargs" value="${extraVMargs}"/> --> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org*.xml"/> - <property name="output-file" value="${plugin-name}.xml"/> - </ant> - </target> -</project> diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java deleted file mode 100644 index f455fa9c3..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/data/LocatorWorkspaceSetup.java +++ /dev/null @@ -1,176 +0,0 @@ -package org.eclipse.wst.ws.tests.data; - -import java.io.IOException; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IContainer; -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IResourceVisitor; -import org.eclipse.core.resources.IWorkspaceRoot; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.Platform; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.intro.IIntroManager; -import org.eclipse.ui.intro.IIntroPart; -import org.eclipse.wst.ws.tests.plugin.TestsPlugin; - -/** - * @author joan - * Sets up locator test data - uses same data file but renames it for each use - * Workspace structure created looks like this: - * - * root - * --project1 - * |----folder1 - * |-----folder2 - * |------one.wsdl - * |-----two.wsdl - * |----folder3 - * |-----three.wsdl - * |-----four.wsdl - * --project2 - * |----five.wsdl - * |----folder4 - * |----folder5 - * |-----six.wsdl - * --project3 - * |----one.xml - */ - -public class LocatorWorkspaceSetup extends TestCase { - - public static String PROJECT1_NAME = "Project1"; - public static String FOLDER1_NAME = "Folder1"; //contains WSDL file and one folder - public static String FOLDER2_NAME = "Folder2"; //nested in folder 1 and contains WSDL file - public static String FOLDER3_NAME = "Folder3"; //contains two WSDL files - public static String PROJECT2_NAME = "Project2"; //contains WSDL file and two folders - public static String FOLDER4_NAME = "Folder4"; //contains no WSDL - public static String FOLDER5_NAME = "Folder5"; //contains one WSDL file - public static String PROJECT3_NAME = "Project3"; //contains no WSDL files but one XML file - - public static String WSDLFILE_ONE = "one.wsdl"; - public static String WSDLFILE_TWO = "two.wsdl"; - public static String WSDLFILE_THREE = "three.wsdl"; - public static String WSDLFILE_FOUR = "four.wsdl"; - public static String WSDLFILE_FIVE = "five.wsdl"; - public static String WSDLFILE_SIX = "six.wsdl"; - public static String XMLFILE_ONE = "one.XML"; - - public static String ACTUAL_TESTFILEPATH = "data/locator/test.wsdl"; - - private IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot(); - - public static Test suite() - { - return new TestSuite(LocatorWorkspaceSetup.class, "LocatorWorkspaceSetup"); - } - - protected void closeIntro() - { - IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager(); - IIntroPart introPart = introManager.getIntro(); - if (introPart != null) - introManager.closeIntro(introPart); - } - - protected IProject createSimpleProject(String name) throws CoreException - { - IProject simpleProject = root.getProject(name); - simpleProject.create(null); - simpleProject.open(null); - return simpleProject; - } - - protected IFolder createFolder(IContainer parent, String folderName) throws CoreException - { - IFolder folder1 = parent.getFolder(new Path(folderName)); - folder1.create(false, true, null); - return folder1; - } - - - protected void copyFile(IContainer project, String source, String dest) throws IOException, CoreException - { - - IFile file = project.getFile(new Path(dest)); - file.create(TestsPlugin.getDefault().getBundle().getEntry(source).openStream(), true, null); - Assert.assertTrue(file.exists()); - } - - protected void joinAutoBuild() throws CoreException - { - boolean interrupted = true; - while (interrupted) - { - try - { - Platform.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD, null); - interrupted = false; - } - catch (InterruptedException e) - { - interrupted = true; - } - } - } - - public void testSetup() throws Exception - { - try{ - System.out.println("------ locator data setup starting"); - closeIntro(); - - IProject project1 = createSimpleProject(PROJECT1_NAME); - IFolder folder1 = createFolder(project1, FOLDER1_NAME); - copyFile(folder1, ACTUAL_TESTFILEPATH, WSDLFILE_TWO); - IFolder folder2 = createFolder(folder1, FOLDER2_NAME); - copyFile(folder2, ACTUAL_TESTFILEPATH, WSDLFILE_ONE); - IFolder folder3 = createFolder(project1, FOLDER3_NAME); - copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_THREE); - copyFile(folder3, ACTUAL_TESTFILEPATH, WSDLFILE_FOUR); - - IProject project2 = createSimpleProject(PROJECT2_NAME); - copyFile(project2, ACTUAL_TESTFILEPATH, WSDLFILE_FIVE); - createFolder(project2, FOLDER4_NAME); //folder with no content - IFolder folder5 = createFolder(project2, FOLDER5_NAME); - copyFile(folder5, ACTUAL_TESTFILEPATH, WSDLFILE_SIX); - IProject project3 = createSimpleProject(PROJECT3_NAME); - copyFile(project3, ACTUAL_TESTFILEPATH, XMLFILE_ONE); - } - catch (Exception e) - { - e.printStackTrace(); - } - - //code to check workspace set up - debug - /*DataResourceVisitor visitor = new DataResourceVisitor(); - root.accept(visitor); - visitor.visit(root);*/ - - System.out.println("------ locator data setup complete"); - } - - protected class DataResourceVisitor implements IResourceVisitor - { - public boolean visit(IResource resource) throws CoreException { - if ((resource instanceof IProject) || (resource instanceof IFolder)) - { - System.out.println("visiting " + resource.getName()); - } - else if (resource instanceof IFile) - { - System.out.println("found file " + resource.getName()); - } - return true; - } - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java deleted file mode 100644 index da56b67d2..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/plugin/TestsPlugin.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.eclipse.wst.ws.tests.plugin; - -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.BundleContext; - -/** - * The main plugin class to be used in the desktop. - */ -public class TestsPlugin extends Plugin { - //The shared instance. - private static TestsPlugin plugin; - - /** - * The constructor. - */ - public TestsPlugin() { - super(); - plugin = this; - } - - /** - * 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; - } - - /** - * Returns the shared instance. - */ - public static TestsPlugin getDefault() { - return plugin; - } - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java deleted file mode 100644 index c4baf9f2e..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/AllWSJUnitTests.java +++ /dev/null @@ -1,90 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import org.eclipse.wst.ws.tests.data.LocatorWorkspaceSetup; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; -import junit.textui.TestRunner; - -/** - * This class is to run all the unittest tests. - */ -public class AllWSJUnitTests extends TestCase -{ - /** - * Method parseArgs. - * - * @param args - */ - private void parseArgs(Object args) - { - // typicially args is an array of strings, - // not sure when it wouldn't be. - } - - public static void main(String[] args) - { - new AllWSJUnitTests().runMain(args); - } - - public Object runMain(Object args) - { - Object result = null; - try - { - TestRunner testRunner = null; - - parseArgs(args); - - testRunner = new TestRunner(System.out); - - - Test suite = suite(); - TestResult testResult = testRunner.doRun(suite, false); - printHeader(testResult); - } - catch (Exception e) - { - result = e; - } - - return result; - } - - public static Test suite() - { - TestSuite testSuite = new TestSuite(); - //add unit tests to suite here... - testSuite.addTest( LocatorWorkspaceSetup.suite()); - testSuite.addTest( WebServiceFinderTests.suite()); - return testSuite; - } - - /** - * Prints the header of the report - */ - protected void printHeader(TestResult result) - { - if (result.wasSuccessful()) - { - System.out.println(); - System.out.print("OK"); - System.out.println(" (" + result.runCount() + " tests)"); - - } - else - { - System.out.println(); - System.out.println("FAILURES!!!"); - System.out.println( - "Tests run: " - + result.runCount() - + ", Failures: " - + result.failureCount() - + ", Errors: " - + result.errorCount()); - } - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java deleted file mode 100644 index 3a6efe7b2..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/LaunchTest.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import org.eclipse.core.runtime.IPlatformRunnable; - -/** - * Minimal app to run as Eclipse "application" - */ -public class LaunchTest implements IPlatformRunnable -{ - /** - * @see org.eclipse.core.runtime.IPlatformRunnable#run(Object) - */ - public Object run(Object args) throws Exception - { - - Object result = new AllWSJUnitTests().runMain(args); - - if (result != null) - { - if (result instanceof Throwable) - { - ((Throwable) result).printStackTrace(); - } - else - { - System.out.println("tests didn't return 'ok'"); - } - return result; - } - else - return IPlatformRunnable.EXIT_OK; - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java deleted file mode 100644 index 015e3f016..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/RegistryTests.java +++ /dev/null @@ -1,275 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import java.io.File; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.EList; -import org.eclipse.wst.ws.internal.model.v10.registry.Name; -import org.eclipse.wst.ws.internal.model.v10.registry.Registry; -import org.eclipse.wst.ws.internal.model.v10.registry.RegistryFactory; -import org.eclipse.wst.ws.internal.model.v10.taxonomy.Category; -import org.eclipse.wst.ws.internal.model.v10.taxonomy.Taxonomy; -import org.eclipse.wst.ws.internal.model.v10.taxonomy.TaxonomyFactory; -import org.eclipse.wst.ws.internal.model.v10.uddiregistry.Taxonomies; -import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistry; -import org.eclipse.wst.ws.internal.model.v10.uddiregistry.UDDIRegistryFactory; -import org.eclipse.wst.ws.internal.registry.IRegistryManager; -import org.eclipse.wst.ws.internal.registry.RegistryService; -import org.eclipse.wst.ws.internal.registry.UDDIRegistryService; - -public class RegistryTests extends TestCase -{ - public static Test suite () - { - return new TestSuite(RegistryTests.class); - } - - /** - * Creates a new Taxonomy model and passes it to - * <code>RegistryService.saveTaxonomy()</code> - * where the model is persisted to a platform - * specified temporary filesystem location. - */ - public void test_RegistryService_saveTaxonomy () - { - System.out.println("STARTING test_RegistryService_saveTaxonomy"); - try - { - System.out.println("Creating RegistryService and Taxonomy"); - RegistryService registryService = RegistryService.instance(); - Taxonomy taxonomy = registryService.newTaxonomy(); - - System.out.println("Building a simple Taxonomy model"); - taxonomy.setId("my.taxonomy"); - taxonomy.setName("My Taxonomy"); - EList list = taxonomy.getCategory(); - Category category1 = TaxonomyFactory.eINSTANCE.createCategory(); - category1.setName("My first category"); - category1.setCode("1"); - Category category2 = TaxonomyFactory.eINSTANCE.createCategory(); - category2.setName("My second category"); - category2.setCode("2"); - Category category3 = TaxonomyFactory.eINSTANCE.createCategory(); - category3.setName("My third category"); - category3.setCode("2.1"); - category2.getCategory().add(category3); - list.add(category1); - list.add(category2); - - File file = File.createTempFile("taxonomy.",".xml"); - System.out.println("Saving the Taxonomy model to "+file.getCanonicalPath()); - registryService.saveTaxonomy(file.toURL(),taxonomy); - } - catch (Throwable exc) - { - exc.printStackTrace(); - fail("Unexpected Throwable ["+exc.getMessage()+"]"); - } - finally - { - System.out.println("FINISHED test_RegistryService_saveTaxonomy\n"); - } - } - - /** - * Creates a new UDDI Registry model and passes it to - * <code>RegistryService.saveRegistry()</code> - * where the model is persisted to a platform - * specified temporary filesystem location. - */ - public void test_RegistryService_saveRegistry () - { - System.out.println("STARTING test_RegistryService_saveRegistry"); - try - { - System.out.println("Creating RegistryService, UDDIRegistryService and Registry"); - RegistryService registryService = RegistryService.instance(); - UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance(); - UDDIRegistry uddiRegistry = uddiRegistryService.newUDDIRegistry(); - - System.out.println("Building a simple Registry model"); - uddiRegistry.setId("my.registry"); - uddiRegistry.setVersion("2.0"); - uddiRegistry.setDiscoveryURL("http://some.discovery.url"); - uddiRegistry.setPublicationURL("http://some.publication.url"); - uddiRegistry.setDefaultLogin("hockeyfanatic"); - Name name = RegistryFactory.eINSTANCE.createName(); - name.setValue("My Registry"); - uddiRegistry.getName().add(name); - Taxonomy taxonomyRef = registryService.newTaxonomy(); - taxonomyRef.setRef("my.taxonomy"); - Taxonomies t = uddiRegistry.getTaxonomies(); - if (t == null) - { - t = UDDIRegistryFactory.eINSTANCE.createTaxonomies(); - uddiRegistry.setTaxonomies(t); - } - EList e = t.getTaxonomy(); - e.add(taxonomyRef); - - File file = File.createTempFile("registry.",".xml"); - System.out.println("Saving the Registry model to "+file.getCanonicalPath()); - registryService.saveRegistry(file.toURL(),uddiRegistry); - } - catch (Throwable exc) - { - exc.printStackTrace(); - fail("Unexpected Throwable ["+exc.getMessage()+"]"); - } - finally - { - System.out.println("FINISHED test_RegistryService_saveRegistry\n"); - } - } - - /** - * Creates a new UDDI Registry model and a new Taxonomy - * model, associates the latter with the former, and - * drives <code>IRegistryManager.saveRegistry()</code> - * to save the models and the index document to the - * preferred location of the default registry manager. - */ - public void test_RegistryManager_saveRegistry() - { - System.out.println("STARTING test_RegistryManager_saveRegistry"); - try { - System.out.println("Creating RegistryService and Getting RegistryManager"); - RegistryService registryService = RegistryService.instance(); - IRegistryManager regManager = registryService.getDefaultRegistryManager(); - System.out.println("The location of the default index is " + regManager.getURL()); - - //build the hockey taxonomy - System.out.println("Building the hockey Taxonomy model"); - Taxonomy hockeyTaxonomy = registryService.newTaxonomy(); - hockeyTaxonomy.setId("hockey.taxonomy"); - hockeyTaxonomy.setName("hockey Taxonomy"); - EList list = hockeyTaxonomy.getCategory(); - Category category1 = TaxonomyFactory.eINSTANCE.createCategory(); - Category category4 = TaxonomyFactory.eINSTANCE.createCategory(); - category4.setName("Pro"); - category4.setCode("4"); - Category category5 = TaxonomyFactory.eINSTANCE.createCategory(); - category5.setName("AHL"); - category5.setCode("4.1"); - Category category6 = TaxonomyFactory.eINSTANCE.createCategory(); - category6.setName("NHL"); - category6.setCode("4.2"); - category1.setName("Junior"); - category1.setCode("1"); - Category category2 = TaxonomyFactory.eINSTANCE.createCategory(); - category2.setName("Midget"); - category2.setCode("2"); - Category category3 = TaxonomyFactory.eINSTANCE.createCategory(); - category3.setName("Bantam"); - category3.setCode("3"); - category4.getCategory().add(category5); - category4.getCategory().add(category6); - list.add(category1); - list.add(category2); - list.add(category3); - list.add(category4); - - //save the hockey taxonomy - Taxonomy hockeyTaxonomyRef = regManager.saveTaxonomy(hockeyTaxonomy); - - //make the hockey registry - System.out.println("Building the hockey Registry model"); - UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance(); - UDDIRegistry uddiRegistry = uddiRegistryService.newUDDIRegistry(); - uddiRegistry.setId("hockey.registry"); - uddiRegistry.setVersion("2.0"); - uddiRegistry.setDefaultLogin("hockeyfanatic"); - uddiRegistry.setDiscoveryURL("http://some.discovery.url"); - uddiRegistry.setPublicationURL("http://some.publication.url"); - Name name = RegistryFactory.eINSTANCE.createName(); - name.setValue("Hockey Registry"); - uddiRegistry.getName().add(name); - - // Add the reference to the taxonomy (saved above) to the registry. - uddiRegistryService.addTaxonomy(uddiRegistry,hockeyTaxonomyRef); - - /* - UDDITaxonomyFinder UITFinder = new UDDITaxonomyFinder(); - regManager.addTaxonomyFinder(uddiRegistry.getClass().getName(),UITFinder); - */ - // Save the thing. - System.out.println("Saving the hockey Registry model"); - regManager.saveRegistry(uddiRegistry); - } - catch (Throwable exc) - { - exc.printStackTrace(); - fail("Unexpected Throwable ["+exc.getMessage()+"]"); - } - finally - { - System.out.println("FINISHED test_RegistryManager_saveRegistry\n"); - } - } - - /** - * Loads the registry and taxonomy in the index created in - * test_RegistryManager_saveRegistry, then asserts that the - * content of the model is what we expect. - */ - public void test_RegistryManager_loadRegistry() - { - System.out.println("STARTING test_RegistryManager_loadRegistry"); - try { - // Setup - System.out.println("Creating RegistryService and Getting RegistryManager"); - RegistryService registryService = RegistryService.instance(); - IRegistryManager regManager = registryService.getDefaultRegistryManager(); - - // Get the one registry URI we expect, and load the registry. - String[] registries = regManager.getRegistryURIs(); - assertEquals("Unexpected number of registries "+registries.length,registries.length,1); - String uri = registries[0]; - System.out.println("Loading registry " + uri); - Registry registry = regManager.loadRegistry(uri); - System.out.println("Found registry " + registry.getId()); - assertEquals("Did not find hockey registry","hockey.registry",registry.getId()); - - // It's supposed to be a UDDI registry. Verify it and check its values. - assertTrue("Registry is not a UDDIRegistry",(registry instanceof UDDIRegistry)); - UDDIRegistry uddiRegistry = (UDDIRegistry)registry; - assertEquals(uddiRegistry.getVersion(),"2.0"); - assertEquals(uddiRegistry.getDefaultLogin(),"hockeyfanatic"); - assertEquals(uddiRegistry.getDiscoveryURL(),"http://some.discovery.url"); - assertEquals(uddiRegistry.getPublicationURL(),"http://some.publication.url"); - - // Load the taxonomies used the UDDI registry. - UDDIRegistryService uddiRegistryService = UDDIRegistryService.instance(); - Taxonomy[] taxonomies = regManager.loadTaxonomies(uddiRegistryService.getTaxonomyURIs(uddiRegistry)); - assertEquals("Unexpected number of taxonomies "+taxonomies.length,taxonomies.length,1); - Taxonomy taxonomy = taxonomies[0]; - System.out.println("Found taxonomy " + taxonomy.getId()); - Assert.assertEquals("Did not find hockey taxonomy","hockey.taxonomy",taxonomy.getId()); - - // Dump out the values (no assertions here). - EList cList = taxonomy.getCategory(); - for(int i = 0;i<cList.size();i++){ - Category category = (Category)cList.get(i); - System.out.println("Found category " + category.getName()); - EList c2List = category.getCategory(); - for(int j = 0;j<c2List.size();j++){ - Category iCategory = (Category)c2List.get(j); - System.out.println("Found subcategory " + iCategory.getName()); - } - } - } - catch(Throwable t) - { - t.printStackTrace(); - fail("Unexpected Throwable ["+t.getMessage()+"]"); - } - finally - { - System.out.println("FINISHED test_RegistryManager_loadRegistry\n"); - } - } -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java deleted file mode 100644 index 084d082cb..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/ResourceUtilsTests.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author sengpl - * - */ -public class ResourceUtilsTests extends TestCase implements WSJUnitConstants{ - - - public static Test suite(){ - return new TestSuite(ResourceUtilsTests.class); - } - - - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java deleted file mode 100644 index fce5ff980..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WSJUnitConstants.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.eclipse.wst.ws.tests.unittest; - - -public interface WSJUnitConstants { - - public final String SERVER_INSTALL_PATH = System.getProperty("org.eclipse.jst.server.tomcat.50"); - public final String RUNTIMETYPEID_TC50 = "org.eclipse.jst.server.tomcat.runtime.50"; - - public final String WS_RUNTIMEID_AXIS = "org.eclipse.jst.ws.runtime.axis11"; - - public final String SERVERTYPEID_TC50 = "org.eclipse.jst.server.tomcat.50"; - - public final String webProjectName = "WP"; - public final String webProject2Name = "WP2"; - public final String webComponentName = "webComponent"; - public final String webComponent2Name = "webComp2"; - public final String webComp3Name = "webComp3"; - public final String webComp4Name = "webComp4"; - - - public final String ejbProjectName = "EJBProject"; - public final String ejbComponentName = "ejbComponent"; - - public final String appClientProjectName = "AppClientProject"; - public final String appClientCompName = "appClientComponent"; - - public final String earCompName = "EARComponent"; - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java deleted file mode 100644 index c01f19766..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/unittest/WebServiceFinderTests.java +++ /dev/null @@ -1,52 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2006 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - * yyyymmdd bug Email and other contact information - * -------- -------- ----------------------------------------------------------- - * 20060317 127456 cbrealey@ca.ibm.com - Chris Brealey - *******************************************************************************/ - -package org.eclipse.wst.ws.tests.unittest; - -import java.util.Iterator; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.wst.ws.internal.wsfinder.WebServiceFinder; -import org.eclipse.wst.ws.internal.wsrt.WebServiceInfo; - -/** - * @author joan - * - */ - -public class WebServiceFinderTests extends TestCase implements WSJUnitConstants { - - public static Test suite(){ - return new TestSuite(WebServiceFinderTests.class); - } - - public void testWSFinder(){ - System.out.println("creating web service finder"); - WebServiceFinder wsf = WebServiceFinder.instance(); - - System.out.println("attempting to locate all web services in workspace"); - Iterator wsIterator = wsf.getWebServices(null); - while (wsIterator.hasNext()) { - WebServiceInfo wsInfo = (WebServiceInfo) wsIterator.next(); - System.out.println("webService URL: " + wsInfo.getWsdlURL()); - } - - System.out.println("finished finding all webservices"); - - } - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java deleted file mode 100644 index 8f524fb4b..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/AccumulateStatusHandler.java +++ /dev/null @@ -1,99 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.tests.util; - -import java.util.Vector; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.wst.command.internal.env.core.common.StatusUtils; -import org.eclipse.wst.common.environment.Choice; -import org.eclipse.wst.common.environment.StatusException; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class AccumulateStatusHandler implements IStatusHandler { - Vector statusList_; - - public AccumulateStatusHandler() - { - resetStatus(); - } - - /** - * Resets the status so that it starts out empty again. - * - */ - public void resetStatus() - { - statusList_ = new Vector(); - } - - public IStatus getStatus() - { - IStatus worstStatus = Status.OK_STATUS; - - // Find the worst error status code - for( int index = 0; index < statusList_.size(); index++ ) - { - IStatus status = (IStatus)statusList_.elementAt( index ); - - if( status.getSeverity() > worstStatus.getSeverity() ) - { - worstStatus = status; - } - } - - return StatusUtils.multiStatus( worstStatus.getMessage(), - (Status[])statusList_.toArray( new Status[0] ) ); - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status, org.eclipse.env.common.Choice[]) - */ - public Choice report(IStatus status, Choice[] choices) - { - Choice result = null; - - // Always take the first choice if available. - if( choices != null && choices.length > 0 ) - { - result = choices[0]; - } - - statusList_.add( status ); - - return result; - } - - /** - * @see org.eclipse.env.common.IStatusHandler#report(org.eclipse.env.common.Status) - */ - public void report(IStatus status) throws StatusException - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportError(com.ibm.env.common.Status) - */ - public void reportError(IStatus status) - { - statusList_.add( status ); - } - - /** - * @see com.ibm.env.common.IStatusHandler#reportInfo(com.ibm.env.common.Status) - */ - public void reportInfo(IStatus status) - { - statusList_.add( status ); - } - -} diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java deleted file mode 100644 index 2feea5381..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/DynamicPopupJUnitWizard.java +++ /dev/null @@ -1,43 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies 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.tests.util; - -import org.eclipse.jface.operation.IRunnableContext; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.wst.command.internal.env.context.PersistentResourceContext; -import org.eclipse.wst.command.internal.env.core.data.DataFlowManager; -import org.eclipse.wst.command.internal.env.core.data.DataMappingRegistryImpl; -import org.eclipse.wst.command.internal.env.core.fragment.CommandFragment; -import org.eclipse.wst.command.internal.env.eclipse.EclipseEnvironment; -import org.eclipse.wst.command.internal.env.ui.widgets.SimpleCommandEngineManager; -import org.eclipse.wst.command.internal.env.ui.widgets.popup.DynamicPopupWizard; -import org.eclipse.wst.common.environment.IStatusHandler; - -public class DynamicPopupJUnitWizard extends DynamicPopupWizard { - private IStatusHandler handler_; - public DynamicPopupJUnitWizard(IStatusHandler handler) - { - handler_ = handler; - } - public void runHeadLess(IStructuredSelection selection,IRunnableContext context) { - CommandFragment rootFragment = getRootFragment( selection, null ); - PersistentResourceContext resourceContext = PersistentResourceContext.getInstance(); - EclipseEnvironment environment = new EclipseEnvironment( null, resourceContext, handler_ ); - - DataMappingRegistryImpl dataRegistry_ = new DataMappingRegistryImpl(); - DataFlowManager dataManager = new DataFlowManager( dataRegistry_, environment ); - SimpleCommandEngineManager manager = new SimpleCommandEngineManager(environment, dataManager); - - commandWidgetBinding_.registerDataMappings( dataRegistry_ ); - manager.setRootFragment( rootFragment ); - manager.runForwardToNextStop( context ); - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java deleted file mode 100644 index e5dbe7b03..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/JUnitUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies 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.tests.util; - -import java.util.Enumeration; -import org.eclipse.core.resources.IFolder; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.IPath; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.Path; -import org.eclipse.wst.command.internal.env.common.FileResourceUtils; -import org.eclipse.wst.command.internal.env.common.WaitForAutoBuildCommand; -import org.eclipse.wst.command.internal.env.core.context.TransientResourceContext; -import org.eclipse.wst.common.environment.IEnvironment; -import org.eclipse.wst.ws.tests.plugin.TestsPlugin; - - -public class JUnitUtils { - - // Begin: General Eclipse Utilities - public static void syncBuildProject(IProject project,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - project.build(IncrementalProjectBuilder.FULL_BUILD,null); - WaitForAutoBuildCommand cmd = new WaitForAutoBuildCommand(); - cmd.setEnvironment( env ); - cmd.execute( monitor, null ); - } - - private static void copyTestFiles(String pathString,int rootSegmentLength,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - Enumeration e = TestsPlugin.getDefault().getBundle().getEntryPaths(pathString); - while (e.hasMoreElements()) - { - String filePath = (String)e.nextElement(); - if (filePath.endsWith("/")) - copyTestFiles(filePath,rootSegmentLength,destFolder,env, monitor ); - else - { - IPath fileIPath = new Path(filePath); - FileResourceUtils.copyFile(new TransientResourceContext(), - TestsPlugin.getDefault(), - fileIPath.removeLastSegments(fileIPath.segmentCount()-rootSegmentLength), // /data/<subdir> - (new Path(filePath)).removeFirstSegments(rootSegmentLength), // files after /data/<subdir> - destFolder.getFullPath(), - monitor, - env.getStatusHandler()); - } - } - } - - public static void copyTestData(String dataSubdirectory,IFolder destFolder,IEnvironment env, IProgressMonitor monitor ) throws Exception - { - String pathString = "/data/"+dataSubdirectory; - copyTestFiles(pathString,new Path(pathString).segmentCount(),destFolder,env, monitor ); - - } - -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java b/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java deleted file mode 100644 index 3a894b631..000000000 --- a/tests/org.eclipse.wst.ws.tests/tests/org/eclipse/wst/ws/tests/util/ScenarioConstants.java +++ /dev/null @@ -1,45 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * IBM Corporation - initial API and implementation - *******************************************************************************/ -package org.eclipse.wst.ws.tests.util; - -public class ScenarioConstants { - // Bottom up Java or EJB to Web Service wizard ID. - public static final String WIZARDID_BOTTOM_UP = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.java"; - - // Top down WSDL to Skeleton Web Service wizard ID. - public static final String WIZARDID_TOP_DOWN = "org.eclipse.jst.ws.creation.ui.wizard.serverwizard.skeleton"; - - // Web Service client wizard ID. - public static final String WIZARDID_CLIENT = "org.eclipse.jst.ws.internal.consumption.ui.wizard.client.clientwizard"; - - // Object class for: - // 1) Java source (bottom-up) - // 2) WSDL or WSIL (top-down or client). - public static final String OBJECT_CLASS_ID_IFILE = "org.eclipse.core.resources.IFile"; - - // Object class for Java compilation units (i.e. Java classes selected in the Java perspective). - public static final String OBJECT_CLASS_ID_COMPILATIONUNIT = "org.eclipse.jdt.internal.core.CompilationUnit"; - - // Object class for a service selected in the J2EE perspective (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEIMPL = "org.eclipse.wst.wsdl.Service"; - - // Object class for a WSDLResourceImpl (top-down or client). - public static final String OBJECT_CLASS_ID_WSDLSERVICEIMPL = "org.eclipse.wst.wsdl.internal.util.WSDLResourceImpl"; - - // Object class for a ServiceRef (top-down or client). - public static final String OBJECT_CLASS_ID_SERVICEREF = "org.eclipse.jst.j2ee.webservice.wsclient.ServiceRef"; - - // Object class for a ServiceImplBean (bottom-up). - public static final String OBJECT_CLASS_ID_SERVICEIMPLBEAN = "org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean"; - - // Object class for a BeanLink (bottom-up). - public static final String OBJECT_CLASS_ID_BEANLINK = "org.eclipse.jst.j2ee.webservice.wsdd.BeanLink"; -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests/.classpath b/tests/org.eclipse.wst.wsdl.tests/.classpath deleted file mode 100644 index 751c8f2e5..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/.classpath +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> - <classpathentry kind="output" path="bin"/> -</classpath> diff --git a/tests/org.eclipse.wst.wsdl.tests/.cvsignore b/tests/org.eclipse.wst.wsdl.tests/.cvsignore deleted file mode 100644 index 8b5249c38..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/.cvsignore +++ /dev/null @@ -1,4 +0,0 @@ -bin -build.xml -temp.folder -wsdl.tests.jar diff --git a/tests/org.eclipse.wst.wsdl.tests/.project b/tests/org.eclipse.wst.wsdl.tests/.project deleted file mode 100644 index 9813a74cc..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.wst.wsdl.tests</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - </natures> -</projectDescription> diff --git a/tests/org.eclipse.wst.wsdl.tests/about.html b/tests/org.eclipse.wst.wsdl.tests/about.html deleted file mode 100644 index 4ec598958..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/about.html +++ /dev/null @@ -1,34 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN"> -<HTML> - -<head> -<title>About</title> -<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1"> -</head> - -<BODY lang="EN-US"> - -<H3>About This Content</H3> - -<P>May 2, 2006</P> - -<H3>License</H3> - -<P>The Eclipse Foundation makes available all content in this plug-in -("Content"). Unless otherwise indicated below, the Content is provided to you -under the terms and conditions of the Eclipse Public License Version 1.0 -("EPL"). A copy of the EPL is available at -<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>. -For purposes of the EPL, "Program" will mean the Content.</P> - -<P>If you did not receive this Content directly from the Eclipse Foundation, the -Content is being redistributed by another party ("Redistributor") and different -terms and conditions may apply to your use of any object code in the Content. -Check the Redistributor’s license that was provided with the Content. If no such -license exists, contact the Redistributor. Unless otherwise indicated below, the -terms and conditions of the EPL still apply to any source code in the Content -and such source code may be obtained at -<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P> - -</BODY> -</HTML> diff --git a/tests/org.eclipse.wst.wsdl.tests/plugin.xml b/tests/org.eclipse.wst.wsdl.tests/plugin.xml deleted file mode 100644 index b1d9ed6f1..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/plugin.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<?eclipse version="3.0"?> -<plugin - id="org.eclipse.wst.wsdl.tests" - name="WSDL JUnit Test" - version="1.0.1" - class="org.eclipse.wst.wsdl.tests.WSDLTestsPlugin"> - - <runtime> - <library name="wsdl.tests.jar"> - <export name="*"/> - </library> - </runtime> - - <requires> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.wst.wsdl"/> - <import plugin="org.eclipse.emf.ecore"/> - <import plugin="org.eclipse.xsd"/> - <import plugin="org.eclipse.core.resources"/> - <import plugin="org.junit"/> - <import plugin="org.wsdl4j"/> - <import plugin="org.eclipse.wst.common.uriresolver"/> - </requires> - -</plugin> diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl deleted file mode 100644 index 8e8c996ff..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/MissingName.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl deleted file mode 100644 index c909b513e..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LoadsNamelessDefinition/WithName.wsdl +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" name="WSDLFile">
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl deleted file mode 100644 index a829b276c..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/LocalNamespace/LocalNamespace.wsdl +++ /dev/null @@ -1,59 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" ?>
-<wsdl:definitions xmlns:tns="http://tempuri.org/Simple/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Simple"
- targetNamespace="http://tempuri.org/Simple/">
-
- <wsdl:types>
-
- <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="http://tempuri.org/Simple/">
-
- <xsd:element name="OperationInput">
-
- <xsd:complexType>
-
- <xsd:sequence>
- <xsd:element name="attribute1"
- type="xsd:string" />
- <xsd:element name="attribute2"
- type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- <xsd:element name="OperationOutput">
-
- <xsd:complexType>
-
- <xsd:sequence>
- <xsd:element name="attribute1"
- type="xsd:string" />
- <xsd:element name="attribute2"
- type="xsd:string" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- </wsdl:types>
-
- <wsdl:message name="myOperationResponse">
- <wsdl:part name="myOperationResponse"
- element="tns:OperationOutput" />
- </wsdl:message>
-
- <wsdl:message name="myOperationRequest">
- <wsdl:part xmlns:parttns="http://tempuri.org/Simple/"
- name="myOperationRequest" element="parttns:OperationInput" />
- </wsdl:message>
-
- <wsdl:portType name="MyPortType">
-
- <wsdl:operation name="myOperation">
- <wsdl:input message="tns:myOperationRequest" />
- <wsdl:output message="tns:myOperationResponse" />
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl deleted file mode 100644 index 506aec60d..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/OperationStyle/OperationStyleTest.wsdl +++ /dev/null @@ -1,120 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://example.org"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="OperationStyleTest" targetNamespace="http://example.org">
-
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
- <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
- <jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
- </jaxws:bindings>
-
- <types>
- <xsd:schema targetNamespace="http://example.org" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified" xmlns:tns="http://example.org">
-
- <xsd:element name="quoteRequest" type="tns:quoteRequestType" />
-
- <xsd:complexType name="quoteRequestType">
- <xsd:sequence>
- <xsd:element name="stockSymbol" type="xsd:int" />
- <xsd:element name="transactionDate" type="xsd:date" />
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="quoteResponse" type="tns:quoteResponseType" />
-
- <xsd:complexType name="quoteResponseType">
- <xsd:sequence>
- <xsd:element name="value" type="xsd:double" />
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="quoteError" type="xsd:string" />
-
- </xsd:schema>
- </types>
-
- <message name="Quote">
- <part name="params" element="tns:quoteRequest" />
- </message>
-
- <message name="QuoteResponse">
- <part name="result" element="tns:quoteResponse" />
- </message>
-
- <message name="QuoteError">
- <part name="error" element="tns:quoteError" />
- </message>
-
- <portType name="QuotePortType">
-
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
- <jaxws:class name="QuoteProviderImpl" />
- <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
- <jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
- </jaxws:bindings>
-
- <operation name="GetQuote">
-
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
- <jaxws:method name="getQuote" />
- <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='Quote']/wsdl:part[@name='params']"
- childElementName="tns:stockSymbol" name="symbol" />
- <jaxws:parameter part="wsdl:definitions/wsdl:message[@name='Quote']/wsdl:part[@name='params']"
- childElementName="tns:transactionDate" name="date" />
- <jaxws:enableWrapperStyle>true</jaxws:enableWrapperStyle>
- <jaxws:enableAsyncMapping>false</jaxws:enableAsyncMapping>
- </jaxws:bindings>
-
- <input message="tns:Quote" />
-
- <output message="tns:QuoteResponse" />
-
- <fault name="QuoteError" message="tns:QuoteError">
-
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
- <jaxws:class name="QuoteException" />
- </jaxws:bindings>
-
- </fault>
- </operation>
- </portType>
-
- <binding name="QuoteBinding" type="tns:QuotePortType">
-
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document" />
-
- <operation name="GetQuote">
- <soap:operation soapAction="" />
- <input>
- <soap:body use="literal" />
- </input>
- <output>
- <soap:body use="literal" />
- </output>
- <fault name="QuoteError">
- <soap:fault name="QuoteError" use="literal" />
- </fault>
- </operation>
-
- </binding>
-
- <service name="QuoteService">
-
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
- <jaxws:class name="QuotationService" />
- </jaxws:bindings>
-
- <port name="QuotePort" binding="tns:QuoteBinding">
-
- <jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
- <jaxws:method name="getQuotationService" />
- </jaxws:bindings>
-
- <soap:address location="http://localhost:8080/quote" />
-
- </port>
-
- </service>
-
-</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl deleted file mode 100644 index 8dde88d30..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test.wsdl +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<definitions name="TestService"
- targetNamespace="http://test.org/Service/"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://test.org/Service/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://test.org/">
- <types>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:import namespace="http://test.org/"
- schemaLocation="Test1.xsd" />
- </xs:schema>
- <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:import namespace="http://test.org/"
- schemaLocation="Test2.xsd" />
- </xs:schema>
- </types>
- <message name="testRequest">
- <part name="requestPart" type="test:MyType" />
- </message>
- <message name="testResponse">
- <part name="responsePart" element="test:MyElement" />
- </message>
- <portType name="TestPort">
- <operation name="testOperation">
- <input message="tns:testRequest" name="testRequest" />
- <output message="tns:testResponse" name="testResponse" />
- </operation>
-
- </portType>
-</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd deleted file mode 100644 index 82c36aab7..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test1.xsd +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://test.org/"
- xmlns:tns="http://test.org/">
-</schema>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd deleted file mode 100644 index e281a196e..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/TypeAndElementResolution/Test2.xsd +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://test.org/"
- xmlns:tns="http://test.org/">
-
- <element name="MyElement" type="string"></element>
-
- <simpleType name="MyType">
- <restriction base="string"></restriction>
- </simpleType>
-
-</schema>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl deleted file mode 100644 index fcb8dc11b..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/firstlevel.wsdl +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://www.example.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.com">
- <import location="secondlevel.wsdl" namespace="http://www.example.com"/>
- <message name="testINPUTmessage">
- <part name="testINpart" type="xsd:string"/>
- </message>
-</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl deleted file mode 100644 index b0a42a716..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/main.wsdl +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.example.com"
- targetNamespace="http://www.example.com">
-
- <import location="firstlevel.wsdl" namespace="http://www.example.com"/>
-
- <portType name="TestPortType">
-
- <operation name="TestOperation">
-
- <!-- This is located in the first level import -->
-
- <input message="tns:testINPUTmessage"/>
-
- <!-- This is located in the second level import -->
-
- <output message="tns:testOUTPUTmessage"/>
-
- </operation>
-
- </portType>
-
-</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl b/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl deleted file mode 100644 index 6e2efd98f..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/samples/BugFixes/WSDLElementResolution/secondlevel.wsdl +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:tns="http://www.example.com"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://www.example.com">
-
- <!-- Here to force a cyclic import to make sure the code does not go into an infinite recursion. -->
-
- <import location="main.wsdl" namespace="http://www.example.com"/>
-
- <message name="testOUTPUTmessage">
- <part name="testOUTpart" type="xsd:string"/>
- </message>
-
- <!-- Duplicated here to allow testing the imports tree traversal order.
- This message will be "masked" by the one declared in the firstlevel.wsdl -->
-
- <message name="testINPUTmessage">
- <part name="testINpart" type="xsd:int"/>
- </message>
-
-</definitions>
diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java deleted file mode 100644 index 0851bb2fa..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/AllTestCases.java +++ /dev/null @@ -1,50 +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.wsdl.tests; - - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * @author Kihup Boo - */ -public class AllTestCases extends TestCase -{ - - public AllTestCases() - { - } - - public static void main(String[] args) - { - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - // Bug 123547 - comment out this test for now. - // suite.addTest(InlineSchemaTest.suite()); - suite.addTest(LoadAndSerializationTest.suite()); - suite.addTest(SemanticTest.suite()); - suite.addTest(WSDLGenerationTest.suite()); - suite.addTest(WSDL4JAPITest.suite()); - suite.addTest(WSDLEMFAPITest.suite()); - suite.addTest(UtilTest.suite()); - suite.addTest(BugFixesTest.suite()); - suite.addTest(LocationTrackingTest.suite()); - - return suite; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java deleted file mode 100644 index 4ccaa4dab..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/MyResolver.java +++ /dev/null @@ -1,33 +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.wsdl.tests; - -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; - -public class MyResolver implements EntityResolver -{ - public InputSource resolveEntity(String publicId, String systemId) - { - if (systemId.equals("http://www.myhost.com/today")) - { - // return a special input source - //MyReader reader = new MyReader(); - //return new InputSource(reader); - return new InputSource(systemId); // TBD - } - else - { - // use the default behaviour - return null; - } - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java deleted file mode 100644 index 474d9854c..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/ParserTest.java +++ /dev/null @@ -1,73 +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.wsdl.tests; - -import java.io.FileInputStream; -import java.io.InputStream; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.w3c.dom.Document; -import org.xml.sax.EntityResolver; - -public class ParserTest extends TestCase -{ - - public ParserTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new ParserTest("Parser") - { - protected void runTest() - { - testParser(); - } - } - ); - - return suite; - } - - public void testParser() - { - EntityResolver myResolver = new MyResolver(); - try - { - InputStream is = new FileInputStream("./samples/LoadAndPrintTest.wsdl"); - DocumentBuilder myBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - myBuilder.setEntityResolver(myResolver); - Document doc = myBuilder.parse(is); - Assert.assertNotNull("Document is null",doc); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - public static void main(String[] args) - { - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java deleted file mode 100644 index 16c2962af..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/RefactoringTest.java +++ /dev/null @@ -1,230 +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.wsdl.tests; - -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.WSDLFactory; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLConstants; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; - -public class RefactoringTest extends TestCase -{ - public RefactoringTest() - { - //init(); - } - - public RefactoringTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new RefactoringTest("Refactoring") - { - protected void runTest() - { - testRefactoring(); - } - } - ); - - return suite; - } - - public void testRefactoring() - { - try - { - // Before running this test, modify the location of the generated WSDL file - generateWSDL("RefactoringTest.wsdl"); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - protected void setUp() throws Exception - { - super.setUp(); - - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - - // defect 6594 - public void renameOperation(Operation op) - { - Input input = op.getEInput(); - Assert.assertNotNull(input); - Message message = input.getEMessage(); - Assert.assertNotNull(message); - - op.setName("Renamed" + op.getName()); - QName newQName = new QName(message.getQName().getNamespaceURI(),"Renamed" + message.getQName().getLocalPart()); - message.setQName(newQName); - } - - public void generateWSDL(String outputFile) throws Exception - { - ResourceSet resourceSet = new ResourceSetImpl(); - Resource resource = resourceSet.createResource(URI.createFileURI(outputFile)); - resourceSet.getResources().add(resource); - - // Create a Definition - Temperature - Definition definition = WSDLFactory.eINSTANCE.createDefinition(); - definition.setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI,"Temparature")); - resource.getContents().add(definition); - - // Target namespace - http://www.temperature.com - definition.setTargetNamespace("http://www.temperature.com"); - definition.addNamespace("tns", "http://www.temperature.com"); - - // Other namespaces - wsdl, soap, xsd - definition.addNamespace("wsdl", WSDLConstants.WSDL_NAMESPACE_URI); - definition.addNamespace("xsd", WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001); - definition.addNamespace("soap", SOAPConstants.SOAP_NAMESPACE_URI); - - // - // Let's start building two messages - // - - // Create a Part - ZipCode - Part part = WSDLFactory.eINSTANCE.createPart(); - part.setName("ZipCode"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string")); - - // Create a Message - GetTemperatureInput - Message inputMessage = WSDLFactory.eINSTANCE.createMessage(); - inputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInput")); - inputMessage.addPart(part); - definition.addMessage(inputMessage); - - // Create a Part - Temperature - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Temperature"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float")); - - // Create a Message - GetTemperatureOutput - Message outputMessage = WSDLFactory.eINSTANCE.createMessage(); - outputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureOutput")); - outputMessage.addPart(part); - definition.addMessage(outputMessage); - - // - // Next, build a PortType - // - - // Create an Input - GetTemperatureInput - Input input = WSDLFactory.eINSTANCE.createInput(); - input.setMessage(inputMessage); - - // Create an Output - GetTemperatureOutput - Output output = WSDLFactory.eINSTANCE.createOutput(); - output.setMessage(outputMessage); - - // Create an Operation - GetTemperatureForZipCode - Operation operation = WSDLFactory.eINSTANCE.createOperation(); - operation.setName("GetTemperatureForZipCode"); - operation.setInput(input); - operation.setOutput(output); - - // Create a PortType - PortType portType = WSDLFactory.eINSTANCE.createPortType(); - portType.setQName(new QName(definition.getTargetNamespace(),"GetTemparatureInfoSOAP")); - portType.addOperation(operation); - definition.addPortType(portType); - - // - // Create the second set op Operations - // - - // Create a Part - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Part2"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string")); - - // Create a Message - Message inputMessage2 = WSDLFactory.eINSTANCE.createMessage(); - inputMessage2.setQName(new QName(definition.getTargetNamespace(), "InputMessage2")); - inputMessage2.addPart(part); - definition.addMessage(inputMessage2); - - // Create a Part - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Part3"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float")); - - // Create a Message - GetTemperatureOutput - Message outputMessage2 = WSDLFactory.eINSTANCE.createMessage(); - outputMessage2.setQName(new QName(definition.getTargetNamespace(), "OutputMessage2")); - outputMessage2.addPart(part); - definition.addMessage(outputMessage2); - - // Create an Input - Input input2 = WSDLFactory.eINSTANCE.createInput(); - input2.setMessage(inputMessage2); - - // Create an Output - GetTemperatureOutput - Output output2 = WSDLFactory.eINSTANCE.createOutput(); - output2.setMessage(outputMessage2); - - // Create an Operation - GetTemperatureForZipCode - Operation operation2 = WSDLFactory.eINSTANCE.createOperation(); - operation2.setName("Operation2"); - operation2.setInput(input2); - operation2.setOutput(output2); - - portType.addOperation(operation2); - - renameOperation(operation); - renameOperation(operation2); - - resource.save(null); - - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java deleted file mode 100644 index 5f25a785a..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLGenerationTest.java +++ /dev/null @@ -1,267 +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.wsdl.tests; - -import javax.xml.namespace.QName; - -import junit.framework.Assert; -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.WSDLFactory; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.binding.soap.SOAPAddress; -import org.eclipse.wst.wsdl.binding.soap.SOAPBinding; -import org.eclipse.wst.wsdl.binding.soap.SOAPBody; -import org.eclipse.wst.wsdl.binding.soap.SOAPFactory; -import org.eclipse.wst.wsdl.binding.soap.SOAPOperation; -import org.eclipse.wst.wsdl.binding.soap.internal.util.SOAPConstants; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLConstants; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.eclipse.wst.wsdl.binding.soap.internal.impl.SOAPBodyImpl; - -public class WSDLGenerationTest extends TestCase -{ - public WSDLGenerationTest() - { - init(); - } - - public WSDLGenerationTest(String name) - { - super(name); - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new WSDLGenerationTest("SampleWSDLGeneration") - { - protected void runTest() - { - testSampleWSDLGeneration(); - } - } - ); - - return suite; - } - - public void testSampleWSDLGeneration() - { - try - { - generateTemperatureService("./TemperatureService.wsdl"); - } - catch (Exception e) - { - Assert.fail("Test failed due to an exception: " + e.getLocalizedMessage()); - } - } - - protected void setUp() throws Exception - { - super.setUp(); - - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - protected void tearDown() throws Exception - { - super.tearDown(); - } - - public void generateTemperatureService(String outputFile) throws Exception - { - ResourceSet resourceSet = new ResourceSetImpl(); - Resource resource = resourceSet.createResource(URI.createFileURI(outputFile)); - resourceSet.getResources().add(resource); - - // Create a Definition - Temperature - Definition definition = WSDLFactory.eINSTANCE.createDefinition(); - definition.setQName(new QName(WSDLConstants.WSDL_NAMESPACE_URI,"Temparature")); - resource.getContents().add(definition); - - // Target namespace - http://www.temperature.com - definition.setTargetNamespace("http://www.temperature.com"); - definition.addNamespace("tns", "http://www.temperature.com"); - - // Other namespaces - wsdl, soap, xsd - definition.addNamespace("wsdl", WSDLConstants.WSDL_NAMESPACE_URI); - definition.addNamespace("xsd", WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001); - definition.getNamespaces().put("soap", SOAPConstants.SOAP_NAMESPACE_URI); - - // - // Let's start building two messages - // - - // Create a Part - ZipCode - Part part = WSDLFactory.eINSTANCE.createPart(); - part.setName("ZipCode"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"string")); - - // Create a Message - GetTemperatureInput - Message inputMessage = WSDLFactory.eINSTANCE.createMessage(); - inputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInput")); - inputMessage.addPart(part); - definition.addMessage(inputMessage); - - // Create a Part - Temperature - part = WSDLFactory.eINSTANCE.createPart(); - part.setName("Temperature"); - part.setTypeName(new QName(WSDLConstants.SCHEMA_FOR_SCHEMA_URI_2001,"float")); - - // Create a Message - GetTemperatureOutput - Message outputMessage = WSDLFactory.eINSTANCE.createMessage(); - outputMessage.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureOutput")); - outputMessage.addPart(part); - definition.addMessage(outputMessage); - - // - // Next, build a PortType - // - - // Create an Input - GetTemperatureInput - Input input = WSDLFactory.eINSTANCE.createInput(); - input.setMessage(inputMessage); - - // Create an Output - GetTemperatureOutput - Output output = WSDLFactory.eINSTANCE.createOutput(); - output.setMessage(outputMessage); - - // Create an Operation - GetTemperatureForZipCode - Operation operation = WSDLFactory.eINSTANCE.createOperation(); - operation.setName("GetTemperatureForZipCode"); - operation.setInput(input); - operation.setOutput(output); - - // Create a PortType - PortType portType = WSDLFactory.eINSTANCE.createPortType(); - portType.setQName(new QName(definition.getTargetNamespace(),"GetTemparatureInfoSOAP")); - portType.addOperation(operation); - definition.addPortType(portType); - - // - // Now, let's work on Binding - // - - // Create a Binding - GetTemperatureInfoSOAP - Binding binding = WSDLFactory.eINSTANCE.createBinding(); - binding.setQName(new QName(definition.getTargetNamespace(), "GetTemparatureInfoSOAP")); - binding.setPortType(portType); - definition.addBinding(binding); - - // Create a SOAP Binding - SOAPBinding soapBinding = SOAPFactory.eINSTANCE.createSOAPBinding(); - soapBinding.setStyle("rpc"); - soapBinding.setTransportURI("http://schemas.xmlsoap.org/soap/http"); - binding.addExtensibilityElement(soapBinding); - - // Create a Binding Operation - BindingOperation bindingOperation = WSDLFactory.eINSTANCE.createBindingOperation(); - bindingOperation.setName("GetTemperatureForZipCode"); - binding.addBindingOperation(bindingOperation); - - // Create a SOAP Operation - SOAPOperation soapOperation = SOAPFactory.eINSTANCE.createSOAPOperation(); - soapOperation.setSoapActionURI("http://www.temperature.com/GetTemperatureForZipCode"); - bindingOperation.addExtensibilityElement(soapOperation); - - // Create a SOAP Body - SOAPBody soapBody = SOAPFactory.eINSTANCE.createSOAPBody(); - soapBody.setUse("encoded"); - soapBody.getEncodingStyles().add("http://schemas.xmlsoap.org/soap/encoding/"); - soapBody.setNamespaceURI("http://www.temperature.com/"); - - // Add a part (Temperature) to the SOAP body (Bugzilla 108176) - java.util.Vector v = new java.util.Vector(); - v.add(part); - soapBody.setParts(v); - ((SOAPBodyImpl)soapBody).updateElement(); - - // Create a Binding Input - BindingInput bindingInput = WSDLFactory.eINSTANCE.createBindingInput(); - bindingInput.addExtensibilityElement(soapBody); - bindingOperation.setBindingInput(bindingInput); - - // Create a SOAP Body - soapBody = SOAPFactory.eINSTANCE.createSOAPBody(); - soapBody.setUse("encoded"); - soapBody.getEncodingStyles().add("http://schemas.xmlsoap.org/soap/encoding/"); - soapBody.setNamespaceURI("http://www.temperature.com/"); - - // Create a Binding Output - BindingOutput bindingOuput = WSDLFactory.eINSTANCE.createBindingOutput(); - bindingOuput.addExtensibilityElement(soapBody); - bindingOperation.setBindingOutput(bindingOuput); - - // - // Finally, we are building a Service - // - - // Create a SOAP Address - SOAPAddress soapAddress = SOAPFactory.eINSTANCE.createSOAPAddress(); - soapAddress.setLocationURI("http://todo-some-address/"); - - // Create a Port - GetTemperatureInfoSOAP - Port port = WSDLFactory.eINSTANCE.createPort(); - port.setName("GetTemperatureInfoSOAP"); - port.setBinding(binding); - port.addExtensibilityElement(soapAddress); - - // Create a Service - TemperatureService - Service service = WSDLFactory.eINSTANCE.createService(); - service.setQName(new QName(definition.getTargetNamespace(),"TemperatureService")); - service.addPort(port); - definition.addService(service); - - // - // Phew, we are done. Let's serialize it. - // - - resource.save(null); - - } - - private void init() - { - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java deleted file mode 100644 index 0bb5f4f5b..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/WSDLTestsPlugin.java +++ /dev/null @@ -1,109 +0,0 @@ -/********************************************************************** - * Copyright (c) 2004 IBM Corporation and others. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Common Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/cpl-v10.html - * - * Contributors: - * IBM - Initial API and implementation - **********************************************************************/ - -package org.eclipse.wst.wsdl.tests; - -import org.eclipse.core.runtime.Platform; -import org.eclipse.core.runtime.Plugin; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -import java.io.IOException; -import java.util.*; - -/** - * The main plugin class to be used in the desktop. - */ -public class WSDLTestsPlugin extends Plugin { - //The shared instance. - private static WSDLTestsPlugin plugin; - //Resource bundle. - private ResourceBundle resourceBundle; - - private static Bundle pluginBundle = null; - - /** - * The constructor. - */ - public WSDLTestsPlugin() { - super(); - plugin = this; - } - - /** - * This method is called upon plug-in activation - */ - public void start(BundleContext context) throws Exception { - super.start(context); - pluginBundle = context.getBundle(); - } - - /** - * This method is called when the plug-in is stopped - */ - public void stop(BundleContext context) throws Exception { - super.stop(context); - plugin = null; - resourceBundle = null; - pluginBundle = context.getBundle(); - } - - /** - * Returns the shared instance. - */ - public static WSDLTestsPlugin 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 = WSDLTestsPlugin.getDefault().getResourceBundle(); - try { - return (bundle != null) ? bundle.getString(key) : key; - } catch (MissingResourceException e) { - return key; - } - } - - /** - * Returns the plugin's resource bundle, - */ - public ResourceBundle getResourceBundle() { - try { - if (resourceBundle == null) - resourceBundle = ResourceBundle.getBundle("org.eclipse.wst.wsdl.tests.WSDLTestsPluginResources"); - } catch (MissingResourceException x) { - resourceBundle = null; - } - return resourceBundle; - } - - /** - * Get the install URL of this plugin. - * - * @return the install url of this plugin - */ - public static String getInstallURL() - { - try - { - return Platform.resolve(pluginBundle.getEntry("/")).getFile(); - } - catch (IOException e) - { - return null; - } - } - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java deleted file mode 100644 index 6abed7718..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionLoader.java +++ /dev/null @@ -1,107 +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.wsdl.tests.util; - -import java.io.IOException; -import java.util.Hashtable; -import java.util.Iterator; - -import org.eclipse.emf.common.util.URI; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.wst.wsdl.util.WSDLResourceImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; - -/** - * @author Kihup Boo - */ -public final class DefinitionLoader -{ - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - /** - * This class provides static methods only. - */ - private DefinitionLoader() - { - } - - static public Definition load(String filename) throws IOException - { - return load(filename,false); - } - - static public Definition load(String filename, boolean useExtensionFactories) throws IOException - { - return load(filename, useExtensionFactories, false); - } - - static public Definition load(String filename, boolean useExtensionFactories, boolean trackLocation) throws IOException - { - // filename is an absolute path - - URI uri = null; - uri = URI.createFileURI(filename); - - ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getAdapterFactories().add(new WSDLModelLocatorAdapterFactory()); - resourceSet.getAdapterFactories().add(new XSDSchemaLocationResolverAdapterFactory()); - - WSDLResourceImpl wsdlMainResource = (WSDLResourceImpl)resourceSet.createResource(URI.createURI("*.wsdl")); - wsdlMainResource.setURI(uri); - java.util.Map map = new Hashtable(); - map.put(WSDLResourceImpl.CONTINUE_ON_LOAD_ERROR,Boolean.valueOf(true)); - map.put(WSDLResourceImpl.USE_EXTENSION_FACTORIES,Boolean.valueOf(useExtensionFactories)); - map.put(WSDLResourceImpl.TRACK_LOCATION,Boolean.valueOf(trackLocation)); - wsdlMainResource.load(map); - - Definition definition = null; - for (Iterator resources = resourceSet.getResources().iterator(); resources.hasNext(); ) - { - Object resource = resources.next(); - if (resource instanceof WSDLResourceImpl) - { - WSDLResourceImpl wsdlResource = (WSDLResourceImpl)resource; - definition = wsdlResource.getDefinition(); - return definition; - } - } - - return null; - } - - static public void store(Definition definition, String filename) throws IOException - { - // filename is an absolute path - - Resource resource = definition.eResource(); - resource.setURI(URI.createFileURI(filename)); - resource.save(null); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java deleted file mode 100644 index 4b139a6f2..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/DefinitionVisitor.java +++ /dev/null @@ -1,211 +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.wsdl.tests.util; - -import java.util.Iterator; - -import junit.framework.TestCase; - -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingFault; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.ExtensibleElement; -import org.eclipse.wst.wsdl.Fault; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.Message; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.Types; - -/** - * @author Kihup Boo - */ -public abstract class DefinitionVisitor extends TestCase -{ - protected Definition definition; - - /** - * Use DefinitionVisitor(Definition definition) - */ - private DefinitionVisitor() - { - } - - // Added for JUnit - public DefinitionVisitor(String name) - { - super(name); - } - - protected DefinitionVisitor(Definition definition) - { - this.definition = definition; - } - - // main entry - public void visit() - { - visitDefinition(definition); - } - - protected void visitDefinition(Definition def) - { - Iterator iterator = def.getEImports().iterator(); - while (iterator.hasNext()) - visitImport((Import)iterator.next()); - - Types types = def.getETypes(); - if (types != null) - visitTypes(types); - - iterator = def.getEMessages().iterator(); - while (iterator.hasNext()) - visitMessage((Message)iterator.next()); - - iterator = def.getEPortTypes().iterator(); - while (iterator.hasNext()) - visitPortType((PortType)iterator.next()); - - iterator = def.getEBindings().iterator(); - while (iterator.hasNext()) - visitBinding((Binding)iterator.next()); - - iterator = def.getEServices().iterator(); - while (iterator.hasNext()) - visitService((Service)iterator.next()); - - iterator = def.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(def,(ExtensibilityElement)iterator.next()); - - } - - abstract protected void visitImport(Import wsdlImport); - - abstract protected void visitTypes(Types types); - - protected void visitMessage(Message message) - { - Iterator iterator = message.getEParts().iterator(); - while (iterator.hasNext()) - visitPart((Part)iterator.next()); - } - - abstract protected void visitPart(Part part); - - protected void visitPortType(PortType portType) - { - Iterator iterator = portType.getEOperations().iterator(); - while (iterator.hasNext()) - visitOperation((Operation)iterator.next()); - } - - protected void visitOperation(Operation operation) - { - Input input = operation.getEInput(); - visitInput((Input)input); - - Output output = operation.getEOutput(); - visitOutput((Output)output); - - Iterator iterator = operation.getEFaults().iterator(); - while (iterator.hasNext()) - visitFault((Fault)iterator.next()); - } - - protected abstract void visitInput(Input input); - - protected abstract void visitOutput(Output output); - - protected abstract void visitFault(Fault fault); - - protected void visitBinding(Binding binding) - { - Iterator iterator = binding.getEBindingOperations().iterator(); - while (iterator.hasNext()) - visitBindingOperation((BindingOperation)iterator.next()); - - iterator = binding.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(binding,(ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOperation(BindingOperation operation) - { - BindingInput input = operation.getEBindingInput(); - visitBindingInput((BindingInput)input); - - BindingOutput output = operation.getEBindingOutput(); - visitBindingOutput((BindingOutput)output); - - Iterator iterator = operation.getEBindingFaults().iterator(); - while (iterator.hasNext()) - visitBindingFault((BindingFault)iterator.next()); - - iterator = operation.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(operation,(ExtensibilityElement)iterator.next()); - - } - - protected void visitBindingInput(BindingInput input) - { - Iterator iterator = input.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(input,(ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOutput(BindingOutput output) - { - Iterator iterator = output.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(output,(ExtensibilityElement)iterator.next()); - } - - protected void visitBindingFault(BindingFault fault) - { - Iterator iterator = fault.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(fault,(ExtensibilityElement)iterator.next()); - } - - protected void visitService(Service service) - { - Iterator iterator = service.getEPorts().iterator(); - while (iterator.hasNext()) - visitPort((Port)iterator.next()); - - iterator = service.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(service,(ExtensibilityElement)iterator.next()); - } - - protected void visitPort(Port port) - { - Iterator iterator = port.getEExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement(port,(ExtensibilityElement)iterator.next()); - } - - abstract protected void visitExtensibilityElement - (ExtensibleElement owner, - ExtensibilityElement extensibilityElement); - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java deleted file mode 100644 index ba7fa2dd3..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDL4JDefinitionVisitor.java +++ /dev/null @@ -1,223 +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.wsdl.tests.util; - -import java.util.Iterator; - -import javax.wsdl.Binding; -import javax.wsdl.BindingFault; -import javax.wsdl.BindingInput; -import javax.wsdl.BindingOperation; -import javax.wsdl.BindingOutput; -import javax.wsdl.Definition; -import javax.wsdl.Fault; -import javax.wsdl.Import; -import javax.wsdl.Input; -import javax.wsdl.Message; -import javax.wsdl.Operation; -import javax.wsdl.Output; -import javax.wsdl.Part; -import javax.wsdl.Port; -import javax.wsdl.PortType; -import javax.wsdl.Service; -import javax.wsdl.Types; -import javax.wsdl.extensions.ExtensibilityElement; - -import junit.framework.TestCase; - -/** - * @author Kihup Boo - */ -public abstract class WSDL4JDefinitionVisitor extends TestCase -{ - protected Definition definition; - - /** - * Use DefinitionVisitor(Definition definition) - */ - private WSDL4JDefinitionVisitor() - { - } - - // Added for JUnit - public WSDL4JDefinitionVisitor(String name) - { - super(name); - } - - protected WSDL4JDefinitionVisitor(Definition definition) - { - this.definition = definition; - } - - // main entry - public void visit() - { - visitDefinition(definition); - } - - protected void visitDefinition(Definition def) - { - java.util.Map imports = def.getImports(); - Iterator iterator = imports.keySet().iterator(); - Import myImport = null; - while (iterator.hasNext()) - { - myImport = (Import)((java.util.ArrayList)imports.get(iterator.next())).get(0); - visitImport(myImport); - } - - Types types = def.getTypes(); - if (types != null) - visitTypes(types); - - iterator = def.getMessages().values().iterator(); - while (iterator.hasNext()) - visitMessage((Message)iterator.next()); - - iterator = def.getPortTypes().values().iterator(); - while (iterator.hasNext()) - visitPortType((PortType)iterator.next()); - - iterator = def.getBindings().values().iterator(); - while (iterator.hasNext()) - visitBinding((Binding)iterator.next()); - - iterator = def.getServices().values().iterator(); - while (iterator.hasNext()) - visitService((Service)iterator.next()); - - iterator = def.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - - } - - abstract protected void visitImport(Import wsdlImport); - - abstract protected void visitTypes(Types types); - - protected void visitMessage(Message message) - { - Iterator iterator = message.getParts().values().iterator(); - while (iterator.hasNext()) - visitPart((Part)iterator.next()); - } - - abstract protected void visitPart(Part part); - - protected void visitPortType(PortType portType) - { - Iterator iterator = portType.getOperations().iterator(); - while (iterator.hasNext()) - visitOperation((Operation)iterator.next()); - } - - protected void visitOperation(Operation operation) - { - Input input = operation.getInput(); - visitInput((Input)input); - - Output output = operation.getOutput(); - visitOutput((Output)output); - - java.util.Map faults = operation.getFaults(); - Iterator iterator = faults.keySet().iterator(); - Fault fault = null; - while (iterator.hasNext()) - { - fault = (Fault)faults.get(iterator.next()); - visitFault(fault); - } - } - - protected abstract void visitInput(Input input); - - protected abstract void visitOutput(Output output); - - protected abstract void visitFault(Fault fault); - - protected void visitBinding(Binding binding) - { - Iterator iterator = binding.getBindingOperations().iterator(); - while (iterator.hasNext()) - visitBindingOperation((BindingOperation)iterator.next()); - - iterator = binding.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOperation(BindingOperation operation) - { - BindingInput input = operation.getBindingInput(); - visitBindingInput((BindingInput)input); - - BindingOutput output = operation.getBindingOutput(); - visitBindingOutput((BindingOutput)output); - - java.util.Map bindingFaults = operation.getBindingFaults(); - Iterator iterator = bindingFaults.keySet().iterator(); - BindingFault bindingFault = null; - while (iterator.hasNext()) - { - bindingFault = (BindingFault)bindingFaults.get(iterator.next()); - visitBindingFault(bindingFault); - } - - iterator = operation.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - - } - - protected void visitBindingInput(BindingInput input) - { - Iterator iterator = input.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitBindingOutput(BindingOutput output) - { - Iterator iterator = output.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitBindingFault(BindingFault fault) - { - Iterator iterator = fault.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitService(Service service) - { - Iterator iterator = service.getPorts().values().iterator(); - while (iterator.hasNext()) - visitPort((Port)iterator.next()); - - iterator = service.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - protected void visitPort(Port port) - { - Iterator iterator = port.getExtensibilityElements().iterator(); - while (iterator.hasNext()) - visitExtensibilityElement((ExtensibilityElement)iterator.next()); - } - - abstract protected void visitExtensibilityElement(ExtensibilityElement extensibilityElement); - -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java deleted file mode 100644 index 9247256d4..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLConverter.java +++ /dev/null @@ -1,608 +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.wsdl.tests.util; - -import java.io.FileOutputStream; -import java.util.Iterator; - -import javax.wsdl.OperationType; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.transform.OutputKeys; -import javax.xml.transform.Source; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMSource; -import javax.xml.transform.stream.StreamResult; - -import junit.framework.Test; -import junit.framework.TestSuite; - -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.wst.wsdl.Binding; -import org.eclipse.wst.wsdl.BindingFault; -import org.eclipse.wst.wsdl.BindingInput; -import org.eclipse.wst.wsdl.BindingOperation; -import org.eclipse.wst.wsdl.BindingOutput; -import org.eclipse.wst.wsdl.Definition; -import org.eclipse.wst.wsdl.ExtensibilityElement; -import org.eclipse.wst.wsdl.ExtensibleElement; -import org.eclipse.wst.wsdl.Fault; -import org.eclipse.wst.wsdl.Import; -import org.eclipse.wst.wsdl.Input; -import org.eclipse.wst.wsdl.MessageReference; -import org.eclipse.wst.wsdl.Operation; -import org.eclipse.wst.wsdl.Output; -import org.eclipse.wst.wsdl.Part; -import org.eclipse.wst.wsdl.Port; -import org.eclipse.wst.wsdl.PortType; -import org.eclipse.wst.wsdl.Service; -import org.eclipse.wst.wsdl.Types; -import org.eclipse.wst.wsdl.WSDLPackage; -import org.eclipse.wst.wsdl.internal.util.WSDLResourceFactoryImpl; -import org.eclipse.xsd.XSDPackage; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDResourceFactoryImpl; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -/** - * @author Kihup Boo - */ -public class WSDLConverter extends DefinitionVisitor -{ - private Document doc; - private Element description; - private Element currentTypes; - private Element currentService; - private Element currentEndpoint; - private Element currentInterface; - private Element currentOperation; - - private Element currentBinding; - private Element currentBindingOperation; - private Element currentBindingInput; - private Element currentBindingOutput; - private Element currentBindingFault; - - private String wsdlNamespacePrefix; - private String xsdNamespacePrefix; - - { - // This is needed because we don't have the following in the plugin.xml - // - // <extension point = "org.eclipse.emf.extension_parser"> - // <parser type="wsdl" class="com.ibm.etools.wsdl.util.WSDLResourceFactoryImpl"/> - // </extension> - // - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("wsdl", new WSDLResourceFactoryImpl()); - WSDLPackage pkg = WSDLPackage.eINSTANCE; - - // We need this for XSD <import>. - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("xsd", new XSDResourceFactoryImpl()); - XSDPackage xsdpkg = XSDPackage.eINSTANCE; - } - - // Added for JUnit - public WSDLConverter(String name) - { - super(name); - } - - /** - * @param definition - */ - public WSDLConverter(Definition definition) - { - super(definition); - // TODO Auto-generated constructor stub - } - - public void generate20(String filename) throws Exception - { - createDocument(); - visit(); - serialize(filename); - } - - private void serialize(String filename) throws Exception - { - Source domSource = new DOMSource(doc); - Transformer transformer = TransformerFactory.newInstance().newTransformer(); - transformer.setOutputProperty(OutputKeys.INDENT,"yes"); - transformer.setOutputProperty(OutputKeys.ENCODING,"UTF-8"); - transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount","4"); - transformer.transform(domSource,new StreamResult(new FileOutputStream(filename))); - } - - private void createDocument() throws ParserConfigurationException - { - doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); - } - - private Element createWSDLElement(String name) - { - Element element = doc.createElementNS("http://www.w3.org/2004/08/wsdl",name); - if (wsdlNamespacePrefix != null) - element.setPrefix(wsdlNamespacePrefix); - - return element; - } - - private void processDocumentation(Element docElement, Element parent) - { - if (docElement == null) - return; - - Element adoptedDocElement = (Element)doc.importNode(docElement,true); - parent.appendChild(adoptedDocElement); - } - - protected void visitDefinition(Definition def) - { - description = createWSDLElement("description"); - processDocumentation(def.getDocumentationElement(),description); - - // TBD - Determine later if we want to convert the document to use SOAP 1.2. - // However adding these two namespaces may not be harmful. - description.setAttribute("xmlns:soapenv","http://www.w3.org/2003/05/soap-envelop"); - description.setAttribute("xmlns:wsoap","http://www.w3.org/2004/08/soap12"); - - String targetNamespace = def.getTargetNamespace(); - if (targetNamespace != null) - description.setAttribute("targetNamespace",targetNamespace); - - Iterator iterator = def.getNamespaces().keySet().iterator(); - String prefix = null; - String namespace = null; - /* - xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"*/ - while (iterator.hasNext()) - { - prefix = (String)iterator.next(); - namespace = def.getNamespace(prefix); - - if ("http://schemas.xmlsoap.org/wsdl/".equals(namespace)) - { - if (prefix.length() == 0) // meant to be default namespace - description.setAttribute("xmlns","http://www.w3.org/2004/08/wsdl"); - else - { - description.setAttribute("xmlns:" + prefix,"http://www.w3.org/2004/08/wsdl"); - wsdlNamespacePrefix = prefix; - description.setPrefix(wsdlNamespacePrefix); - } - continue; - } - - // SOAP 1.2 - if ("http://schemas.xmlsoap.org/wsdl/soap/".equals(namespace)) - { - // SOAP 1.2 - description.setAttribute("xmlns:" + prefix,"http://www.w3.org/2003/05/soap-envelop"); - - // WSDL 2.0 binding for SOAP 1.2 - description.setAttribute("xmlns:wsoap","http://www.w3.org/2004/08/soap12"); - continue; - } - - //if ("http://schemas.xmlsoap.org/soap/encoding/".equals(namespace)) - // continue; - - if ("http://www.w3.org/2001/XMLSchema".equals(namespace)) - xsdNamespacePrefix = prefix; // We will use this in visitImport(). - - if (prefix.length() == 0) // meant to be default namespace - description.setAttribute("xmlns" + prefix,namespace); - else - description.setAttribute("xmlns:" + prefix,namespace); - } - - doc.appendChild(description); - super.visitDefinition(def); - - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitImport(org.eclipse.wst.wsdl.Import) - */ - protected void visitImport(Import wsdlImport) - { - // Determine if we <import> a schema. - if (importingSchema(wsdlImport)) - { - currentTypes = createWSDLElement("types"); - description.appendChild(currentTypes); - - // <xs:import namespace="http://foo.com" schemaLocation= "bar.xsd"/> - Element schemaImport = doc.createElementNS("http://www.w3.org/2001/XMLSchema","import"); - if (xsdNamespacePrefix == null) // need to add one - { - description.setAttribute("xmlns:xs","http://www.w3.org/2001/XMLSchema"); - xsdNamespacePrefix = "xs"; - schemaImport.setPrefix(xsdNamespacePrefix); - } - else if (!"".equals(xsdNamespacePrefix)) // it is not default namespace - schemaImport.setPrefix(xsdNamespacePrefix); - - schemaImport.setAttribute("namespace",wsdlImport.getNamespaceURI()); - schemaImport.setAttribute("schemaLocation",wsdlImport.getLocationURI()); - processDocumentation(wsdlImport.getDocumentationElement(),schemaImport); - currentTypes.appendChild(schemaImport); - } - else - { - Element importElement = wsdlImport.getElement(); - Element adoptedImportElement = (Element)doc.importNode(importElement,true); - processDocumentation(wsdlImport.getDocumentationElement(),adoptedImportElement); - description.appendChild(adoptedImportElement); - } - } - - private boolean importingSchema(Import myImport) - { - if (myImport.getDefinition() != null) // it is WSDL import - return false; - else - return true; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitTypes(org.eclipse.wst.wsdl.Types) - */ - protected void visitTypes(Types types) - { - // currentTypes may have been created in visitImport(). - if (currentTypes == null) - { - currentTypes = createWSDLElement("types"); - processDocumentation(types.getDocumentationElement(),currentTypes); - description.appendChild(currentTypes); - } - - Iterator iterator = types.getSchemas().iterator(); - XSDSchema schema = null; - Element schemaElement = null; - Element adoptedSchemaElement = null; - while (iterator.hasNext()) - { - schema = (XSDSchema)iterator.next(); - schema.updateElement(); - schemaElement = schema.getElement(); - adoptedSchemaElement = (Element)doc.importNode(schemaElement,true); - currentTypes.appendChild(adoptedSchemaElement); - } - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPart(org.eclipse.wst.wsdl.Part) - */ - protected void visitPart(Part part) - { - // TODO Auto-generated method stub - } - - protected void visitPortType(PortType portType) - { - currentInterface = createWSDLElement("interface"); - processDocumentation(portType.getDocumentationElement(),currentInterface); - - Element portTypeElement = portType.getElement(); - if (portTypeElement.hasAttribute("name")) - currentInterface.setAttribute("name",portTypeElement.getAttribute("name")); - - description.appendChild(currentInterface); - super.visitPortType(portType); - } - - protected void visitOperation(Operation operation) - { - currentOperation = createWSDLElement("operation"); - processDocumentation(operation.getDocumentationElement(),currentOperation); - - Element operationElement = operation.getElement(); - if (operationElement.hasAttribute("name")) - currentOperation.setAttribute("name",operationElement.getAttribute("name")); - - OperationType opType = operation.getStyle(); - if (OperationType.REQUEST_RESPONSE == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/in-out"); - else if (OperationType.SOLICIT_RESPONSE == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/out-in"); - else if (OperationType.NOTIFICATION == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/out-only"); - else if (OperationType.ONE_WAY == opType) - currentOperation.setAttribute("pattern","http://www.w3.org/2004/03/wsdl/in-only"); - - currentInterface.appendChild(currentOperation); - super.visitOperation(operation); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitInput(org.eclipse.wst.wsdl.Input) - */ - protected void visitInput(Input input) - { - Element currentInput = createWSDLElement("input"); - processDocumentation(input.getDocumentationElement(),currentInput); - - Element inputElement = input.getElement(); - - if (inputElement.hasAttribute("name")) - currentInput.setAttribute("messageLabel",inputElement.getAttribute("name")); - - Element partElement = getPartElement(input); - if (partElement.hasAttribute("element")) - currentInput.setAttribute("element",partElement.getAttribute("element")); - // TBD - what if the part uses "type"? - - currentOperation.appendChild(currentInput); - } - - private Element getPartElement(MessageReference messageRef) - { - Iterator iterator = messageRef.getEMessage().getEParts().iterator(); - // TBD - for now, take the first part. - Part part = (Part)iterator.next(); - Element partElement = part.getElement(); - return partElement; - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitOutput(org.eclipse.wst.wsdl.Output) - */ - protected void visitOutput(Output output) - { - Element currentOutput = createWSDLElement("output"); - processDocumentation(output.getDocumentationElement(),currentOutput); - - Element outputElement = output.getElement(); - - if (outputElement.hasAttribute("name")) - currentOutput.setAttribute("messageLabel",outputElement.getAttribute("name")); - - Element partElement = getPartElement(output); - if (partElement.hasAttribute("element")) - currentOutput.setAttribute("element",partElement.getAttribute("element")); - // TBD - what if the part uses "type"? - - currentOperation.appendChild(currentOutput); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitFault(org.eclipse.wst.wsdl.Fault) - */ - protected void visitFault(Fault fault) - { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitBinding(org.eclipse.wst.wsdl.Binding) - */ - protected void visitBinding(Binding binding) - { - currentBinding = createWSDLElement("binding"); - processDocumentation(binding.getDocumentationElement(),currentBinding); - - Element bindingElement = binding.getElement(); - if (bindingElement.hasAttribute("name")) - currentBinding.setAttribute("name",bindingElement.getAttribute("name")); - if (bindingElement.hasAttribute("type")) - currentBinding.setAttribute("interface",bindingElement.getAttribute("type")); - - // TBD - is the next line fixed for SOAP? - currentBinding.setAttribute("type","http://www.w3.org/2004/08/wsdl/soap12"); - currentBinding.setAttribute("wsoap:protocol","http://www.w3.org/2003/05/soap/bindings/HTTP"); - currentBinding.setAttribute("wsoap:mepDefault","http://www.w3.org.2003/05/soap/mep/request-response"); - - description.appendChild(currentBinding); - super.visitBinding(binding); - } - - protected void visitBindingOperation(BindingOperation operation) - { - currentBindingOperation = createWSDLElement("operation"); - processDocumentation(operation.getDocumentationElement(),currentBindingOperation); - - Element operationElement = operation.getElement(); - String operationName = operation.getEOperation().getName(); - - // Determine prefix - String prefix = null; - String targetNamespace = null; - Definition def = operation.getEnclosingDefinition(); - if (def != null) - targetNamespace = def.getTargetNamespace(); - if (targetNamespace != null) - prefix = def.getPrefix(targetNamespace); - - if (prefix == null) - prefix = ""; - else - prefix += ":"; - - currentBindingOperation.setAttribute("ref",prefix + operationName); - - currentBinding.appendChild(currentBindingOperation); - super.visitBindingOperation(operation); - } - - protected void visitBindingInput(BindingInput input) - { - currentBindingInput = createWSDLElement("input"); - processDocumentation(input.getDocumentationElement(),currentBindingInput); - - Element inputElement = input.getElement(); - String inputName = input.getName(); - if (inputName != null) - inputElement.setAttribute("name",inputName); - - currentBindingOperation.appendChild(currentBindingInput); - super.visitBindingInput(input); - } - - protected void visitBindingOutput(BindingOutput output) - { - currentBindingOutput = createWSDLElement("output"); - processDocumentation(output.getDocumentationElement(),currentBindingOutput); - - Element outputElement = output.getElement(); - String outputName = output.getName(); - if (outputName != null) - outputElement.setAttribute("name",outputName); - - currentBindingOperation.appendChild(currentBindingOutput); - super.visitBindingOutput(output); - } - - protected void visitBindingFault(BindingFault fault) - { - currentBindingFault = createWSDLElement("fault"); - processDocumentation(fault.getDocumentationElement(),currentBindingFault); - - Element faultElement = fault.getElement(); - String faultName = fault.getName(); - if (faultName != null) - faultElement.setAttribute("name",faultName); - - currentBindingOperation.appendChild(currentBindingFault); - super.visitBindingFault(fault); - } - - protected void visitService(Service service) - { - currentService = createWSDLElement("service"); - processDocumentation(service.getDocumentationElement(),currentService); - - Element serviceElement = service.getElement(); - if (serviceElement.hasAttribute("name")) - currentService.setAttribute("name",serviceElement.getAttribute("name")); - - description.appendChild(currentService); - super.visitService(service); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitPort(org.eclipse.wst.wsdl.Port) - */ - protected void visitPort(Port port) - { - currentEndpoint = createWSDLElement("endpoint"); - processDocumentation(port.getDocumentationElement(),currentEndpoint); - - Element portElement = port.getElement(); - if (portElement.hasAttribute("name")) - currentEndpoint.setAttribute("name",portElement.getAttribute("name")); - if (portElement.hasAttribute("binding")) - currentEndpoint.setAttribute("binding",portElement.getAttribute("binding")); - - // Add interface to current service - Binding binding = port.getEBinding(); - if (binding != null) // binding could not be resolved - { - Element bindingElement = binding.getElement(); - if (bindingElement.hasAttribute("type")) - currentService.setAttribute("interface",bindingElement.getAttribute("type")); - } - - currentService.appendChild(currentEndpoint); - super.visitPort(port); - } - - /* (non-Javadoc) - * @see org.eclipse.wst.wsdl.tests.util.DefinitionVisitor#visitExtensibilityElement(org.eclipse.wst.wsdl.ExtensibleElement, org.eclipse.wst.wsdl.ExtensibilityElement) - */ - protected void visitExtensibilityElement(ExtensibleElement owner, ExtensibilityElement extensibilityElement) - { - // TBD - It is not just SOAP binding - if (owner instanceof org.eclipse.wst.wsdl.internal.impl.PortImpl) - { - Element soapElement = extensibilityElement.getElement(); - if (soapElement.hasAttribute("location")) - currentEndpoint.setAttribute("address",soapElement.getAttribute("location")); - } - else - { - Element domElement = extensibilityElement.getElement(); - Element adoptedDOMElement = (Element)doc.importNode(domElement,true); - - if (owner instanceof org.eclipse.wst.wsdl.internal.impl.DefinitionImpl) - description.insertBefore(adoptedDOMElement,description.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.ServiceImpl) - currentService.insertBefore(adoptedDOMElement,currentService.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.PortTypeImpl) - currentInterface.insertBefore(adoptedDOMElement,currentInterface.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.OperationImpl) - currentOperation.insertBefore(adoptedDOMElement,currentOperation.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingImpl) - currentBinding.insertBefore(adoptedDOMElement,currentBinding.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingOperationImpl) - currentBindingOperation.insertBefore(adoptedDOMElement,currentBindingOperation.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingInputImpl) - currentBindingInput.insertBefore(adoptedDOMElement,currentBindingInput.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingOutputImpl) - currentBindingOutput.insertBefore(adoptedDOMElement,currentBindingOutput.getFirstChild()); - else if (owner instanceof org.eclipse.wst.wsdl.internal.impl.BindingFaultImpl) - currentBindingFault.insertBefore(adoptedDOMElement,currentBindingFault.getFirstChild()); - - } - - } - - public static Test suite() - { - TestSuite suite = new TestSuite(); - - suite.addTest - (new WSDLConverter("Convert") - { - protected void runTest() - { - testConvert(); - } - } - ); - return suite; - } - - public void testConvert() - { - try - { - Definition def = DefinitionLoader.load("d:/eclipse301/eclipse/workspace/org.eclipse.wst.wsdl.tests/PTATimeDistribution.wsdl"); - WSDLConverter converter = new WSDLConverter(def); - converter.generate20("d:/eclipse301/eclipse/workspace/org.eclipse.wst.wsdl.tests/PTATimeDistribution20.wsdl"); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public static void main(String[] args) - { - junit.textui.TestRunner.run(suite()); - /* - try - { - Definition def = DefinitionLoader.load(args[0]); - WSDLConverter converter = new WSDLConverter(def); - converter.generate20("test20.wsdl"); - } - catch (Exception e) - { - e.printStackTrace(); - }*/ - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java deleted file mode 100644 index a4c5b3bc8..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/WSDLModelLocatorAdapterFactory.java +++ /dev/null @@ -1,46 +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.wsdl.tests.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.emf.common.notify.impl.AdapterImpl; -import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; -import org.eclipse.wst.wsdl.internal.util.WSDLModelLocator; - -public class WSDLModelLocatorAdapterFactory extends AdapterFactoryImpl -{ - protected CustomWSDLModelLocator customWSDLModelLocator = new CustomWSDLModelLocator(); - - class CustomWSDLModelLocator extends AdapterImpl implements WSDLModelLocator - { - public String resolveURI(String baseLocation, String namespace, String location) - { - return URIResolverPlugin.createResolver().resolve(baseLocation, namespace, location); - } - - public boolean isAdatperForType(Object type) - { - return type == WSDLModelLocator.class; - } - } - - public boolean isFactoryForType(Object type) - { - return type == WSDLModelLocator.class; - } - - public Adapter adaptNew(Notifier target, Object type) - { - return customWSDLModelLocator; - } -}
\ No newline at end of file diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java deleted file mode 100644 index 907a3306e..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XMLDiff.java +++ /dev/null @@ -1,169 +0,0 @@ -package org.eclipse.wst.wsdl.tests.util; - -import org.w3c.dom.*; -import org.xml.sax.SAXException; - -import java.io.*; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; - -/** - * @author Kihup Boo - */ -public class XMLDiff -{ - private PrintStream out = System.out; - private boolean DIFF_ELEMENT_NODE_ONLY = false; - - public boolean diff(String file1, String file2) throws ParserConfigurationException, SAXException, IOException - { - return diff(file1,file2,false); - } - - public boolean diff(String file1, String file2, boolean elementOnly) throws ParserConfigurationException, SAXException, IOException - { - Document doc1 = getDocument(file1); - Document doc2 = getDocument(file2); - DIFF_ELEMENT_NODE_ONLY = elementOnly; - return diff(doc1,doc2); - } - - public boolean diff(Document doc1, Document doc2) - { - Element root1 = doc1.getDocumentElement(); - Element root2 = doc2.getDocumentElement(); - return compareNodes(root1,root2); - } - - private Document getDocument(String uri) throws ParserConfigurationException, SAXException, IOException - { - DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder(); - Document doc = builder.parse(uri); - return doc; - } - - private boolean compareNodes(Node node1, Node node2) - { - if (DIFF_ELEMENT_NODE_ONLY) - { - // Compare only element nodes in the children. - filterNonElementNodes(node1); - filterNonElementNodes(node2); - } - - if (node1.getNodeType() != node2.getNodeType() - || node1.getNodeName() != node2.getNodeName()) - { - println("Node type or node name is different:"); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - - if (!compareAttributes(node1,node2)) - return false; - - NodeList nodeList1 = node1.getChildNodes(); - NodeList nodeList2 = node2.getChildNodes(); - if (nodeList1.getLength() != nodeList2.getLength()) - { - println("The number of children is different:"); - //println("Node 1: " + nodeList1.getLength()); - //println("Node 2: " + nodeList2.getLength()); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - - boolean result = true; - int length = nodeList1.getLength(); - for (int i=0; i<length; i++) - { - result = compareNodes(nodeList1.item(i),nodeList2.item(i)); - if (!result) - return false; - } - return true; - } - - private void filterNonElementNodes(Node node) - { - Node firstChild = node.getFirstChild(); - while (firstChild.getNodeType() != Node.ELEMENT_NODE) - { - node.removeChild(firstChild); - firstChild = node.getFirstChild(); - } - - Node sibling = firstChild.getNextSibling(); - Node deleteMe = null; - while (sibling != null) - { - if (sibling.getNodeType() != Node.ELEMENT_NODE) - { - deleteMe = sibling; - sibling = sibling.getNextSibling(); - node.removeChild(deleteMe); - } - - } - } - - private boolean compareAttributes(Node node1, Node node2) - { - NamedNodeMap nodeMap1 = node1.getAttributes(); - NamedNodeMap nodeMap2 = node2.getAttributes(); - - if (nodeMap1 == null || nodeMap2 == null) - { - if (nodeMap1 == null && nodeMap2 == null) - return true; - else - return false; - } - - if (nodeMap1.getLength() != nodeMap2.getLength()) - { - println("The number of attributes is different:"); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - - Node attrNode1 = null; - Node attrNode2 = null; - int length = nodeMap1.getLength(); - for (int i=0; i<length; i++) - { - attrNode1 = nodeMap1.item(i); - attrNode2 = nodeMap2.getNamedItem(attrNode1.getNodeName()); - if (attrNode2 == null) - { - println("The attribute is not found in Node 2: " + attrNode1.getNodeName()); - println("Node 1: " + node1.getNodeName()); - println("Node 2: " + node2.getNodeName()); - return false; - } - else if (!attrNode1.getNodeValue().equals(attrNode2.getNodeValue())) - { - println("The attribute values are different:"); - println("Node 1: " + node1.getNodeName() + "," + attrNode1.getNodeValue()); - println("Node 2: " + node2.getNodeName() + "," + attrNode2.getNodeValue()); - return false; - } - } - return true; - } - - private void print(String s) - { - out.print(s); - } - - private void println(String s) - { - out.println(s); - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java deleted file mode 100644 index 5bbba8750..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverAdapterFactory.java +++ /dev/null @@ -1,31 +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.wsdl.tests.util; - -import org.eclipse.emf.common.notify.Adapter; -import org.eclipse.emf.common.notify.Notifier; -import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl; -import org.eclipse.xsd.util.XSDSchemaLocationResolver; - -public class XSDSchemaLocationResolverAdapterFactory extends AdapterFactoryImpl -{ - protected XSDSchemaLocationResolverImpl schemaLocator = new XSDSchemaLocationResolverImpl(); - - public boolean isFactoryForType(Object type) - { - return type == XSDSchemaLocationResolver.class; - } - - public Adapter adaptNew(Notifier target, Object type) - { - return schemaLocator; - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java b/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java deleted file mode 100644 index 7a4387a09..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/src/org/eclipse/wst/wsdl/tests/util/XSDSchemaLocationResolverImpl.java +++ /dev/null @@ -1,31 +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.wsdl.tests.util; - -import org.eclipse.emf.common.notify.impl.AdapterImpl; -import org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin; -import org.eclipse.xsd.XSDSchema; -import org.eclipse.xsd.util.XSDSchemaLocationResolver; -import org.eclipse.xsd.util.XSDSchemaLocator; - -public class XSDSchemaLocationResolverImpl extends AdapterImpl implements XSDSchemaLocationResolver -{ - public String resolveSchemaLocation(XSDSchema xsdSchema, String namespaceURI, String schemaLocationURI) - { - String baseLocation = xsdSchema.getSchemaLocation(); - return URIResolverPlugin.createResolver().resolve(baseLocation, namespaceURI, schemaLocationURI); - } - - public boolean isAdatperForType(Object type) - { - return type == XSDSchemaLocator.class; - } -} diff --git a/tests/org.eclipse.wst.wsdl.tests/test.xml b/tests/org.eclipse.wst.wsdl.tests/test.xml deleted file mode 100644 index 3ae7ed8eb..000000000 --- a/tests/org.eclipse.wst.wsdl.tests/test.xml +++ /dev/null @@ -1,53 +0,0 @@ -<?xml version="1.0"?> - -<project name="testsuite" default="run" basedir="."> - <!-- The property ${eclipse-home} should be passed into this script --> - <!-- Set a meaningful default value for when it is not. --> - <!-- <property name="eclipse-home" value="${basedir}\..\.." /> --> - - <echo message="basedir ${basedir}" /> - <echo message="eclipse place ${eclipse-home}" /> - - <!-- sets the properties plugin-name, and library-file --> - <property name="plugin-name" value="org.eclipse.wst.wsdl.tests" /> - <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml" /> - - <!-- This target holds all initialization code that needs to be done for --> - <!-- all tests that are to be run. Initialization for individual tests --> - <!-- should be done within the body of the suite target. --> - <target name="init"> - <tstamp/> - <delete> - <fileset dir="${eclipse-home}" includes="org.eclipse.wst.wsdl.tests.*xml" /> - </delete> - </target> - - <!-- This target defines the tests that need to be run. --> - <target name="suite"> - <property name="wst-folder" value="${eclipse-home}/wst_folder"/> - <delete dir="${wst-folder}" quiet="true"/> - <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}"> - <property name="data-dir" value="${wst-folder}"/> - <property name="plugin-name" value="${plugin-name}"/> - <property name="classname" value="org.eclipse.wst.wsdl.tests.AllTestCases" /> - <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/> - </ant> - </target> - - <!-- This target holds code to cleanup the testing environment after --> - <!-- after all of the tests have been run. You can use this target to --> - <!-- delete temporary files that have been created. --> - <target name="cleanup"> - <!--<delete dir="${workspace}" quiet="true" />--> - </target> - - <!-- This target runs the test suite. Any actions that need to happen --> - <!-- after all the tests have been run should go here. --> - <target name="run" depends="init,suite,cleanup"> - <ant target="collect" antfile="${library-file}" dir="${eclipse-home}"> - <property name="includes" value="org.eclipse.wst.wsdl.tests.*xml" /> - <property name="output-file" value="${plugin-name}.xml" /> - </ant> - </target> - -</project>
\ No newline at end of file |