You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2009/09/15 12:52:18 UTC
svn commit: r815269 [2/2] - in /tuscany/java/sca/itest/jms:
callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/
callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/
definitions/src/main/java/org/apache/tuscany/sca/binding/jms/ definition...
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java Tue Sep 15 10:52:15 2009
@@ -22,9 +22,7 @@
import static org.junit.Assert.assertNotNull;
import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java Tue Sep 15 10:52:15 2009
@@ -23,7 +23,6 @@
import javax.jms.DeliveryMode;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: tuscany/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldService {
Modified: tuscany/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java (original)
+++ tuscany/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,6 @@
import static org.junit.Assert.assertEquals;
-import java.io.Serializable;
import java.util.Properties;
import javax.jms.Connection;
@@ -35,7 +34,8 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -45,14 +45,14 @@
*/
public class NoReplyToTestCase {
- private static SCADomain scaDomain;
+ private Node node;
private Session session;
private InitialContext context;
private Connection connection;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "service.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
@@ -90,8 +90,8 @@
@After
public void end() throws JMSException {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
if (connection != null) {
connection.close();
Modified: tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
Modified: tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java (original)
+++ tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface MyService {
Modified: tuscany/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java (original)
+++ tuscany/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -27,16 +28,16 @@
*/
public class NullsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "nulls.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testSayHello() throws Exception {
- MyService client1 = scaDomain.getService(MyService.class, "Client1");
+ MyService client1 = node.getService(MyService.class, "Client1");
client1.sayHello();
@@ -44,7 +45,7 @@
@Test
public void testSayHelloObjectFormat() throws Exception {
- MyService client1 = scaDomain.getService(MyService.class, "Client2");
+ MyService client1 = node.getService(MyService.class, "Client2");
client1.sayHello();
@@ -52,8 +53,8 @@
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
Modified: tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the HelloWorld service.
Modified: tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface HelloWorldService {
Modified: tuscany/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java (original)
+++ tuscany/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,8 @@
import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -30,24 +31,23 @@
*/
public class ResponseCFTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain =
- SCADomain.newInstance("http://localhost", "/", "cf/client.composite", "cf/service.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldClient");
+ HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldClient");
assertEquals("jmsHello Petra", helloWorldService.sayHello("Petra"));
}
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface SelectorService {
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.operationselector.jmsuserprop;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
Modified: tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java Tue Sep 15 10:52:15 2009
@@ -21,10 +21,8 @@
import static org.junit.Assert.assertEquals;
import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReference;
-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.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,20 +33,16 @@
*/
public class OperationselectorJMSDefaultTestCase {
- private static SCANode node;
+ private Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmsdefault/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldReference = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
assertEquals("Hello One Fred Bloggs Hello Two Fred Bloggs Hello Three Fred Bloggs Hello Four Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java Tue Sep 15 10:52:15 2009
@@ -21,10 +21,8 @@
import static org.junit.Assert.assertEquals;
import org.apache.tuscany.sca.binding.jms.operationselector.jmsdefault.HelloWorldReference;
-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.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -35,20 +33,16 @@
*/
public class OperationselectorJMSUserPropTestCase {
- private static SCANode node;
+ private Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmsuserprop/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldReference = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldReference = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
assertEquals("Hello One Fred Bloggs Hello Four Fred Bloggs Hello Two Fred Bloggs", helloWorldReference.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java (original)
+++ tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,8 @@
import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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,17 +30,17 @@
*/
public class SelectorsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "selectors/selectors.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testSayHello() throws Exception {
- SelectorService client1 = scaDomain.getService(SelectorService.class, "Client1");
- SelectorService client2 = scaDomain.getService(SelectorService.class, "Client2");
+ SelectorService client1 = node.getService(SelectorService.class, "Client1");
+ SelectorService client2 = node.getService(SelectorService.class, "Client2");
client1.sayHello("petra");
client2.sayHello("beate");
@@ -68,8 +69,8 @@
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
Modified: tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Reference;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements the OneWay service.
Modified: tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java (original)
+++ tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface OneWayService {
Modified: tuscany/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java (original)
+++ tuscany/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,8 @@
import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+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;
@@ -30,16 +31,16 @@
*/
public class TopicsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "topics/TopicsClient.composite", "topics/TopicsService.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testOneWayInvoked() throws Exception {
- OneWayService oneWayService = scaDomain.getService(OneWayService.class, "OneWayClient");
+ OneWayService oneWayService = node.getService(OneWayService.class, "OneWayClient");
oneWayService.sayHello("Petra");
synchronized (OneWayServiceImpl.mutex) {
// wait up to 10 seconds but it will likely be a lot less
@@ -51,8 +52,8 @@
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}