You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/09 10:43:15 UTC
svn commit: r516344 [2/2] - in
/incubator/tuscany/branches/sca-java-integration:
samples/sca/calculator/src/main/java/calculator/
samples/sca/calculator/src/test/java/calculator/
samples/sca/composite-impl/src/main/java/composite/ samples/sca/composite...
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java Fri Mar 9 01:43:12 2007
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
public class CallBackIdTest extends TestCase {
@@ -14,12 +14,12 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CallBackIdClient.composite");
+ SCARuntime.start("CallBackIdClient.composite");
aCallBackClient = CurrentCompositeContext.getContext().locateService(CallBackIdClient.class, "CallBackIdClient");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
public class CallBackSetCallbackTest extends TestCase {
@@ -32,7 +32,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CallBackSetCallbackTest.composite");
+ SCARuntime.start("CallBackSetCallbackTest.composite");
aCallBackClient =
CurrentCompositeContext.getContext().locateService(CallBackSetCallbackClient.class,
@@ -40,7 +40,7 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallbackConversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallbackConversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallbackConversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callback-setCallbackConversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
public class CallBackSetCallbackConvTest extends TestCase {
@@ -32,7 +32,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CallBackSetCallbackConvTest.composite");
+ SCARuntime.start("CallBackSetCallbackConvTest.composite");
aCallBackClient =
CurrentCompositeContext.getContext().locateService(CallBackSetCallbackConvClient.class,
@@ -40,7 +40,7 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java Fri Mar 9 01:43:12 2007
@@ -23,8 +23,8 @@
import java.net.URI;
import java.net.URL;
-import org.apache.tuscany.api.SCAContainer;
-import org.apache.tuscany.core.bootstrap.DefaultSCAContainer;
+import org.apache.tuscany.api.SCARuntime;
+import org.apache.tuscany.core.bootstrap.DefaultSCARuntime;
import org.apache.tuscany.core.util.FileHelper;
import org.apache.tuscany.host.deployment.ContributionService;
import org.apache.tuscany.spi.bootstrap.ComponentNames;
@@ -43,7 +43,7 @@
protected void setUp() throws Exception {
super.setUp();
- this.contributionService = (ContributionService) ((DefaultSCAContainer)SCAContainer.getInstance()).getSystemService(ComponentNames.TUSCANY_CONTRIBUTION_SERVICE);
+ this.contributionService = (ContributionService) ((DefaultSCARuntime)SCARuntime.getInstance()).getSystemService(ComponentNames.TUSCANY_CONTRIBUTION_SERVICE);
}
public void testContributeJAR() throws Exception {
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java Fri Mar 9 01:43:12 2007
@@ -2,7 +2,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
public class ConversationsTest extends TestCase {
@@ -14,14 +14,14 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("ConversationsTest.composite");
+ SCARuntime.start("ConversationsTest.composite");
aConversationsClient = CurrentCompositeContext.getContext().locateService(ConversationsClient.class, "ConversationsClient/org.apache.tuscany.sca.test.ConversationsClient");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/transformers/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/transformers/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/transformers/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databindings/transformers/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java Fri Mar 9 01:43:12 2007
@@ -30,7 +30,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.apache.tuscany.databinding.jaxb.JAXBContextHelper;
import org.apache.tuscany.databinding.jaxb.Reader2JAXB;
import org.apache.tuscany.databinding.sdo.String2DataObject;
@@ -113,12 +113,12 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("DataBindingTest.composite");
+ SCARuntime.start("DataBindingTest.composite");
CompositeContext context = CurrentCompositeContext.getContext();
client = context.locateService(Client.class, "Client");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
import org.apache.tuscany.spi.databinding.TransformationException;
@@ -81,7 +81,7 @@
@Override
protected void setUp() throws Exception {
- SCAContainer.start("ExceptionTest.composite");
+ SCARuntime.start("ExceptionTest.composite");
context = CurrentCompositeContext.getContext();
assertNotNull(context);
@@ -92,6 +92,6 @@
@Override
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions-crossBinding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
import org.apache.tuscany.spi.databinding.TransformationException;
@@ -81,7 +81,7 @@
@Override
protected void setUp() throws Exception {
- SCAContainer.start("ExceptionTest.composite");
+ SCARuntime.start("ExceptionTest.composite");
context = CurrentCompositeContext.getContext();
assertNotNull(context);
@@ -92,6 +92,6 @@
@Override
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
@@ -41,7 +41,7 @@
@Override
protected void setUp() throws Exception {
- SCAContainer.start("ExceptionTest.composite");
+ SCARuntime.start("ExceptionTest.composite");
context = CurrentCompositeContext.getContext();
assertNotNull(context);
@@ -51,7 +51,7 @@
@Override
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/property/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Fri Mar 9 01:43:12 2007
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
public class PropertyTestCase extends TestCase {
@@ -166,7 +166,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("PropertyTest.composite");
+ SCARuntime.start("PropertyTest.composite");
abService = CurrentCompositeContext.getContext().locateService(ABComponent.class, "ABComponent");
cdService = CurrentCompositeContext.getContext().locateService(CDComponent.class, "CDComponent");
abcdService = CurrentCompositeContext.getContext().locateService(ABCDComponent.class, "ABCDComponent");
@@ -174,6 +174,6 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
@@ -41,13 +41,13 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myListService = context.locateService(MyListService.class, "MyNewListService");
myListServiceByYear = context.locateService(MyListServiceByYear.class, "MyNewListService");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java Fri Mar 9 01:43:12 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
@@ -75,12 +75,12 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyTotalService.class, "MyTotalService");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java Fri Mar 9 01:43:12 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
@@ -92,7 +92,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start();
+ SCARuntime.start();
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyService.class, "MyService");
myServiceByDate = context.locateService(MyServiceByDate.class, "MyServiceByDate");
@@ -103,6 +103,6 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
@@ -112,7 +112,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyService.class, "MySimpleServiceInRecursiveComponent");
myServiceDefault = context.locateService(MyService.class, "MySimpleServiceDefault");
@@ -122,6 +122,6 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java Fri Mar 9 01:43:12 2007
@@ -20,7 +20,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
@@ -71,12 +71,12 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyService.class, "MySimpleServiceInRecursive");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java Fri Mar 9 01:43:12 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
@@ -70,7 +70,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService1 = context.locateService(MyTotalService.class, "MyTotalServiceNo");
myService2 = context.locateService(MyTotalService.class, "MyTotalServiceMay");
@@ -78,6 +78,6 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java Fri Mar 9 01:43:12 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
@@ -79,7 +79,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService1 = context.locateService(MyTotalService.class, "MyTotalServiceFromRecursive");
myService2 = context.locateService(MyTotalService.class, "MyTotalServiceInCompositeWithRecursive");
@@ -90,6 +90,6 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/spec/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java Fri Mar 9 01:43:12 2007
@@ -22,7 +22,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.RequestContext;
@@ -79,7 +79,7 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("CompositeTest.composite");
+ SCARuntime.start("CompositeTest.composite");
context = CurrentCompositeContext.getContext();
myService = context.locateService(MyService.class, "MyServiceInRecursiveMyService");
myServiceByDate = context.locateService(MyServiceByDate.class, "MyServiceInRecursiveMyServiceByDate");
@@ -89,6 +89,6 @@
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java Fri Mar 9 01:43:12 2007
@@ -23,7 +23,7 @@
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
import bigbank.account.services.accountdata.AccountDataService;
@@ -87,11 +87,11 @@
}
protected void setUp() throws Exception {
- SCAContainer.start("SDOWSDLTest.composite");
+ SCARuntime.start("SDOWSDLTest.composite");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java?view=diff&rev=516344&r1=516343&r2=516344
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java Fri Mar 9 01:43:12 2007
@@ -22,7 +22,7 @@
import helloworld.HelloWorldService;
import junit.framework.TestCase;
-import org.apache.tuscany.api.SCAContainer;
+import org.apache.tuscany.api.SCARuntime;
import org.osoa.sca.CurrentCompositeContext;
/**
@@ -139,11 +139,11 @@
// }
protected void setUp() throws Exception {
- SCAContainer.start("WSDLTest.composite");
+ SCARuntime.start("WSDLTest.composite");
}
protected void tearDown() throws Exception {
- SCAContainer.stop();
+ SCARuntime.stop();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org