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 2008/10/09 08:34:01 UTC
svn commit: r703068 [7/7] - in /tuscany/branches/sca-equinox:
itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/
itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/
itest/databindings/jaxb-top...
Modified: tuscany/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java (original)
+++ tuscany/branches/sca-equinox/samples/calculator/src/test/java/calculator/CalculatorTestCase.java Wed Oct 8 23:33:54 2008
@@ -20,9 +20,11 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* This shows how to test the Calculator service component.
@@ -30,20 +32,22 @@
public class CalculatorTestCase extends TestCase {
private CalculatorService calculatorService;
- private SCANode node;
+ private Node node;
@Override
protected void setUp() throws Exception {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANodeFromClassLoader("Calculator.composite", getClass().getClassLoader());
+ NodeFactory factory = NodeFactory.newInstance();
+ String contribution = ContributionLocationHelper.getContributionLocation(CalculatorClient.class);
+ node = factory.createNode("Calculator.composite", new Contribution("calculator", contribution));
node.start();
- calculatorService = ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");
+ calculatorService = ((Client)node).getService(CalculatorService.class, "CalculatorServiceComponent");
}
@Override
protected void tearDown() throws Exception {
node.stop();
+ node.destroy();
}
public void testCalculator() throws Exception {
Modified: tuscany/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-client/src/main/java/myapp/MyClientImpl.java Wed Oct 8 23:33:54 2008
@@ -21,9 +21,9 @@
import myserver.MyService;
import myserver.MyServiceCallback;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Scope;
import org.osoa.sca.annotations.Service;
@@ -49,15 +49,15 @@
}
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("myapp.composite", MyClientImpl.class.getClassLoader());
+ Node node = NodeFactory.newInstance().createSCANodeFromClassLoader("myapp.composite", MyClientImpl.class.getClassLoader());
node.start();
run(node);
System.out.println("Closing the domain");
node.stop();
}
- public static void run(SCANode node) throws InterruptedException {
- MyClient myClient = ((SCAClient)node).getService(MyClient.class, "MyClientComponent");
+ public static void run(Node node) throws InterruptedException {
+ MyClient myClient = ((Client)node).getService(MyClient.class, "MyClientComponent");
myClient.aClientMethod();
Thread.sleep(5000); // don't exit before callback arrives
}
Modified: tuscany/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-client/src/test/java/myapp/CallbackClientTestCase.java Wed Oct 8 23:33:54 2008
@@ -18,8 +18,8 @@
*/
package myapp;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -29,12 +29,12 @@
*/
public class CallbackClientTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
try {
- node = SCANodeFactory.newInstance().createSCANodeFromClassLoader(null, getClass().getClassLoader());
+ node = NodeFactory.newInstance().createSCANodeFromClassLoader(null, getClass().getClassLoader());
node.start();
} catch (Exception ex) {
System.out.println(ex.toString());
Modified: tuscany/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-service/src/main/java/myserver/CallbackServer.java Wed Oct 8 23:33:54 2008
@@ -20,8 +20,8 @@
import java.io.IOException;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* This server program shows how to create and start an SCA runtime that
@@ -31,7 +31,7 @@
public static void main(String[] args) throws Exception {
- SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);
+ Node node = NodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);
node.start();
try {
Modified: tuscany/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java (original)
+++ tuscany/branches/sca-equinox/samples/callback-ws-service/src/test/java/myserver/CallbackServerTestCase.java Wed Oct 8 23:33:54 2008
@@ -21,8 +21,8 @@
import java.io.IOException;
import java.net.Socket;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -32,11 +32,11 @@
*/
public class CallbackServerTestCase {
- private SCANode node;
+ private Node node;
@Before
public void startServer() throws Exception {
- node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);
+ node = NodeFactory.newInstance().createSCANodeFromClassLoader("callbackws.composite", null);
node.start();
}
Modified: tuscany/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java (original)
+++ tuscany/branches/sca-equinox/samples/domain-management/src/main/java/manager/DistributeAndRunComponents.java Wed Oct 8 23:33:54 2008
@@ -68,7 +68,7 @@
import org.apache.tuscany.sca.implementation.node.NodeImplementationFactory;
import org.apache.tuscany.sca.monitor.Monitor;
import org.apache.tuscany.sca.monitor.MonitorFactory;
-import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
import org.apache.tuscany.sca.workspace.Workspace;
import org.apache.tuscany.sca.workspace.WorkspaceFactory;
@@ -251,7 +251,7 @@
System.out.println(print(domainComposite));
// Now start our SCA nodes
- List<SCANode> runtimeNodes = new ArrayList<SCANode>();
+ List<Node> runtimeNodes = new ArrayList<Node>();
NodeLauncher launcher = NodeLauncher.newInstance();
for (Component node: cloudComposite.getComponents()) {
@@ -277,7 +277,7 @@
Contribution dependency = dependencies.get(c);
contributions[c] = new org.apache.tuscany.sca.node.launcher.Contribution(dependency.getURI(), dependency.getLocation());
}
- SCANode runtimeNode = launcher.createNode("http://sample/" + node.getName(), print(runnable), contributions);
+ Node runtimeNode = launcher.createNode("http://sample/" + node.getName(), print(runnable), contributions);
// Start the node
runtimeNode.start();
@@ -287,7 +287,7 @@
System.out.println("Nodes are running, press enter to stop...");
System.in.read();
- for (SCANode runtimeNode: runtimeNodes) {
+ for (Node runtimeNode: runtimeNodes) {
runtimeNode.stop();
}
}
Modified: tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java (original)
+++ tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/client/BigBankClient.java Wed Oct 8 23:33:54 2008
@@ -19,9 +19,9 @@
package bigbank.client;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import bigbank.account.AccountService;
@@ -32,11 +32,11 @@
public class BigBankClient {
public static void main(String[] args) throws Exception {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
+ NodeFactory factory = NodeFactory.newInstance();
+ Node node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankClient.class.getClassLoader());
node.start();
- AccountService accountService = ((SCAClient)node).getService(AccountService.class, "AccountServiceComponent");
+ AccountService accountService = ((Client)node).getService(AccountService.class, "AccountServiceComponent");
System.out.println("Account summary: " + accountService.getAccountReport("Customer_01") );
Modified: tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java (original)
+++ tuscany/branches/sca-equinox/samples/simple-bigbank-spring/src/main/java/bigbank/server/BigBankServer.java Wed Oct 8 23:33:54 2008
@@ -19,8 +19,8 @@
package bigbank.server;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* This client program shows how to create an SCA runtime, start it,
@@ -36,8 +36,8 @@
System.out.println("Starting the Sample SCA Spring BigBank server...");
- SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
+ NodeFactory factory = NodeFactory.newInstance();
+ Node node = factory.createSCANodeFromClassLoader("BigBank.composite", BigBankServer.class.getClassLoader());
node.start();
if (timeout < 0) {
Modified: tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java (original)
+++ tuscany/branches/sca-equinox/samples/spring-bigbank-calculator/src/main/java/bigbank/calculator/server/CalculatorServer.java Wed Oct 8 23:33:54 2008
@@ -19,8 +19,8 @@
package bigbank.calculator.server;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
public class CalculatorServer {
@@ -28,8 +28,8 @@
System.out.println("Starting the Sample SCA Calculator...");
- SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorServer.class.getClassLoader());
+ NodeFactory factory = NodeFactory.newInstance();
+ Node node = factory.createSCANodeFromClassLoader("Calculator.composite", CalculatorServer.class.getClassLoader());
node.start();
System.out.println("Press Enter to Exit...");
Modified: tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java (original)
+++ tuscany/branches/sca-equinox/samples/spring-bigbank-checkaccount/src/main/java/bigbank/account/checking/server/CheckingAccountServer.java Wed Oct 8 23:33:54 2008
@@ -21,8 +21,8 @@
import java.io.IOException;
import org.apache.activemq.broker.BrokerService;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
/**
* This server program shows how to create an SCA runtime, and start it which
@@ -39,8 +39,8 @@
jmsBroker.addConnector("tcp://localhost:61619");
jmsBroker.start();
- SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("CheckingsAccount.composite", CheckingAccountServer.class.getClassLoader());
+ NodeFactory factory = NodeFactory.newInstance();
+ Node node = factory.createSCANodeFromClassLoader("CheckingsAccount.composite", CheckingAccountServer.class.getClassLoader());
node.start();
System.out.println("CheckingsAccount server started (press enter to shutdown)");
Modified: tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java (original)
+++ tuscany/branches/sca-equinox/samples/spring-bigbank-stockquote/src/main/java/bigbank/stockquote/server/StockQuoteServer.java Wed Oct 8 23:33:54 2008
@@ -18,8 +18,8 @@
*/
package bigbank.stockquote.server;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.springframework.context.ApplicationContext;
/**
@@ -32,8 +32,8 @@
System.out.println("Starting the Sample SCA StockQuote Service...");
- SCANodeFactory factory = SCANodeFactory.newInstance();
- SCANode node = factory.createSCANodeFromClassLoader("StockQuote.composite", StockQuoteServer.class.getClassLoader());
+ NodeFactory factory = NodeFactory.newInstance();
+ Node node = factory.createSCANodeFromClassLoader("StockQuote.composite", StockQuoteServer.class.getClassLoader());
node.start();
// Method 1: To access the Spring Application Context instance
Modified: tuscany/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java (original)
+++ tuscany/branches/sca-equinox/tutorials/store/store-client/launch/LaunchStoreClientNode.java Wed Oct 8 23:33:54 2008
@@ -19,8 +19,8 @@
package launch;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Node;
import org.apache.tuscany.sca.node.launcher.NodeLauncher;
import client.Shopper;
@@ -29,9 +29,9 @@
public static void main(String[] args) throws Exception {
NodeLauncher nodeLauncher = NodeLauncher.newInstance();
- SCANode storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
+ Node storeClientNode = nodeLauncher.createNodeFromURL("http://localhost:9990/node-config/StoreClientNode");
storeClientNode.start();
- SCAClient client = (SCAClient)storeClientNode;
+ Client client = (Client)storeClientNode;
Shopper shopper = client.getService(Shopper.class, "StoreClient");
Modified: tuscany/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java (original)
+++ tuscany/branches/sca-equinox/vtest/java-api/annotations/destroy/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/destroy/DestroyAnnotationTestCase.java Wed Oct 8 23:33:54 2008
@@ -23,10 +23,10 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.Test;
import org.osoa.sca.ServiceRuntimeException;
@@ -47,12 +47,12 @@
*/
@Test
public void atDestroyProper() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ NodeFactory nodeFactory = NodeFactory.newInstance();
+ Node node = nodeFactory.createNode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/proper").toURL().toString()));
node.start();
- AService aService = ((SCAClient)node).getService(AService.class, "AComponent");
+ AService aService = ((Client)node).getService(AService.class, "AComponent");
Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu"));
node.stop();
}
@@ -69,10 +69,10 @@
*/
@Test
public void atDestroyProtectedMethod() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err1").toURL().toString()));
Assert.fail();
node.stop();
@@ -94,10 +94,10 @@
*/
@Test
public void atDestroyPrivateMethod() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err2").toURL().toString()));
Assert.fail();
node.stop();
@@ -119,10 +119,10 @@
*/
@Test
public void atDestroyNonVoidReturnType() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err3/AServiceErr3.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err3").toURL().toString()));
Assert.fail();
node.stop();
@@ -144,10 +144,10 @@
*/
@Test
public void atDestroyMethodWithArgs() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err4/AServiceErr4.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err4").toURL().toString()));
Assert.fail();
node.stop();
Modified: tuscany/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java?rev=703068&r1=703067&r2=703068&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java (original)
+++ tuscany/branches/sca-equinox/vtest/java-api/annotations/init/src/test/java/org/apache/tuscany/sca/vtest/javaapi/annotations/init/InitAnnotationTestCase.java Wed Oct 8 23:33:54 2008
@@ -23,10 +23,10 @@
import junit.framework.Assert;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
+import org.apache.tuscany.sca.node.Client;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.Test;
import org.osoa.sca.ServiceRuntimeException;
@@ -50,12 +50,12 @@
*/
@Test
public void atInitProper() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ NodeFactory nodeFactory = NodeFactory.newInstance();
+ Node node = nodeFactory.createNode(new File("src/main/resources/proper/AService.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/proper").toURL().toString()));
node.start();
- AService aService = ((SCAClient)node).getService(AService.class, "AComponent");
+ AService aService = ((Client)node).getService(AService.class, "AComponent");
Assert.assertTrue(aService.isInitProper());
Assert.assertEquals("Hello Pandu", aService.getGreetings("Pandu"));
node.stop();
@@ -74,10 +74,10 @@
*/
@Test
public void atInitProtectedMethod() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err1/AServiceErr1.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err1").toURL().toString()));
Assert.fail();
node.stop();
@@ -100,10 +100,10 @@
*/
@Test
public void atInitPrivateMethod() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err2/AServiceErr2.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err2").toURL().toString()));
Assert.fail();
node.stop();
@@ -126,10 +126,10 @@
*/
@Test
public void atInitNonVoidReturnType() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err3/HelloWorldErr3.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err3").toURL().toString()));
Assert.fail();
node.stop();
@@ -152,10 +152,10 @@
*/
@Test
public void atInitMethodWithArgs() throws Exception {
- SCANodeFactory nodeFactory = SCANodeFactory.newInstance();
+ NodeFactory nodeFactory = NodeFactory.newInstance();
try {
- SCANode node = nodeFactory.createSCANode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
- new SCAContribution("TestContribution",
+ Node node = nodeFactory.createNode(new File("src/main/resources/err4/HelloWorldErr4.composite").toURL().toString(),
+ new Contribution("TestContribution",
new File("src/main/resources/err4").toURL().toString()));
Assert.fail();
node.stop();