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 [1/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...
Author: antelder
Date: Tue Sep 15 10:52:15 2009
New Revision: 815269
URL: http://svn.apache.org/viewvc?rev=815269&view=rev
Log:
Update JMS itests for 2.x APIs
Modified:
tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
tuscany/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
tuscany/java/sca/itest/jms/format/pom.xml
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PolicyHeadersTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/PropertiesTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/RPCTestCase.java
tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/URIRPCTestCase.java
tuscany/java/sca/itest/jms/noreplyto/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
tuscany/java/sca/itest/jms/noreplyto/src/test/java/org/apache/tuscany/sca/binding/jms/NoReplyToTestCase.java
tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
tuscany/java/sca/itest/jms/nulls/src/main/java/org/apache/tuscany/sca/binding/jms/MyService.java
tuscany/java/sca/itest/jms/nulls/src/test/java/org/apache/tuscany/sca/binding/jms/NullsTestCase.java
tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
tuscany/java/sca/itest/jms/responsecf/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
tuscany/java/sca/itest/jms/responsecf/src/test/java/org/apache/tuscany/sca/binding/jms/ResponseCFTestCase.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/ClientImpl.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/SelectorService.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReference.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsdefault/HelloWorldService.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReference.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldReferenceImpl.java
tuscany/java/sca/itest/jms/selectors/src/main/java/org/apache/tuscany/sca/binding/jms/operationselector/jmsuserprop/HelloWorldService.java
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSDefaultTestCase.java
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/OperationselectorJMSUserPropTestCase.java
tuscany/java/sca/itest/jms/selectors/src/test/java/org/apache/tuscany/sca/binding/jms/SelectorsTestCase.java
tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
tuscany/java/sca/itest/jms/topics/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
tuscany/java/sca/itest/jms/topics/src/test/java/org/apache/tuscany/sca/binding/jms/TopicsTestCase.java
Modified: tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSClientImpl.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;
/**
* Remote Web service client with callback interface
Modified: tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java (original)
+++ tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSService.java Tue Sep 15 10:52:15 2009
@@ -18,9 +18,9 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* The remote service that will be invoked by the client
Modified: tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.java (original)
+++ tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceCallback.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;
/**
* The callback interface for {@link JMSService}.
Modified: tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java (original)
+++ tuscany/java/sca/itest/jms/callbacks/src/main/java/org/apache/tuscany/sca/binding/jms/JMSServiceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
/**
* This class implements MyService and uses a callback.
Modified: tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.java (original)
+++ tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/CallbackTestCase.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 CallbackTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
+ JMSClient client = node.getService(JMSClient.class, "ClientComponent");
client.aClientMethod();
@@ -53,8 +54,8 @@
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
Modified: tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java (original)
+++ tuscany/java/sca/itest/jms/callbacks/src/test/java/org/apache/tuscany/sca/binding/jms/TempCallbackQTestCase.java Tue Sep 15 10:52:15 2009
@@ -22,7 +22,8 @@
import java.net.MalformedURLException;
-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;
@@ -32,16 +33,16 @@
*/
public class TempCallbackQTestCase {
- private SCADomain scaDomain;
+ private Node node;
@Before
public void init() throws MalformedURLException {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/tempq.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- JMSClient client = scaDomain.getService(JMSClient.class, "ClientComponent");
+ JMSClient client = node.getService(JMSClient.class, "ClientComponent");
client.aClientMethod();
@@ -55,8 +56,8 @@
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/definitions/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/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/definitions/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java (original)
+++ tuscany/java/sca/itest/jms/definitions/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/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.java (original)
+++ tuscany/java/sca/itest/jms/definitions/src/test/java/org/apache/tuscany/sca/binding/jms/DefinitionsTestCase.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,16 +30,16 @@
*/
public class DefinitionsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain = SCADomain.newInstance("http://localhost", "/", "definitions/definitions.composite");
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testSayHello() throws Exception {
- OneWayService client = scaDomain.getService(OneWayService.class, "OneWayClient");
+ OneWayService client = node.getService(OneWayService.class, "OneWayClient");
client.sayHello("petra");
@@ -54,8 +55,8 @@
@After
public void end() {
- if (scaDomain != null) {
- scaDomain.close();
+ if (node != null) {
+ node.stop();
}
}
}
Modified: tuscany/java/sca/itest/jms/format/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/pom.xml?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/pom.xml (original)
+++ tuscany/java/sca/itest/jms/format/pom.xml Tue Sep 15 10:52:15 2009
@@ -39,6 +39,12 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
<scope>runtime</scope>
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytes/helloworld/HelloWorldServiceReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytes.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsbytesxml/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsbytesxml.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsdefault/helloworld/HelloWorldServiceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld;
-import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.CheckedException;
public class HelloWorldServiceImpl implements HelloWorldService {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,8 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsmessage.helloworld;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsmessage/helloworld/HelloWorldServiceReferenceSide.java Tue Sep 15 10:52:15 2009
@@ -20,8 +20,8 @@
import javax.jws.soap.SOAPBinding;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
/**
* This is the business interface of the HelloWorld greetings service.
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmsobject/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmsobject.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstext/helloworld/HelloWorldServiceReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstext.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReference.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldReference {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException;
-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/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxml/helloworld/HelloWorldServiceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,6 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld;
-import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.CheckedException;
public class HelloWorldServiceImpl implements HelloWorldService {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldReferenceImpl.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
public class HelloWorldReferenceImpl implements HelloWorldService {
Modified: tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/format/src/main/java/org/apache/tuscany/sca/binding/jms/format/jmstextxmlinjmsobjectout/helloworld/HelloWorldService.java Tue Sep 15 10:52:15 2009
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld;
-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/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesTestCase.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.format.jmsbytes.helloworld.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 FormatJMSBytesTestCase {
- private static SCANode node;
+ private Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmsbytes/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
/* TUSCANY-2967 - disable this change while we decide what to do and
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSBytesXMLTestCase.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.format.jmsbytes.helloworld.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 FormatJMSBytesXMLTestCase {
- private static SCANode node;
+ private static Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmsbytesxml/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
assertEquals("Hello Fred Bloggs foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSDefaultTestCase.java Tue Sep 15 10:52:15 2009
@@ -23,10 +23,8 @@
import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldReference;
import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.HelloWorldServiceImpl;
import org.apache.tuscany.sca.binding.jms.format.jmsdefault.helloworld.Person;
-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.Assert;
import org.junit.Before;
@@ -38,20 +36,16 @@
*/
public class FormatJMSDefaultTestCase {
- private static SCANode node;
+ private static 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 helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs foo remote service exception, see nested exception foo remote service exception, see nested exception", helloWorldService.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSMessageTestCase.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.format.jmsmessage.helloworld.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 FormatJMSMessageTestCase {
- private static SCANode node;
+ private static Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmsmessage/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSObjectTestCase.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.format.jmsobject.helloworld.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.Ignore;
@@ -36,21 +34,16 @@
*/
public class FormatJMSObjectTestCase {
- private static SCANode node;
+ private static Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmsobject/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = ((SCAClient) node).getService(
- HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
assertEquals("Hello1 Fred Hello1 Bloggs Hello2 null Hello3 Fred Hello4 Fred Bloggs Hello5 Fred Bloggs Hello6 Fred Bloggs Hello7 Fred Bloggs",
helloWorldService.getGreetingsWrapSingle("Fred", "Bloggs"));
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextTestCase.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.format.jmsbytes.helloworld.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 FormatJMSTextTestCase {
- private static SCANode node;
+ private static Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmstext/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
System.out.println(helloWorldService.getGreetings("Fred Bloggs"));
assertEquals("Hello Fred Bloggs " +
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLInJMSObjectOutTestCase.java Tue Sep 15 10:52:15 2009
@@ -22,13 +22,10 @@
import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.HelloWorldService;
import org.apache.tuscany.sca.binding.jms.format.jmstextxmlinjmsobjectout.helloworld.Person;
-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.Ignore;
import org.junit.Test;
@@ -37,20 +34,16 @@
*/
public class FormatJMSTextXMLInJMSObjectOutTestCase {
- private static SCANode node;
+ private static Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmstextxmlinjmsobjectout/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldService helloWorldService = ((SCAClient)node).getService(HelloWorldService.class, "HelloWorldReferenceComponent");
+ HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldReferenceComponent");
assertEquals("Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java (original)
+++ tuscany/java/sca/itest/jms/format/src/test/java/org/apache/tuscany/sca/binding/jms/format/FormatJMSTextXMLTestCase.java Tue Sep 15 10:52:15 2009
@@ -22,10 +22,8 @@
import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.HelloWorldReference;
import org.apache.tuscany.sca.binding.jms.format.jmstextxml.helloworld.Person;
-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;
@@ -36,20 +34,16 @@
*/
public class FormatJMSTextXMLTestCase {
- private static SCANode node;
+ private static Node node;
@Before
public void init() {
- SCANodeFactory factory = SCANodeFactory.newInstance();
- node = factory.createSCANode("jmstextxml/helloworld.composite",
- new SCAContribution("test", "./target/classes"));
-
- node.start();
+ node = NodeFactory.newInstance().createNode().start();
}
@Test
public void testHelloWorldCreate() throws Exception {
- HelloWorldReference helloWorldService = ((SCAClient)node).getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
+ HelloWorldReference helloWorldService = node.getService(HelloWorldReference.class, "HelloWorldReferenceComponent");
assertEquals("Hello Fred Bloggs Hello Fred Bloggs Hello Fred Bloggs", helloWorldService.getGreetings("Fred Bloggs"));
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionService.java Tue Sep 15 10:52:15 2009
@@ -19,7 +19,7 @@
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
public interface ExceptionService {
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/ExceptionServiceClient.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/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/general/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/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/HelloWorldService.java (original)
+++ tuscany/java/sca/itest/jms/general/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/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientImpl.java Tue Sep 15 10:52:15 2009
@@ -19,8 +19,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;
@Service(MsgClient.class)
public class MsgClientImpl implements MsgClient {
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgClientService.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;
/**
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgService.java Tue Sep 15 10:52:15 2009
@@ -19,8 +19,8 @@
package org.apache.tuscany.sca.binding.jms;
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.AllowsPassByReference;
+import org.oasisopen.sca.annotation.Remotable;
@Remotable
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/MsgServiceImpl.java Tue Sep 15 10:52:15 2009
@@ -21,7 +21,7 @@
import javax.jms.Message;
-import org.osoa.sca.annotations.Service;
+import org.oasisopen.sca.annotation.Service;
@Service(MsgService.class)
public class MsgServiceImpl implements MsgService {
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayClientImpl.java (original)
+++ tuscany/java/sca/itest/jms/general/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/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayObjectService.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 OneWayObjectService {
Modified: tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/OneWayService.java (original)
+++ tuscany/java/sca/itest/jms/general/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/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java (original)
+++ tuscany/java/sca/itest/jms/general/src/main/java/org/apache/tuscany/sca/binding/jms/TestMessageProcessor.java Tue Sep 15 10:52:15 2009
@@ -22,7 +22,6 @@
import javax.jms.Message;
import javax.jms.Session;
-import org.apache.tuscany.sca.binding.jms.impl.JMSBinding;
import org.apache.tuscany.sca.binding.jms.provider.TextMessageProcessor;
public class TestMessageProcessor extends TextMessageProcessor {
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DefaultsTestCase.java Tue Sep 15 10:52:15 2009
@@ -20,7 +20,7 @@
import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.NodeFactory;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -30,25 +30,26 @@
*/
public class DefaultsTestCase {
- private static SCADomain scaDomain;
+ private Node node;
@Before
public void init() {
- scaDomain =
+ node = NodeFactory.newInstance().createNode().start();
+
SCADomain.newInstance("http://localhost", "/", "defaults/client.composite", "defaults/service.composite");
// scaDomain = SCADomain.newInstance("http://localhost", "/", "simple/client.composite");
}
@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.close();
}
}
}
Modified: tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/DynamicReplyQTestCase.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/ExceptionsTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExceptionsTestCase.java Tue Sep 15 10:52:15 2009
@@ -19,10 +19,8 @@
package org.apache.tuscany.sca.binding.jms;
import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;
-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/ExternalBrokerTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/ExternalBrokerTestCase.java Tue Sep 15 10:52:15 2009
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertEquals;
import org.apache.activemq.broker.BrokerService;
-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/MessageProcessorTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/MessageProcessorTestCase.java Tue Sep 15 10:52:15 2009
@@ -21,7 +21,6 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-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/NonSCAClientTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/NonSCAClientTestCase.java Tue Sep 15 10:52:15 2009
@@ -32,7 +32,6 @@
import org.apache.activemq.broker.BrokerService;
import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactory;
import org.apache.tuscany.sca.binding.jms.provider.JMSResourceFactoryImpl;
-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/OneWayTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java?rev=815269&r1=815268&r2=815269&view=diff
==============================================================================
--- tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.java (original)
+++ tuscany/java/sca/itest/jms/general/src/test/java/org/apache/tuscany/sca/binding/jms/OneWayTestCase.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;