You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2008/04/25 07:34:50 UTC
svn commit: r651490 [1/2] - in /incubator/tuscany/java/sca:
itest/callablereferences/
itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/
itest/callablereferences/src/main/resources/nodeA/
itest/callablereferences/src/main/...
Author: slaws
Date: Thu Apr 24 22:34:47 2008
New Revision: 651490
URL: http://svn.apache.org/viewvc?rev=651490&view=rev
Log:
Where a target cannot be resolved in the BaseWireBuilderImpl clone an sca binding to represent the unresolved target. This sca binding can then do whatever resolution processing is required at a later stage. I also took this opportunity to tidy up the sca binding and remove much of the old target resolution code. I also fixed the tests that relied on it. TUSCANY-2269 also went in, thanks Ram for the patch.
Added:
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCaseOFF.java
- copied, changed from r650777, incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCaseOFF.java
- copied, changed from r650777, incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCaseOFF.java
- copied, changed from r650777, incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCaseOFF.java
- copied, changed from r650777, incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCaseOFF.java
- copied, changed from r650777, incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
Removed:
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCaseOff.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/BaseTest.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/NodeFactoryImpl.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestDomain.java
incubator/tuscany/java/sca/modules/domain-impl/src/test/java/org/apache/tuscany/sca/domain/impl/DomainImplTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/DomainDrivenTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeDrivenTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/NodeMemoryTestCase.java
incubator/tuscany/java/sca/modules/node-impl/src/test/java/org/apache/tuscany/sca/node/impl/StandaloneNodeTestCase.java
Modified:
incubator/tuscany/java/sca/itest/callablereferences/pom.xml
incubator/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/pom.xml
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite
incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
incubator/tuscany/java/sca/itest/oneway/pom.xml
incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
incubator/tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
incubator/tuscany/java/sca/itest/references/src/main/resources/AutoWiredReferencesTest.composite
incubator/tuscany/java/sca/itest/validation/src/test/java/calculator/ComponentReferenceTargetNotFoundTestCase.java
incubator/tuscany/java/sca/modules/assembly/src/main/java/org/apache/tuscany/sca/assembly/builder/impl/BaseWireBuilderImpl.java
incubator/tuscany/java/sca/modules/assembly/src/main/resources/assembly-validation-messages_en.properties
incubator/tuscany/java/sca/modules/binding-sca-axis2/pom.xml
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCABindingInvoker.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/main/java/org/apache/tuscany/sca/binding/sca/axis2/impl/Axis2SCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/AsynchTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/CallbackTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/PromotionTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/SimpleTestCase.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/java/org/apache/tuscany/sca/binding/sca/axis2/TestNode.java
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeA/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeB/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeC/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeD/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeE/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeF/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeG/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca-axis2/src/test/resources/nodeH/HelloWorld.composite
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAReferenceBindingProvider.java
incubator/tuscany/java/sca/modules/binding-sca/src/main/java/org/apache/tuscany/sca/binding/sca/impl/RuntimeSCAServiceBindingProvider.java
incubator/tuscany/java/sca/modules/core/src/main/java/org/apache/tuscany/sca/core/assembly/CompositeActivatorImpl.java
incubator/tuscany/java/sca/modules/implementation-node/src/test/java/org/apache/tuscany/sca/implementation/node/builder/impl/CalculateBindingURITestCase.java
incubator/tuscany/java/sca/modules/node2-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified: incubator/tuscany/java/sca/itest/callablereferences/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/pom.xml?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/pom.xml Thu Apr 24 22:34:47 2008
@@ -44,17 +44,10 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-node2-impl</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-impl</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callableref/AComponentImpl.java Thu Apr 24 22:34:47 2008
@@ -87,7 +87,7 @@
/**
* A test case to work out what needs to be done in a transformer to get the
- * CallableReference across the wire. Let here for interest in case anyone
+ * CallableReference across the wire. Left here for interest in case anyone
* is looking for how to get at the innards of CallableReferences
*/
public String fooStringD() {
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite Thu Apr 24 22:34:47 2008
@@ -19,29 +19,28 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:foo="http://foo" targetNamespace="http://foo"
name="CompositeA" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <service name="AComponentService" promote="AComponent">
+ <!--service name="AComponentService" promote="AComponent">
<interface.java interface="org.apache.tuscany.sca.itest.callableref.AComponent" />
- </service>
+ <binding.sca uri="http://localhost:8084/AComponentService"/>
+ </service-->
<component name="AComponent">
<implementation.java class="org.apache.tuscany.sca.itest.callableref.AComponentImpl" />
- <reference name="bReference" target="BComponent" />
- <reference name="cReference" target="CComponent" />
- <reference name="cServiceReference" target="CComponent" />
- <reference name="dReference1" target="DComponent" />
+ <service name="AComponent">
+ <binding.sca uri="http://localhost:8084/AComponent"/>
+ </service>
+ <reference name="bReference">
+ <binding.sca uri="http://localhost:8085/BComponent" />
+ </reference>
+ <reference name="cReference">
+ <binding.sca uri="http://localhost:8085/CComponent" />
+ </reference>
+ <reference name="cServiceReference">
+ <binding.sca uri="http://localhost:8085/CComponent" />
+ </reference>
+ <reference name="dReference1">
+ <binding.sca uri="http://localhost:8085/DComponent" />
+ </reference>
</component>
- <!--
- <component name="BComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.callableref.BComponentImpl" />
- </component>
-
- <component name="CComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.callableref.CComponentImpl" />
- </component>
-
- <component name="DComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.callableref.DComponentImpl" />
- </component>
- -->
</composite>
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite Thu Apr 24 22:34:47 2008
@@ -21,14 +21,23 @@
<component name="BComponent">
<implementation.java class="org.apache.tuscany.sca.itest.callableref.BComponentImpl" />
+ <service name="BComponent">
+ <binding.sca uri="http://localhost:8085/BComponent"/>
+ </service>
</component>
<component name="CComponent">
<implementation.java class="org.apache.tuscany.sca.itest.callableref.CComponentImpl" />
+ <service name="CComponent">
+ <binding.sca uri="http://localhost:8085/CComponent"/>
+ </service>
</component>
<component name="DComponent">
<implementation.java class="org.apache.tuscany.sca.itest.callableref.DComponentImpl" />
+ <service name="DComponent">
+ <binding.sca uri="http://localhost:8085/DComponent"/>
+ </service>
</component>
</composite>
Modified: incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java Thu Apr 24 22:34:47 2008
@@ -21,16 +21,14 @@
import static junit.framework.Assert.assertEquals;
-import javax.xml.namespace.QName;
-
+import java.io.File;
import junit.framework.Assert;
-
-import org.apache.tuscany.sca.domain.SCADomain;
-import org.apache.tuscany.sca.domain.SCADomainFactory;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -42,9 +40,8 @@
*/
public class CallableReferenceRemoteTestCase {
- private static SCADomain domain;
- private static SCANode nodeA;
- private static SCANode nodeB;
+ private static SCANode2 nodeA;
+ private static SCANode2 nodeB;
private static AComponent acomponent;
@@ -52,30 +49,25 @@
public static void init() throws Exception {
try {
- System.out.println("Setting up domain");
- SCADomainFactory domainFactory = SCADomainFactory.newInstance();
- domain= domainFactory.createSCADomain("http://localhost:9999");
System.out.println("Setting up nodes");
- ClassLoader cl = CallableReferenceRemoteTestCase.class.getClassLoader();
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/nodeA").toURL().toString()));
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+
+ nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/nodeB").toURL().toString()));
- nodeA = nodeFactory.createSCANode("http://localhost:8100/nodeA", "http://localhost:9999");
- nodeA.addContribution("nodeA", cl.getResource("nodeA/"));
- nodeA.addToDomainLevelComposite(new QName("http://foo", "CompositeA"));
-
- nodeB = nodeFactory.createSCANode("http://localhost:8200/nodeB", "http://localhost:9999");
- nodeB.addContribution("nodeB", cl.getResource("nodeB/"));
- nodeB.addToDomainLevelComposite(new QName("http://foo", "CompositeB"));
-
- domain.start();
+ nodeA.start();
+ nodeB.start();
- // get a reference to the calculator service from domainA
- // which will be running this component
- acomponent = nodeA.getDomain().getService(AComponent.class, "AComponent/AComponent");
+ acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent");
+
} catch (Throwable ex) {
System.out.println(ex.toString());
// Print detailed cause information.
@@ -95,8 +87,8 @@
@AfterClass
public static void destroy() throws Exception {
// stop the nodes and hence the domains they contain
- nodeA.destroy();
- nodeB.destroy();
+ nodeA.stop();
+ nodeB.stop();
}
//@Test
Modified: incubator/tuscany/java/sca/itest/conversations-ws/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/pom.xml?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/pom.xml Thu Apr 24 22:34:47 2008
@@ -29,15 +29,11 @@
<name>Apache Tuscany SCA Conversations Over binding.ws Integration Tests</name>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
- </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-node2-impl</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite Thu Apr 24 22:34:47 2008
@@ -29,7 +29,7 @@
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
<binding.ws/>
<callback>
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatelessService"/>
</callback>
</reference>
<reference name="conversationalService2" target="ConversationalServiceStatelessSL">
@@ -45,7 +45,7 @@
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
<binding.ws/>
<callback>
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalStatelessClientStatefulService"/>
</callback>
</reference>
<reference name="conversationalService2" target="ConversationalServiceStateful">
@@ -61,7 +61,7 @@
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
<binding.ws/>
<callback>
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatelessService"/>
</callback>
</reference>
<reference name="conversationalService2" target="ConversationalServiceStatelessSL">
@@ -75,7 +75,7 @@
<reference name="conversationalService" target="ConversationalServiceStateful">
<binding.ws/>
<callback>
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalStatefulClientStatefulService"/>
</callback>
</reference>
<reference name="conversationalService2" target="ConversationalServiceStateful">
@@ -89,7 +89,7 @@
<reference name="conversationalService" target="ConversationalServiceRequest">
<binding.ws/>
<callback>
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalStatelessClientRequestService"/>
</callback>
</reference>
<reference name="conversationalService2" target="ConversationalServiceRequest">
@@ -102,7 +102,7 @@
<reference name="conversationalService" target="ConversationalServiceStatefulNonConversationalCallback">
<binding.ws/>
<callback>
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalStatefulClientNonConversationalCallbackStatefulService"/>
</callback>
</reference>
<reference name="conversationalService2" target="ConversationalServiceStatefulNonConversationalCallback">
@@ -119,7 +119,7 @@
<service name="ConversationalService">
<interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalServiceStateful"/>
<callback>
<binding.ws/>
</callback>
@@ -135,7 +135,7 @@
<service name="ConversationalService">
<interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalServiceStatelessSL"/>
<callback>
<binding.ws/>
</callback>
@@ -147,7 +147,7 @@
<service name="ConversationalService">
<interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback" />
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalServiceRequest"/>
<callback>
<binding.ws/>
</callback>
@@ -159,7 +159,7 @@
<service name="ConversationalServiceNonConversationalCallback">
<interface.java interface="org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback"
callbackInterface="org.apache.tuscany.sca.itest.conversational.NonConversationalCallback" />
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/ConversationalServiceStatefulNonConversationalCallback"/>
<callback>
<binding.ws/>
</callback>
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite Thu Apr 24 22:34:47 2008
@@ -21,23 +21,21 @@
targetNamespace="http://conversations"
name="ConversationalWSDLITest">
-
<component name="ConversationalStatelessClientStatefulService">
<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
<reference name="conversationalReferenceClient" target="ConversationalReferenceClient"/>
<reference name="conversationalService" target="ConversationalServiceStateful">
- <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.binding(ConversationalServiceSOAP11Binding)"/>
+ <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
</reference>
<reference name="conversationalService2" target="ConversationalServiceStateful">
- <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.binding(ConversationalServiceSOAP11Binding)"/>
+ <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
</reference>
</component>
-
<component name="ConversationalServiceStateful">
<implementation.java class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>
<service name="ConversationalService">
- <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.binding(ConversationalServiceSOAP11Binding)"/>
+ <binding.ws wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
</service>
</component>
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java Thu Apr 24 22:34:47 2008
@@ -20,11 +20,14 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
+
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -32,26 +35,28 @@
public class ConversationWSDLTestCase {
- private SCANode node;
+ private SCANode2 node;
private ConversationalClient conversationalStatelessClientStatefulService;
@Before
public void setUp() throws Exception {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- ConversationWSDLTestCase.class.getResource("/ConversationalWSDL/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalWSDLITest"));
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/ConversationalWSDL.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/ConversationalWSDL").toURL().toString()));
+
+
node.start();
- conversationalStatelessClientStatefulService = node.getDomain().getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");
+
ConversationalClientStatelessImpl.calls = new StringBuffer();
}
@After
public void tearDown() throws Exception {
- node.destroy();
+ node.stop();
conversationalStatelessClientStatefulService = null;
}
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java Thu Apr 24 22:34:47 2008
@@ -19,27 +19,27 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
import junit.framework.Assert;
-import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class NonConversationalCallbackTestCase {
- private static SCADomain domain;
- private static SCANode node;
+ private static SCANode2 node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -50,35 +50,36 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- StatefulStatefulTestCase.class.getResource("/Conversational/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalITest"));
- node.start();
- domain = node.getDomain();
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/Conversational").toURL().toString()));
+
+
+ node.start();
+
+ conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
"ConversationalStatelessClientStatelessService");
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
"ConversationalStatelessClientStatefulService");
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
+ conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
"ConversationalStatefulClientStatelessService");
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
+ conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
"ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
+ conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
"ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
+ conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
"ConversationalStatefulClientNonConversationalCallbackStatefulService");
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ // reset the place where we record the sequence of calls passing
+ // through each component instance
+ ConversationalServiceStatelessImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
} catch(Exception ex) {
System.err.println(ex.toString());
@@ -88,15 +89,13 @@
@AfterClass
public static void tearDown() throws Exception {
- node.destroy();
- domain = null;
+ node.stop();
conversationalStatelessClientStatelessService = null;
conversationalStatelessClientStatefulService = null;
conversationalStatefulClientStatelessService = null;
conversationalStatefulClientStatefulService = null;
conversationalStatelessClientRequestService = null;
conversationalStatefulClientNonConversationalCallbackStatelessService = null;
-
}
private static void resetCallStack() {
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java Thu Apr 24 22:34:47 2008
@@ -19,27 +19,28 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class RequestScopeTestCase {
- private static SCADomain domain;
- private static SCANode node;
+ private static SCANode2 node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -49,53 +50,53 @@
@BeforeClass
public static void setUp() throws Exception {
- try {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- StatefulStatefulTestCase.class.getResource("/Conversational/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalITest"));
- node.start();
- domain = node.getDomain();
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ try {
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/Conversational").toURL().toString()));
+
+
+ node.start();
+
+ conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatelessService");
+
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatefulService");
+
+ conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatelessService");
+
+ conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatefulService");
+ conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientRequestService");
+ conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
+ // reset the place where we record the sequence of calls passing
+ // through each component instance
+ ConversationalServiceStatelessImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
+ } catch(Exception ex) {
+ System.err.println(ex.toString());
+ }
}
@AfterClass
public static void tearDown() throws Exception {
- node.destroy();
- domain = null;
+ node.stop();
conversationalStatelessClientStatelessService = null;
conversationalStatelessClientStatefulService = null;
conversationalStatefulClientStatelessService = null;
conversationalStatefulClientStatefulService = null;
conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
+ conversationalStatefulClientNonConversationalCallbackStatelessService = null;
}
private static void resetCallStack() {
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java Thu Apr 24 22:34:47 2008
@@ -19,26 +19,27 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class StatefulStatefulTestCase {
- private static SCADomain domain;
- private static SCANode node;
+ private static SCANode2 node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -48,47 +49,47 @@
@BeforeClass
public static void setUp() throws Exception {
- try {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- StatefulStatefulTestCase.class.getResource("/Conversational/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalITest"));
- node.start();
- domain = node.getDomain();
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ try {
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/Conversational").toURL().toString()));
+
+
+ node.start();
+
+ conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatelessService");
+
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatefulService");
+
+ conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatelessService");
+
+ conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatefulService");
+ conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientRequestService");
+ conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
+ // reset the place where we record the sequence of calls passing
+ // through each component instance
+ ConversationalServiceStatelessImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
+ } catch(Exception ex) {
+ System.err.println(ex.toString());
+ }
}
@AfterClass
public static void tearDown() throws Exception {
- node.destroy();
- domain = null;
+ node.stop();
conversationalStatelessClientStatelessService = null;
conversationalStatelessClientStatefulService = null;
conversationalStatefulClientStatelessService = null;
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java Thu Apr 24 22:34:47 2008
@@ -19,26 +19,27 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class StatefulStatelessTestCase {
- private static SCADomain domain;
- private static SCANode node;
+ private static SCANode2 node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -48,47 +49,47 @@
@BeforeClass
public static void setUp() throws Exception {
- try {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- StatefulStatefulTestCase.class.getResource("/Conversational/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalITest"));
- node.start();
- domain = node.getDomain();
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ try {
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/Conversational").toURL().toString()));
+
+
+ node.start();
+
+ conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatelessService");
+
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatefulService");
+
+ conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatelessService");
+
+ conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatefulService");
+ conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientRequestService");
+ conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
+ // reset the place where we record the sequence of calls passing
+ // through each component instance
+ ConversationalServiceStatelessImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
+ } catch(Exception ex) {
+ System.err.println(ex.toString());
+ }
}
@AfterClass
public static void tearDown() throws Exception {
- node.destroy();
- domain = null;
+ node.stop();
conversationalStatelessClientStatelessService = null;
conversationalStatelessClientStatefulService = null;
conversationalStatefulClientStatelessService = null;
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java Thu Apr 24 22:34:47 2008
@@ -19,26 +19,26 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
import junit.framework.Assert;
-import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class StatelessStatefulTestCase {
- private static SCADomain domain;
- private static SCANode node;
+ private static SCANode2 node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -48,47 +48,47 @@
@BeforeClass
public static void setUp() throws Exception {
- try {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- StatefulStatefulTestCase.class.getResource("/Conversational/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalITest"));
- node.start();
- domain = node.getDomain();
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ try {
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/Conversational").toURL().toString()));
+
+
+ node.start();
+
+ conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatelessService");
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatefulService");
+
+ conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatelessService");
+
+ conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatefulService");
+ conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientRequestService");
+ conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
+ // reset the place where we record the sequence of calls passing
+ // through each component instance
+ ConversationalServiceStatelessImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
+
+ } catch(Exception ex) {
+ System.err.println(ex.toString());
+ }
}
@AfterClass
public static void tearDown() throws Exception {
- node.destroy();
- domain = null;
+ node.stop();
conversationalStatelessClientStatelessService = null;
conversationalStatelessClientStatefulService = null;
conversationalStatefulClientStatelessService = null;
Modified: incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java Thu Apr 24 22:34:47 2008
@@ -19,26 +19,26 @@
package org.apache.tuscany.sca.itest.conversational;
-import javax.xml.namespace.QName;
+import java.io.File;
import junit.framework.Assert;
-import org.apache.tuscany.sca.domain.SCADomain;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.SCAClient;
+import org.apache.tuscany.sca.node.SCANode2;
+import org.apache.tuscany.sca.node.SCANode2Factory;
+import org.apache.tuscany.sca.node.SCANode2Factory.SCAContribution;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
public class StatelessStatelessTestCase {
- private static SCADomain domain;
- private static SCANode node;
+ private static SCANode2 node;
private static ConversationalClient conversationalStatelessClientStatelessService;
private static ConversationalClient conversationalStatelessClientStatefulService;
private static ConversationalClient conversationalStatefulClientStatelessService;
@@ -48,47 +48,47 @@
@BeforeClass
public static void setUp() throws Exception {
- try {
- node = SCANodeFactory.newInstance().createSCANode(null, null);
- node.addContribution("mycontribution",
- StatefulStatefulTestCase.class.getResource("/Conversational/."));
- node.addToDomainLevelComposite(new QName("http://conversations", "ConversationalITest"));
- node.start();
- domain = node.getDomain();
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
+ try {
+ SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
+ node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
+ new SCAContribution("TestContribution",
+ new File("src/main/resources/Conversational").toURL().toString()));
+
+
+ node.start();
+
+ conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatelessService");
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
+ conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientStatefulService");
+
+ conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatelessService");
+
+ conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientStatefulService");
+ conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatelessClientRequestService");
+ conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
+ "ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
+ // reset the place where we record the sequence of calls passing
+ // through each component instance
+ ConversationalServiceStatelessImpl.calls = new StringBuffer();
+ ConversationalServiceStatefulImpl.calls = new StringBuffer();
+ ConversationalClientStatelessImpl.calls = new StringBuffer();
+ ConversationalClientStatefulImpl.calls = new StringBuffer();
+
+ } catch(Exception ex) {
+ System.err.println(ex.toString());
+ }
}
@AfterClass
public static void tearDown() throws Exception {
- node.destroy();
- domain = null;
+ node.stop();
conversationalStatelessClientStatelessService = null;
conversationalStatelessClientStatefulService = null;
conversationalStatefulClientStatelessService = null;
Modified: incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/domain/src/main/java/calculator/CalculatorServiceImpl.java Thu Apr 24 22:34:47 2008
@@ -26,13 +26,13 @@
*/
public class CalculatorServiceImpl implements CalculatorService {
- private AddService addService;
+ private AddService[] addService;
private SubtractService subtractService;
private MultiplyService multiplyService;
private DivideService divideService;
@Reference
- public void setAddService(AddService addService) {
+ public void setAddService(AddService[] addService) {
this.addService = addService;
}
@@ -53,7 +53,7 @@
public double add(double n1, double n2) {
System.out.println("CalculatorService - add " + n1 + " and " + n2);
- return addService.add(n1, n2);
+ return addService[1].add(addService[0].add(n1, n2), n2);
}
public double subtract(double n1, double n2) {
Modified: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite (original)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionDependent/Calculator.composite Thu Apr 24 22:34:47 2008
@@ -24,6 +24,9 @@
<component name="AddServiceComponentB">
<implementation.java class="calculator.AddServiceImpl" />
+ <service name="AddService">
+ <binding.ws uri="http://L3AW203:8085/AddServiceComponentB"/>
+ </service>
</component>
<component name="SubtractServiceComponentB">
Modified: incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite (original)
+++ incubator/tuscany/java/sca/itest/domain/src/main/resources/contributionPrimary/Calculator.composite Thu Apr 24 22:34:47 2008
@@ -30,12 +30,22 @@
<service name="CalculatorService">
<binding.sca/>
</service>
- <reference name="addService" target="AddServiceComponentB" />
+ <reference name="addService" multiplicity="0..n" target="AddServiceComponentA AddServiceComponentB AddServiceComponentC">
+ <binding.sca/>
+ <binding.ws/>
+ </reference>
<reference name="subtractService" target="SubtractServiceComponentB" />
- <reference name="multiplyService" target="MultiplyServiceComponentA"/>
+ <reference name="multiplyService" target="MultiplyServiceComponentA" />
<reference name="divideService" target="DivideServiceComponentA" />
</component>
+ <component name="AddServiceComponentA">
+ <implementation.java class="calculator.AddServiceImpl" />
+ <service name="AddService">
+ <binding.sca/>
+ </service>
+ </component>
+
<component name="MultiplyServiceComponentA">
<implementation.java class="calculator.MultiplyServiceImpl" />
</component>
Modified: incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java (original)
+++ incubator/tuscany/java/sca/itest/domain/src/test/java/org/apache/tuscany/sca/itest/domain/ContributionSPIsTestCase.java Thu Apr 24 22:34:47 2008
@@ -28,7 +28,6 @@
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
-import java.util.logging.Level;
import java.util.logging.Logger;
import javax.xml.namespace.QName;
@@ -44,7 +43,6 @@
import org.apache.tuscany.sca.assembly.builder.impl.CompositeBuilderImpl;
import org.apache.tuscany.sca.assembly.builder.impl.ComponentConfigurationBuilderImpl;
import org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;
-import org.apache.tuscany.sca.assembly.xml.Constants;
import org.apache.tuscany.sca.contribution.Artifact;
import org.apache.tuscany.sca.contribution.Contribution;
import org.apache.tuscany.sca.contribution.ContributionFactory;
@@ -310,7 +308,13 @@
CalculatorService calculatorService =
client.getService(CalculatorService.class, "CalculatorServiceComponentA");
- System.out.println("Add 2.0 + 3.0 = " + calculatorService.add(2.0, 3.0));
+ System.out.println("Add 2.0 + 3.0 + 3.0 = " + calculatorService.add(2.0, 3.0));
+
+/*
+ AssemblyInspector assemblyInspector = new AssemblyInspector();
+
+ System.out.println(assemblyInspector.assemblyAsString(node));
+*/
} catch (Exception ex) {
Modified: incubator/tuscany/java/sca/itest/oneway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/pom.xml?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/oneway/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/oneway/pom.xml Thu Apr 24 22:34:47 2008
@@ -29,11 +29,6 @@
<name>Apache Tuscany SCA OneWay Integration Tests</name>
<dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-incubating-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -49,7 +44,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
+ <artifactId>tuscany-node2-impl</artifactId>
<version>2.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite?rev=651490&r1=651489&r2=651490&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite (original)
+++ incubator/tuscany/java/sca/itest/oneway/src/main/resources/OneWayContribution/META-INF/sca-deployables/oneWay.composite Thu Apr 24 22:34:47 2008
@@ -33,7 +33,7 @@
<implementation.java class="org.apache.tuscany.sca.itest.oneway.impl.OneWayServiceImpl"/>
<service name="OneWayService">
<interface.java interface="org.apache.tuscany.sca.itest.oneway.OneWayService" />
- <binding.ws/>
+ <binding.ws uri="http://localhost:8085/OneWayServiceComponent"/>
</service>
</component>