Author: slaws
Date: Fri Nov 9 02:09:40 2007
New Revision: 593471
URL: http://svn.apache.org/viewvc?rev=593471&view=rev
Log:
Use the new node implementation and its ability to resolve targets for remote
bindings to remove the need to specify port numbers in the
conversation-ws itest. This was causing problems in the continuum build as the
port 8080 had been specified
Added:
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
- copied, changed from r592662,
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalServiceStateful.wsdl
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
- copied, changed from r592662,
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/conversationalWSDL.composite
Removed:
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalServiceStateful.wsdl
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/conversational.composite
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/conversationalWSDL.composite
Modified:
incubator/tuscany/java/sca/itest/conversations-ws/pom.xml
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
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=593471&r1=593470&r2=593471&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/conversations-ws/pom.xml Fri Nov 9
02:09:40 2007
@@ -31,9 +31,15 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>1.1-incubating-SNAPSHOT</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>1.1-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
Added:
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=593471&view=auto
==============================================================================
---
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
(added)
+++
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
Fri Nov 9 02:09:40 2007
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
+ targetNamespace="http://conversations";
+ name="ConversationalITest">
+
+ <component name="ConversationalStatelessClientStatelessService">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+ <reference name="conversationalReferenceClient"
target="ConversationalReferenceClient"/>
+ <reference name="conversationalService"
target="ConversationalServiceStatelessSL">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </reference>
+ <reference name="conversationalService2"
target="ConversationalServiceStatelessSL">
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component name="ConversationalStatelessClientStatefulService">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+ <reference name="conversationalReferenceClient"
target="ConversationalReferenceClient"/>
+ <reference name="conversationalService"
target="ConversationalServiceStateful">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </reference>
+ <reference name="conversationalService2"
target="ConversationalServiceStateful">
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component name="ConversationalStatefulClientStatelessService">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>
+ <reference name="conversationalReferenceClient"
target="ConversationalReferenceClient"/>
+ <reference name="conversationalService"
target="ConversationalServiceStatelessSL">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </reference>
+ <reference name="conversationalService2"
target="ConversationalServiceStatelessSL">
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component name="ConversationalStatefulClientStatefulService">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl"/>
+ <reference name="conversationalReferenceClient"
target="ConversationalReferenceClient"/>
+ <reference name="conversationalService"
target="ConversationalServiceStateful">
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </reference>
+ <reference name="conversationalService2"
target="ConversationalServiceStateful">
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component name="ConversationalStatelessClientRequestService">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl"/>
+ <reference name="conversationalReferenceClient"
target="ConversationalReferenceClient"/>
+ <reference name="conversationalService"
target="ConversationalServiceRequest">
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </reference>
+ <reference name="conversationalService2"
target="ConversationalServiceRequest">
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component
name="ConversationalStatefulClientNonConversationalCallbackStatefulService">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl"/>
+ <reference name="conversationalService"
target="ConversationalServiceStatefulNonConversationalCallback">
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </reference>
+ <reference name="conversationalService2"
target="ConversationalServiceStatefulNonConversationalCallback">
+ <binding.ws/>
+ </reference>
+ </component>
+
+ <component name="ConversationalReferenceClient">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalReferenceClientImpl"/>
+ </component>
+
+ <component name="ConversationalServiceStateful">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl"/>
+ <service name="ConversationalService">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </service>
+ </component>
+
+ <component name="ConversationalServiceStateless">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessScopeImpl"/>
+ </component>
+
+ <component name="ConversationalServiceStatelessSL">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl"/>
+ <service name="ConversationalService">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </service>
+ </component>
+
+ <component name="ConversationalServiceRequest">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl"/>
+ <service name="ConversationalService">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalService"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.ConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </service>
+ </component>
+
+ <component name="ConversationalServiceStatefulNonConversationalCallback">
+ <implementation.java
class="org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl"/>
+ <service name="ConversationalServiceNonConversationalCallback">
+ <interface.java
interface="org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback"
+
callbackInterface="org.apache.tuscany.sca.itest.conversational.NonConversationalCallback"
/>
+ <binding.ws/>
+ <callback>
+ <binding.ws/>
+ </callback>
+ </service>
+ </component>
+
+</composite>
Copied:
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
(from r592662,
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalServiceStateful.wsdl)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl?p2=incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl&p1=incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalServiceStateful.wsdl&r1=592662&r2=593471&rev=593471&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalServiceStateful.wsdl
(original)
+++
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
Fri Nov 9 02:09:40 2007
@@ -373,11 +373,11 @@
</wsdl:binding>
<wsdl:service name="ConversationalService">
<wsdl:port name="ConversationalServiceSOAP11port_http"
binding="ns0:ConversationalServiceSOAP11Binding">
- <soap:address
location="http://localhost:8080/ConversationalServiceStateful"/>
+ <soap:address
location="http://localhost:8085/ConversationalServiceStateful"/>
</wsdl:port>
<wsdl:port name="ConversationalServiceHttpport"
binding="ns0:ConversationalServiceHttpBinding">
- <http:address
location="http://localhost:8080/ConversationalServiceStateful"/>
+ <http:address
location="http://localhost:8085/ConversationalServiceStateful"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>
Copied:
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
(from r592662,
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/conversationalWSDL.composite)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite?p2=incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite&p1=incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/conversationalWSDL.composite&r1=592662&r2=593471&rev=593471&view=diff
==============================================================================
---
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/conversationalWSDL.composite
(original)
+++
incubator/tuscany/java/sca/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
Fri Nov 9 02:09:40 2007
@@ -19,19 +19,17 @@
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://conversations";
- name="ConversationalITest">
+ 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.port(ConversationalService/ConversationalServiceSOAP11port_http)"
-
uri="http://localhost:8080/ConversationalServiceStateful"/>
+ <binding.ws
wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.binding(ConversationalServiceSOAP11Binding)"/>
</reference>
<reference name="conversationalService2"
target="ConversationalServiceStateful">
- <binding.ws
wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.port(ConversationalService/ConversationalServiceSOAP11port_http)"
-
uri="http://localhost:8080/ConversationalServiceStateful"/>
+ <binding.ws
wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.binding(ConversationalServiceSOAP11Binding)"/>
</reference>
</component>
@@ -39,7 +37,7 @@
<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.port(ConversationalService/ConversationalServiceSOAP11port_http)"/>
+ <binding.ws
wsdlElement="http://conversational.itest.sca.tuscany.apache.org#wsdl.binding(ConversationalServiceSOAP11Binding)"/>
</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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -20,8 +20,16 @@
package org.apache.tuscany.sca.itest.conversational;
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+
import org.apache.tuscany.sca.host.embedded.SCADomain;
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.impl.SCANodeFactoryImpl;
+import org.apache.tuscany.sca.node.util.SCAContributionUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -34,9 +42,14 @@
@Before
public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversationalWSDL.composite");
- conversationalStatelessClientStatefulService =
domain.getService(ConversationalClient.class,
-
"ConversationalStatelessClientStatefulService");
+ SCANode node = SCANodeFactory.newInstance().createSCANode(null, null);
+ node.addContribution("mycontribution",
+
ConversationWSDLTestCase.class.getResource("/ConversationalWSDL/."));
+ node.addToDomainLevelComposite(new QName("http://conversations";,
"ConversationalWSDLITest"));
+ node.start();
+
+ conversationalStatelessClientStatefulService =
node.getDomain().getService(ConversationalClient.class,
+
"ConversationalStatelessClientStatefulService");
ConversationalClientStatelessImpl.calls = new StringBuffer();
}
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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -19,9 +19,11 @@
package org.apache.tuscany.sca.itest.conversational;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,6 +31,8 @@
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.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,7 +52,12 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- domain = SCADomain.newInstance("conversational.composite");
+ SCANode 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");
@@ -81,7 +90,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.destroy();
}
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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -19,9 +19,11 @@
package org.apache.tuscany.sca.itest.conversational;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,6 +31,8 @@
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.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,7 +52,12 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- domain = SCADomain.newInstance("conversational.composite");
+ SCANode 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");
@@ -81,7 +90,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.destroy();
}
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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -19,9 +19,11 @@
package org.apache.tuscany.sca.itest.conversational;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,6 +31,9 @@
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.util.SCAContributionUtil;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,23 +53,28 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- domain = SCADomain.newInstance("conversational.composite");
+ SCANode 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");
+
"ConversationalStatelessClientStatelessService");
conversationalStatelessClientStatefulService =
domain.getService(ConversationalClient.class,
-
"ConversationalStatelessClientStatefulService");
+
"ConversationalStatelessClientStatefulService");
conversationalStatefulClientStatelessService =
domain.getService(ConversationalClient.class,
-
"ConversationalStatefulClientStatelessService");
+
"ConversationalStatefulClientStatelessService");
conversationalStatefulClientStatefulService =
domain.getService(ConversationalClient.class,
-
"ConversationalStatefulClientStatefulService");
+
"ConversationalStatefulClientStatefulService");
conversationalStatelessClientRequestService =
domain.getService(ConversationalClient.class,
-
"ConversationalStatelessClientRequestService");
+
"ConversationalStatelessClientRequestService");
conversationalStatefulClientNonConversationalCallbackStatelessService =
domain.getService(ConversationalClient.class,
-
"ConversationalStatefulClientNonConversationalCallbackStatefulService");
+
"ConversationalStatefulClientNonConversationalCallbackStatefulService");
// reset the place where we record the sequence of calls passing
// through each component instance
@@ -81,7 +91,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.destroy();
}
private static void resetCallStack() {
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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -19,9 +19,11 @@
package org.apache.tuscany.sca.itest.conversational;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,6 +31,8 @@
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.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,7 +52,12 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- domain = SCADomain.newInstance("conversational.composite");
+ SCANode 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");
@@ -81,7 +90,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.destroy();
}
private static void resetCallStack() {
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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -19,9 +19,11 @@
package org.apache.tuscany.sca.itest.conversational;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,6 +31,8 @@
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.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,7 +52,12 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- domain = SCADomain.newInstance("conversational.composite");
+ SCANode 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");
@@ -81,7 +90,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.destroy();
}
private static void resetCallStack() {
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=593471&r1=593470&r2=593471&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
Fri Nov 9 02:09:40 2007
@@ -19,9 +19,11 @@
package org.apache.tuscany.sca.itest.conversational;
+import javax.xml.namespace.QName;
+
import junit.framework.Assert;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -29,6 +31,8 @@
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.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -48,7 +52,12 @@
@BeforeClass
public static void setUp() throws Exception {
try {
- domain = SCADomain.newInstance("conversational.composite");
+ SCANode 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");
@@ -81,7 +90,7 @@
@AfterClass
public static void tearDown() throws Exception {
- domain.close();
+ domain.destroy();
}
private static void resetCallStack() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
