Author: antelder
Date: Fri Aug 17 11:39:29 2012
New Revision: 1374206
URL: http://svn.apache.org/viewvc?rev=1374206&view=rev
Log:
Change the dynamically added endpoint tests to use wsdl resource from a
contribution and simplify the endpoint creation helper
Added:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/resources/resources.zip
(with props)
Removed:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/resources/helloworld.wsdl
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/sample/HelloworldDynamicWSImpl.java
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/DynamicEndpointTestCase.java
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/sample/HelloworldDynamicWSImpl.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/sample/HelloworldDynamicWSImpl.java?rev=1374206&r1=1374205&r2=1374206&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/sample/HelloworldDynamicWSImpl.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/sample/HelloworldDynamicWSImpl.java
Fri Aug 17 11:39:29 2012
@@ -18,15 +18,20 @@
*/
package sample;
-import java.io.File;
import java.io.IOException;
import javax.xml.namespace.QName;
import org.apache.tuscany.sca.Node;
+import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.impl.NodeImpl;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
+import org.apache.tuscany.sca.monitor.ValidationException;
import org.apache.tuscany.sca.runtime.DOMInvoker;
import org.apache.tuscany.sca.runtime.TuscanyComponentContext;
+import org.oasisopen.sca.NoSuchServiceException;
import org.oasisopen.sca.annotation.Context;
import org.oasisopen.sca.annotation.Init;
import org.xml.sax.SAXException;
@@ -37,30 +42,41 @@ import test.EndpointHelper;
public class HelloworldDynamicWSImpl implements Helloworld {
@Context
- TuscanyComponentContext context;
+ private TuscanyComponentContext context;
+
private DOMHelper domHelper;
- private DOMInvoker domInvoker;
+ private Node node;
@Init
public void init() {
- try {
-
- domHelper =
DOMHelper.getInstance(context.getExtensionPointRegistry());
- Node node = context.getNode();
- EndpointHelper.addWSEndpoint(node, "SomeEndpointName", new
File("src/test/resources/helloworld.wsdl").toURI().toURL(), new
QName("http://sample/";, "Helloworld"),
"http://localhost:8089/testComponent/Helloworld";);
-
- domInvoker = node.getDOMInvoker("SomeEndpointName");
-
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ domHelper = DOMHelper.getInstance(context.getExtensionPointRegistry());
+ node = context.getNode();
}
public String sayHello(String name) {
- org.w3c.dom.Node arg = getRequestDOM(name);
- org.w3c.dom.Node response = domInvoker.invoke("sayHello", arg);
- return "Remote WS says: " + getResponseString(response);
+ try {
+
+ String curi =
node.installContribution("src/test/resources/resources.zip");
+
+ Endpoint endpoint =
EndpointHelper.createWSEndpoint("SomeEndpointName", new QName("http://sample/";,
"Helloworld"), "http://localhost:8080/testComponent/Helloworld";, curi, node);
+
+ ((NodeImpl)node).getEndpointRegistry().addEndpoint(endpoint);
+
+ DOMInvoker domInvoker = node.getDOMInvoker("SomeEndpointName");
+ org.w3c.dom.Node arg = getRequestDOM(name);
+ org.w3c.dom.Node response = domInvoker.invoke("sayHello", arg);
+ return "Remote WS says: " + getResponseString(response);
+
+ } catch (ContributionReadException e) {
+ throw new RuntimeException(e);
+ } catch (ValidationException e) {
+ throw new RuntimeException(e);
+ } catch (NoSuchServiceException e) {
+ throw new RuntimeException(e);
+ } catch (InvalidInterfaceException e) {
+ throw new RuntimeException(e);
+ }
}
private String getResponseString(org.w3c.dom.Node responseDOM) {
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/DynamicEndpointTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/DynamicEndpointTestCase.java?rev=1374206&r1=1374205&r2=1374206&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/DynamicEndpointTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/DynamicEndpointTestCase.java
Fri Aug 17 11:39:29 2012
@@ -18,7 +18,6 @@
*/
package test;
-import java.io.File;
import java.io.IOException;
import javax.xml.namespace.QName;
@@ -28,8 +27,10 @@ import junit.framework.TestCase;
import org.apache.tuscany.sca.Node;
import org.apache.tuscany.sca.TuscanyRuntime;
+import org.apache.tuscany.sca.assembly.Endpoint;
import org.apache.tuscany.sca.common.xml.dom.DOMHelper;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.impl.NodeImpl;
import org.apache.tuscany.sca.runtime.DOMInvoker;
import org.junit.Test;
import org.xml.sax.SAXException;
@@ -64,7 +65,11 @@ public class DynamicEndpointTestCase ext
@Test
public void testInvoke() throws Exception {
- EndpointHelper.addWSEndpoint(node, "SomeEndpointName", new
File("src/test/resources/helloworld.wsdl").toURI().toURL(), new
QName("http://sample/";, "Helloworld"),
"http://localhost:8089/testComponent/Helloworld";);
+ String curi =
node.installContribution("src/test/resources/resources.zip");
+
+ Endpoint endpoint =
EndpointHelper.createWSEndpoint("SomeEndpointName", new QName("http://sample/";,
"Helloworld"), "http://localhost:8080/testComponent/Helloworld";, curi, node);
+
+ ((NodeImpl)node).getEndpointRegistry().addEndpoint(endpoint);
DOMInvoker domInvoker = node.getDOMInvoker("SomeEndpointName");
Modified:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java?rev=1374206&r1=1374205&r2=1374206&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
(original)
+++
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/java/test/EndpointHelper.java
Fri Aug 17 11:39:29 2012
@@ -1,8 +1,5 @@
package test;
-import java.net.URI;
-import java.net.URL;
-
import javax.wsdl.PortType;
import javax.wsdl.Service;
import javax.xml.namespace.QName;
@@ -15,27 +12,22 @@ import org.apache.tuscany.sca.assembly.E
import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.ContributionFactory;
-import
org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import
org.apache.tuscany.sca.contribution.processor.ExtensibleURLArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import
org.apache.tuscany.sca.contribution.processor.URLArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ExtensibleModelResolver;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import
org.apache.tuscany.sca.contribution.resolver.ModelResolverExtensionPoint;
import org.apache.tuscany.sca.core.ExtensionPointRegistry;
import org.apache.tuscany.sca.core.FactoryExtensionPoint;
import org.apache.tuscany.sca.impl.NodeImpl;
+import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
+import org.apache.tuscany.sca.monitor.ValidationException;
public class EndpointHelper {
- // TODO: change this to be a method on Node that takes a configured
Binding to add a new endpoint
- public static void addWSEndpoint(Node node, String endpointName, URL
wsdlURL, QName portTypeQN, String targetURL) {
+ public static Endpoint createWSEndpoint(String endpointName, QName
wsdlPortQN, String targetURL, String curi, Node node) throws
ContributionReadException, ValidationException, InvalidInterfaceException {
ExtensionPointRegistry extensionPoints =
((NodeImpl)node).getExtensionPointRegistry();
FactoryExtensionPoint modelFactories =
extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
AssemblyFactory assemblyFactory =
modelFactories.getFactory(AssemblyFactory.class);
@@ -47,7 +39,23 @@ public class EndpointHelper {
WebServiceBinding wsBinding =
webServiceBindingFactory.createWebServiceBinding();
wsBinding.setURI(targetURL);
- WSDLInterfaceContract wsdlIC = getWSDLInterfaceContract(wsdlURL,
portTypeQN, modelFactories, extensionPoints);
+ WSDLFactory wif = modelFactories.getFactory(WSDLFactory.class);
+
+ Contribution c = node.getContribution(curi);
+ WSDLDefinition wd = wif.createWSDLDefinition();
+ wd.setUnresolved(true);
+ wd.setNamespace(wsdlPortQN.getNamespaceURI());
+ wd.setNameOfPortTypeToResolve(wsdlPortQN);
+ ProcessorContext ctx = new ProcessorContext();
+ wd = c.getModelResolver().resolveModel(WSDLDefinition.class, wd, ctx);
+ WSDLObject<PortType> pt = wd.getWSDLObject(PortType.class, wsdlPortQN);
+
+ WSDLInterface nwi = wif.createWSDLInterface(pt.getElement(), wd,
c.getModelResolver(), null);
+ nwi.setWsdlDefinition(wd);
+
+ WSDLInterfaceContract wsdlIC = wif.createWSDLInterfaceContract();
+ wsdlIC.setInterface(nwi);
+
wsBinding.setBindingInterfaceContract(wsdlIC);
wsBinding.setGeneratedWSDLDocument(((WSDLInterface)wsdlIC.getInterface()).getWsdlDefinition().getDefinition());
@@ -61,41 +69,7 @@ public class EndpointHelper {
newEndpoint.setBinding(wsBinding);
newEndpoint.setURI(endpointName);
newEndpoint.setRemote(true);
-
- ((NodeImpl)node).getEndpointRegistry().addEndpoint(newEndpoint);
+ return newEndpoint;
}
- private static WSDLInterfaceContract getWSDLInterfaceContract(URL
wsdlURL, QName portTypeQN, FactoryExtensionPoint modelFactories,
ExtensionPointRegistry extensionPoints) {
- try {
-
- ContributionFactory contributionFactory =
modelFactories.getFactory(ContributionFactory.class);
- Contribution contribution =
contributionFactory.createContribution();
- ModelResolverExtensionPoint modelResolvers =
extensionPoints.getExtensionPoint(ModelResolverExtensionPoint.class);
- ModelResolver modelResolver = new
ExtensibleModelResolver(contribution, modelResolvers, modelFactories);
- contribution.setModelResolver(modelResolver);
-
- ExtensibleURLArtifactProcessor aproc = new
ExtensibleURLArtifactProcessor(extensionPoints.getExtensionPoint(URLArtifactProcessorExtensionPoint.class));
-
- ProcessorContext ctx = new ProcessorContext();
- WSDLDefinition wd = aproc.read(null, new URI("anything.wsdl"),
wsdlURL, ctx, WSDLDefinition.class);
- modelResolver.addModel(wd, ctx);
- modelResolver.resolveModel(WSDLDefinition.class, wd, ctx);
- final WSDLObject<PortType> pt = wd.getWSDLObject(PortType.class,
portTypeQN);
- if(pt == null)
- throw new ContributionResolveException("Couldn't find " +
portTypeQN);
-
- WSDLFactory wif = modelFactories.getFactory(WSDLFactory.class);
- final WSDLInterface nwi =
wif.createWSDLInterface(pt.getElement(), wd, modelResolver, null);
- nwi.setWsdlDefinition(wd);
-
- WSDLInterfaceContract wsdlIC = wif.createWSDLInterfaceContract();
- wsdlIC.setInterface(nwi);
-
- return wsdlIC;
-
- } catch(Exception e) {
- throw new RuntimeException(e);
- }
- }
-
}
Added:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/resources/resources.zip
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/resources/resources.zip?rev=1374206&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
tuscany/sca-java-2.x/trunk/testing/itest/dynamic/src/test/resources/resources.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
