You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2008/12/05 01:48:35 UTC
svn commit: r723537 [1/4] - in /tuscany/java/sca/itest: ./ callback-api/
callback-api/src/main/java/org/apache/tuscany/sca/test/
callback-api/src/test/java/org/apache/tuscany/sca/test/ callback-basic/
callback-basic/src/main/java/org/apache/tuscany/sca...
Author: rfeng
Date: Thu Dec 4 16:48:31 2008
New Revision: 723537
URL: http://svn.apache.org/viewvc?rev=723537&view=rev
Log:
Convert, clean and bring up a set of itests
Modified:
tuscany/java/sca/itest/callback-api/pom.xml
tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
tuscany/java/sca/itest/callback-basic/pom.xml
tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
tuscany/java/sca/itest/callback-complex-type/pom.xml
tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
tuscany/java/sca/itest/callback-id/pom.xml
tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
tuscany/java/sca/itest/callback-multiple-wires/pom.xml
tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
tuscany/java/sca/itest/callback-separatethread/pom.xml
tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
tuscany/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
tuscany/java/sca/itest/callback-set-callback/pom.xml
tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
tuscany/java/sca/itest/callback-set-conversation/pom.xml
tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
tuscany/java/sca/itest/component-type/pom.xml
tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java
tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java
tuscany/java/sca/itest/conversations/pom.xml
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
tuscany/java/sca/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
tuscany/java/sca/itest/exceptions/pom.xml
tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/Checked.java
tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/ExceptionThrower.java
tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/ExceptionHandlerImpl.java
tuscany/java/sca/itest/exceptions/src/main/java/org/apache/tuscany/sca/test/exceptions/impl/RemoteExceptionHandlerImpl.java
tuscany/java/sca/itest/exceptions/src/test/java/org/apache/tuscany/sca/test/exceptions/ExceptionsTestCase.java
tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/LocalCallbackInterface.java
tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/ParameterObject.java
tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponent.java
tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteClientComponentImpl.java
tuscany/java/sca/itest/interfaces/src/main/java/org/apache/tuscany/sca/itest/interfaces/RemoteServiceComponent.java
tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayClient.java
tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/OneWayService.java
tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayClientImpl.java
tuscany/java/sca/itest/oneway/src/main/java/org/apache/tuscany/sca/itest/oneway/impl/OneWayServiceImpl.java
tuscany/java/sca/itest/oneway/src/test/java/org/apache/tuscany/sca/itest/oneway/OneWayTestCase.java
tuscany/java/sca/itest/operation-overloading/pom.xml
tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
tuscany/java/sca/itest/pom.xml
tuscany/java/sca/itest/properties/pom.xml
tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/ComplexPropertyBean.java
tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponent.java
tuscany/java/sca/itest/properties/src/main/java/org/apache/tuscany/sca/itest/PropertyComponentImpl.java
tuscany/java/sca/itest/properties/src/main/java/test/jaxb/props/ObjectFactory.java
tuscany/java/sca/itest/properties/src/main/java/test/jaxb/props/ReturnCodeProperties.java
tuscany/java/sca/itest/properties/src/main/java/test/jaxb/props/package-info.java
tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/MyTotalServiceTestCase.java
tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/OuterPropertyTestCase.java
tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
tuscany/java/sca/itest/properties/src/test/java/org/apache/tuscany/sca/itest/cdi/ConstructorPropertyInjectionTestCase.java
tuscany/java/sca/itest/recursive-multi-level/pom.xml
tuscany/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyService.java
tuscany/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MyServiceImpl.java
tuscany/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalService.java
tuscany/java/sca/itest/recursive-multi-level/src/main/java/mysca/test/myservice/MySimpleTotalServiceImpl.java
tuscany/java/sca/itest/recursive-multi-level/src/test/java/test/sca/tests/MultiLevelTestCase.java
tuscany/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/AComponentImpl.java
tuscany/java/sca/itest/references/src/main/java/org/apache/tuscany/sca/itest/references/DComponent.java
tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/AutoWiredReferenceTestCase.java
tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/InnerReferenceTestCase.java
tuscany/java/sca/itest/references/src/test/java/org/apache/tuscany/sca/itest/references/ManualWiredReferenceTestCase.java
tuscany/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/CompositeScopeStateVerifierImpl.java
tuscany/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/RequestScopeStateVerifierImpl.java
tuscany/java/sca/itest/scopes/src/main/java/org/apache/tuscany/sca/itest/scopes/StateVerifier.java
tuscany/java/sca/itest/scopes/src/test/java/org/apache/tuscany/sca/test/ScopeTestCase.java
tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponent.java
tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/AComponentImpl.java
tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponent.java
tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/BComponentImpl.java
tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/D1Component.java
tuscany/java/sca/itest/services/src/main/java/org/apache/tuscany/sca/itest/services/DComponent.java
tuscany/java/sca/itest/services/src/test/java/org/apache/tuscany/sca/itest/services/ServicesTestCase.java
tuscany/java/sca/itest/wires/pom.xml
tuscany/java/sca/itest/wires/src/main/java/org/apache/tuscany/sca/itest/WireClientImpl.java
tuscany/java/sca/itest/wires/src/test/java/org/apache/tuscany/sca/itest/WireTestCase.java
Modified: tuscany/java/sca/itest/callback-api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/pom.xml (original)
+++ tuscany/java/sca/itest/callback-api/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,16 +31,24 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
<properties>
Modified: tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java Thu Dec 4 16:48:31 2008
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
Modified: tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java (original)
+++ tuscany/java/sca/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java Thu Dec 4 16:48:31 2008
@@ -18,13 +18,17 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.TestCase;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+public class CallBackApiTestCase {
-public class CallBackApiTestCase extends TestCase {
-
- private static SCADomain domain;
+ private static Node node;
private CallBackApiClient aCallBackClient;
/**
@@ -35,28 +39,32 @@
* 2. Test in which the target does not call back to the client <br>
* 3. Test in which the target calls back multiple times to the client.
*/
+ @Test
public void testCallBackBasic() {
+ aCallBackClient = node.getService(CallBackApiClient.class, "CallBackApiClient");
aCallBackClient.run();
}
/**
- * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class
+ * This function creates the Node instance and gets an Instance of CallBackApiClient.class
*/
- @Override
- protected void setUp() throws Exception {
- if (domain == null) {
- domain = SCADomain.newInstance("CallBackApiTest.composite");
- }
- aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient");
+ @BeforeClass
+ public static void setUp() throws Exception {
+ if (node == null) {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackApiTest.composite");
+ node = NodeFactory.newInstance().createNode("CallBackApiTest.composite", new Contribution("c1", location));
+ node.start();
+ }
}
/**
- * This function destroys the SCADomain instance that was created in setUp()
+ * This function destroys the Node instance that was created in setUp()
*/
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/callback-basic/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/pom.xml (original)
+++ tuscany/java/sca/itest/callback-basic/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,16 +31,24 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
<properties>
Modified: tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java Thu Dec 4 16:48:31 2008
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
Modified: tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java (original)
+++ tuscany/java/sca/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java Thu Dec 4 16:48:31 2008
@@ -21,30 +21,36 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
public class CallBackBasicTestCase extends TestCase {
- private static SCADomain domain;
+ private static Node node;
private CallBackBasicClient aCallBackClient;
public void testCallBackBasic() {
- aCallBackClient.run();
+ aCallBackClient.run();
}
- @Override
- protected void setUp() throws Exception {
- if( domain==null ) {
- domain = SCADomain.newInstance("CallBackBasicTest.composite");
- }
-
- aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient");
- }
+ @Before
+ public void setUp() throws Exception {
+ if (node == null) {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackBasicTest.composite");
+ node = NodeFactory.newInstance().createNode("CallBackBasicTest.composite", new Contribution("c1", location));
+ node.start();
+ }
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+ aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient");
}
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
+ }
}
Modified: tuscany/java/sca/itest/callback-complex-type/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/pom.xml (original)
+++ tuscany/java/sca/itest/callback-complex-type/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java Thu Dec 4 16:48:31 2008
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
Modified: tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java (original)
+++ tuscany/java/sca/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java Thu Dec 4 16:48:31 2008
@@ -20,29 +20,33 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
//FIXME Fix this test case
public class CallBackCTypeTestCaseFIXME extends TestCase {
- private SCADomain domain;
+ private Node node;
private CallBackCTypeClient aCallBackClient;
public void testCallBackBasic() {
aCallBackClient.run();
}
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackCTypeClient.composite");
+ @Before
+ public void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation(".composite");
+ node = NodeFactory.newInstance().createNode("CallBackCTypeClient.composite");
- aCallBackClient =
- domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
+ aCallBackClient = node.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
}
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/callback-id/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/pom.xml (original)
+++ tuscany/java/sca/itest/callback-id/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java Thu Dec 4 16:48:31 2008
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
Modified: tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java (original)
+++ tuscany/java/sca/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java Thu Dec 4 16:48:31 2008
@@ -18,28 +18,34 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.TestCase;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+public class CallBackIdTestCase {
-public class CallBackIdTestCase extends TestCase {
-
- private SCADomain domain;
+ private Node node;
private CallBackIdClient aCallBackClient;
+ @Test
public void testCallBackBasic() {
aCallBackClient.run();
}
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackIdClient.composite");
-
- aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
+ @Before
+ public void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackIdClient.composite");
+ node = NodeFactory.newInstance().createNode("CallBackIdClient.composite", new Contribution("c1", location));
+ node.start();
+ aCallBackClient = node.getService(CallBackIdClient.class, "CallBackIdClient");
}
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/callback-multiple-wires/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/pom.xml (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -32,13 +32,13 @@
@Context
protected RequestContext requestContext;
-
+
public void someMethod(String arg) {
// invoke the callback
try {
MyServiceCallback myServiceCallback = requestContext.getCallback();
myServiceCallback.receiveResult(arg + " -> receiveResult");
- } catch(RuntimeException e) {
+ } catch (RuntimeException e) {
System.out.println("RuntimeException invoking receiveResult: " + e.toString());
}
}
Modified: tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java (original)
+++ tuscany/java/sca/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java Thu Dec 4 16:48:31 2008
@@ -18,31 +18,40 @@
*/
package org.apache.tuscany.sca.test.callback;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* A TestCase that demonstrates resolving the client service and initiating the callback sequence
*/
-public class CallbackMultiWireTestCase extends TestCase {
+public class CallbackMultiWireTestCase {
- private SCADomain scaDomain;
+ private Node node;
private MyClient myClient1;
private MyClient myClient2;
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite");
- myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1");
- myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2");
+ @Before
+ public void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("CallbackMultiWireTest.composite");
+ node = NodeFactory.newInstance().createNode("CallbackMultiWireTest.composite", new Contribution("c1", location));
+ node.start();
+ myClient1 = node.getService(MyClient.class, "MyClientComponent1");
+ myClient2 = node.getService(MyClient.class, "MyClientComponent2");
}
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
+
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
}
+ @Test
public void test() throws Exception {
System.out.println("Main thread " + Thread.currentThread());
myClient1.aClientMethod();
Modified: tuscany/java/sca/itest/callback-separatethread/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/pom.xml (original)
+++ tuscany/java/sca/itest/callback-separatethread/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java Thu Dec 4 16:48:31 2008
@@ -21,8 +21,7 @@
import java.util.concurrent.atomic.AtomicInteger;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
@@ -58,22 +57,22 @@
public void runTests() {
// Register for 1 second call back
registerFor1SecondCallback();
-
+
// Wait for a few 1 second call backs
System.out.println("Waiting for some 1 second calls");
waitForSome1SecondCallbacks();
// Register for 5 second call back
registerFor5SecondCallback();
-
+
// Wait for a few 1 second call backs
System.out.println("Waiting for some 1 second calls");
waitForSome1SecondCallbacks();
-
+
// Wait for a few 5 second call backs
System.out.println("Waiting for some 5 second calls");
waitForSome5SecondCallbacks();
-
+
System.out.println("Done");
}
@@ -83,7 +82,7 @@
private void waitForSome1SecondCallbacks() {
// Reset the one second call back count
oneSecondCallbackCount.set(0);
-
+
// Wait until we have 10 1 second call backs or 60 seconds has passed
final long start = System.currentTimeMillis();
do {
@@ -91,15 +90,14 @@
System.out.println("Received enough 1 second notifications");
return;
}
-
+
try {
Thread.sleep(500);
} catch (InterruptedException e) {
Assert.fail("Unexpeceted exception " + e);
}
- }
- while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-
+ } while (System.currentTimeMillis() - start < SIXTY_SECONDS);
+
// If we get to here then we did not receive enough events
Assert.fail("Did not receive enough 1 second events");
}
@@ -110,31 +108,26 @@
private void waitForSome5SecondCallbacks() {
// Reset the five second call back count
fiveSecondCallbackCount.set(0);
-
+
// Wait until we have 4 5 second call backs or 60 seconds has passed
final long start = System.currentTimeMillis();
- do
- {
+ do {
if (fiveSecondCallbackCount.get() >= 4) {
System.out.println("Received enough 5 second notifications");
return;
}
-
- try
- {
+
+ try {
Thread.sleep(500);
- }
- catch (InterruptedException e)
- {
+ } catch (InterruptedException e) {
Assert.fail("Unexpeceted exception " + e);
}
- }
- while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-
+ } while (System.currentTimeMillis() - start < SIXTY_SECONDS);
+
// If we get to here then we did not receive enough events
Assert.fail("Did not receive enough 5 second events");
}
-
+
/**
* Register to receive one second call backs
*/
@@ -165,8 +158,7 @@
} else if (aEventName.equals("FIVE")) {
final int newValue = fiveSecondCallbackCount.incrementAndGet();
//System.out.println("Received total of " + newValue + " 5 second call backs");
- }
- else
+ } else
System.out.println("Unknown event type of " + aEventName);
}
}
Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java Thu Dec 4 16:48:31 2008
@@ -19,7 +19,6 @@
package org.apache.tuscany.sca.itest;
-
import org.osoa.sca.annotations.Remotable;
/**
Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java Thu Dec 4 16:48:31 2008
@@ -23,7 +23,6 @@
import org.osoa.sca.annotations.Conversational;
import org.osoa.sca.annotations.Remotable;
-
/**
* Sample Event Processor Service
*/
Modified: tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -43,39 +43,38 @@
*/
@Callback
protected CallableReference<EventProcessorCallBack> clientCallback;
-
+
/**
* This map contains the call backs for each of the registered Event names
*/
- private final Map<String, CallableReference<EventProcessorCallBack>> eventListeners;
-
+ private final Map<String, CallableReference<EventProcessorCallBack>> eventListeners;
+
/**
* The list of all Event Generators we create
*/
private final EventGenerator[] allEventGenerators;
-
+
/**
* Constructor. Starts the Event Generators
*/
public EventProcessorServiceImpl() {
eventListeners = new ConcurrentHashMap<String, CallableReference<EventProcessorCallBack>>();
-
+
// We will simulate an Event generator
allEventGenerators = new EventGenerator[2];
- allEventGenerators[0] = new EventGenerator("ONE", 1); // Generate the SECOND event every second
- allEventGenerators[1] = new EventGenerator("FIVE", 5); // Generate the FIVE event every 5 seconds
+ allEventGenerators[0] = new EventGenerator("ONE", 1); // Generate the SECOND event every second
+ allEventGenerators[1] = new EventGenerator("FIVE", 5); // Generate the FIVE event every 5 seconds
}
-
+
/**
* Registers the client to receive notifications for the specified event
*
* @param aEventName The name of the Event to register
*/
- public void registerForEvent(String aEventName)
- {
+ public void registerForEvent(String aEventName) {
// Register for the Event
eventListeners.put(aEventName, clientCallback);
-
+
// Send the "register" started event to the client
receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName);
}
@@ -85,89 +84,81 @@
*
* @param aEventName The name of the Event to unregister
*/
- public void unregisterForEvent(String aEventName)
- {
+ public void unregisterForEvent(String aEventName) {
// Send the "register" started event to the client
receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName);
-
+
eventListeners.remove(aEventName);
}
-
+
/**
* This method is called whenever the EventProcessorService receives an Event
*
* @param aEventName The name of the Event received
* @param aEventData The Event data
*/
- private void receiveEvent(String aEventName, Object aEventData)
- {
+ private void receiveEvent(String aEventName, Object aEventData) {
// Get the listener for the Event
final CallableReference<EventProcessorCallBack> callback = eventListeners.get(aEventName);
- if (callback == null)
- {
+ if (callback == null) {
//System.out.println("No registered listeners for " + aEventName);
return;
}
-
+
// Trigger the call back
// System.out.println("Notifying " + callback + " of event " + aEventName);
callback.getService().eventNotification(aEventName, aEventData);
// System.out.println("Done notify " + callback + " of event " + aEventName);
}
-
+
/**
* Shuts down the Event Processor
*/
@Destroy
- public void shutdown()
- {
+ public void shutdown() {
System.out.println("Shutting down the EventProcessor");
-
+
// Clear list of call back locations as we don't want to send any more notifications
eventListeners.clear();
// Stop the Event Generators
- for (EventGenerator generator : allEventGenerators)
- {
+ for (EventGenerator generator : allEventGenerators) {
generator.stop();
}
}
-
+
/**
* Utility class for generating Events
*/
- private class EventGenerator
- {
+ private class EventGenerator {
/**
* The Timer we are using to generate the events
*/
private final Timer timer = new Timer();
-
+
/**
* Constructor
*
* @param aEventName The name of the Event to generate
* @param frequencyInSeconds How frequently we should generate the Events
*/
- private EventGenerator(String aEventName, int frequencyInSeconds)
- {
- timer.schedule(new EventGeneratorTimerTask(aEventName),
- frequencyInSeconds * 1000, frequencyInSeconds * 1000);
+ private EventGenerator(String aEventName, int frequencyInSeconds) {
+ timer.schedule(new EventGeneratorTimerTask(aEventName),
+ frequencyInSeconds * 1000,
+ frequencyInSeconds * 1000);
}
-
+
/**
* Stop this Event Generator
*/
- private void stop()
- {
+ private void stop() {
timer.cancel();
}
-
+
/**
* The TimerTask that is invoked by the Timer for the EventGenerator
*/
- private class EventGeneratorTimerTask extends TimerTask
- {
+ private class EventGeneratorTimerTask extends TimerTask {
/**
* The name of the Event we should generate
*/
@@ -178,17 +169,15 @@
*
* @param aEventName The name of the Event we should generate
*/
- private EventGeneratorTimerTask(String aEventName)
- {
+ private EventGeneratorTimerTask(String aEventName) {
eventName = aEventName;
}
/**
* Timer calls this method and it will generate an Event
*/
- @Override
- public void run()
- {
+
+ public void run() {
// System.out.println("Generating new event " + eventName);
receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString());
}
Modified: tuscany/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java (original)
+++ tuscany/java/sca/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java Thu Dec 4 16:48:31 2008
@@ -21,7 +21,13 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* This test case will attempt to trigger a call back using a separate thread
@@ -29,10 +35,10 @@
public class CallBackSeparateThreadTestCase extends TestCase {
/**
- * The SCADomain we are using
+ * The Node we are using
*/
- private SCADomain domain;
-
+ private Node node;
+
/**
* The client the tests should use
*/
@@ -41,24 +47,29 @@
/**
* Run the call back in separate thread tests
*/
+ @Test
public void testCallBackSeparateThread() {
- aCallBackClient.runTests();
+ aCallBackClient.runTests();
}
/**
* Load the Call back in separate thread composite and look up the client.
*/
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSeparateThreadTest.composite");
- aCallBackClient = domain.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient");
+
+ @Before
+ public void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackSeparateThreadTest.composite");
+ node = NodeFactory.newInstance().createNode("CallBackSeparateThreadTest.composite", new Contribution("c1", location));
+ node.start();
+ aCallBackClient = node.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient");
}
/**
- * Shutdown the SCA domain
+ * Shutdown the SCA node
*/
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/callback-set-callback/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/pom.xml (original)
+++ tuscany/java/sca/itest/callback-set-callback/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java Thu Dec 4 16:48:31 2008
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class CallBackSetCallbackBadCallback {
Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java Thu Dec 4 16:48:31 2008
@@ -20,8 +20,7 @@
import java.io.File;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.NoRegisteredCallbackException;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Reference;
@@ -111,7 +110,7 @@
Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists());
- aCallBackService.setCallback(null); // leave this in the default state for next test
+ aCallBackService.setCallback(null); // leave this in the default state for next test
}
@@ -178,10 +177,10 @@
// If not, this method will return false.
//
- aCallBackService.setCallback(callBack); // ensure no client-side exception
+ aCallBackService.setCallback(callBack); // ensure no client-side exception
- boolean result = aCallBackService.getService().setCallbackIllegally
- ("Try to set callback on your own service reference");
+ boolean result =
+ aCallBackService.getService().setCallbackIllegally("Try to set callback on your own service reference");
Assert.assertEquals("CallBackSetCallback - Test10", true, result);
Modified: tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -56,7 +56,7 @@
try {
requestContext = context.getRequestContext();
- serviceRef = (ServiceReference) requestContext.getServiceReference();
+ serviceRef = (ServiceReference)requestContext.getServiceReference();
serviceRef.setCallback(serviceRef);
} catch (ClassCastException goodEx) {
exceptionProduced = true;
Modified: tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java (original)
+++ tuscany/java/sca/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java Thu Dec 4 16:48:31 2008
@@ -20,30 +20,35 @@
import junit.framework.TestCase;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
//FIXME Fix this test case
public class CallBackSetCallbackTestCase extends TestCase {
- private SCADomain domain;
+ private Node node;
private CallBackSetCallbackClient aCallBackClient;
public void testCallBackSetCallback() {
aCallBackClient.run();
}
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSetCallbackTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackSetCallbackClient.class,
- "CallBackSetCallbackClient");
+ @Before
+ public void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackSetCallbackTest.composite");
+ node =
+ NodeFactory.newInstance().createNode("CallBackSetCallbackTest.composite", new Contribution("c1", location));
+ node.start();
+ aCallBackClient = node.getService(CallBackSetCallbackClient.class, "CallBackSetCallbackClient");
}
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/callback-set-conversation/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/pom.xml (original)
+++ tuscany/java/sca/itest/callback-set-conversation/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java Thu Dec 4 16:48:31 2008
@@ -20,7 +20,7 @@
import java.io.Serializable;
-import junit.framework.Assert;
+import org.junit.Assert;
public class CallBackSetCallbackConvBadCallback implements Serializable {
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java Thu Dec 4 16:48:31 2008
@@ -18,8 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.osoa.sca.ComponentContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
@@ -81,8 +80,7 @@
aCallbackObject = new CallBackSetCallbackConvObjectCallback();
aCallbackObject.incrementCallBackCount();
- ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
- = componentContext.cast(aCallBackService);
+ ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef = componentContext.cast(aCallBackService);
aCallBackServiceRef.setCallback(aCallbackObject);
aCallBackService.knockKnock("Knock Knock 7");
@@ -102,8 +100,8 @@
//
try {
- ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
- = componentContext.cast(aCallBackService);
+ ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef =
+ componentContext.cast(aCallBackService);
aCallBackServiceRef.setCallback(new CallBackSetCallbackConvBadCallback());
aCallBackService.knockKnock("Knock Knock 8");
}
@@ -112,8 +110,7 @@
// This should catch an appropriate exception.
//
- catch (IllegalArgumentException goodEx)
- {
+ catch (IllegalArgumentException goodEx) {
System.out.println("correct exception " + goodEx);
correctException = true;
}
@@ -140,16 +137,15 @@
//
try {
- ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef
- = componentContext.cast(aCallBackService);
+ ServiceReference<CallBackSetCallbackConvService> aCallBackServiceRef =
+ componentContext.cast(aCallBackService);
aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback());
aCallBackService.knockKnock("Knock Knock 9");
}
//
// This should catch an appropriate exception.
//
- catch (IllegalArgumentException goodEx)
- {
+ catch (IllegalArgumentException goodEx) {
System.out.println("correct exception " + goodEx);
correctException = true;
} catch (Exception ex) {
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java Thu Dec 4 16:48:31 2008
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.Assert;
+import org.junit.Assert;
public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback {
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java Thu Dec 4 16:48:31 2008
@@ -20,8 +20,7 @@
import java.io.Serializable;
-public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable
-{
+public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable {
private int callBackCount = 0;
public CallBackSetCallbackConvObjectCallback() {
Modified: tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java Thu Dec 4 16:48:31 2008
@@ -58,7 +58,7 @@
// working.....
try {
requestContext = context.getRequestContext();
- serviceRef = (ServiceReference) requestContext.getServiceReference();
+ serviceRef = (ServiceReference)requestContext.getServiceReference();
} catch (Exception ex) {
System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString());
ex.printStackTrace();
Modified: tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java (original)
+++ tuscany/java/sca/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java Thu Dec 4 16:48:31 2008
@@ -18,31 +18,35 @@
*/
package org.apache.tuscany.sca.test;
-import junit.framework.TestCase;
+import org.apache.tuscany.sca.node.Contribution;
+import org.apache.tuscany.sca.node.ContributionLocationHelper;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
+public class CallBackSetCallbackConvTestCase {
-public class CallBackSetCallbackConvTestCase extends TestCase {
-
- private SCADomain domain;
+ private Node node;
private CallBackSetCallbackConvClient aCallBackClient;
+ @Test
public void testCallBackSetCallback() {
aCallBackClient.run();
}
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackSetCallbackConvClient.class,
- "CallBackSetCallbackConvClient");
+ @Before
+ public void setUp() throws Exception {
+ String location = ContributionLocationHelper.getContributionLocation("CallBackSetCallbackConvTest.composite");
+ node = NodeFactory.newInstance().createNode("CallBackSetCallbackConvTest.composite", new Contribution("c1", location));
+ node.start();
+ aCallBackClient = node.getService(CallBackSetCallbackConvClient.class, "CallBackSetCallbackConvClient");
}
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
+
+ @After
+ public void tearDown() throws Exception {
+ node.stop();
}
}
Modified: tuscany/java/sca/itest/component-type/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/pom.xml (original)
+++ tuscany/java/sca/itest/component-type/pom.xml Thu Dec 4 16:48:31 2008
@@ -39,14 +39,14 @@
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
Modified: tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java (original)
+++ tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorClient.java Thu Dec 4 16:48:31 2008
@@ -34,8 +34,8 @@
String location = ContributionLocationHelper.getContributionLocation("Calculator.composite");
Node node = NodeFactory.newInstance().createNode("Calculator.composite", new Contribution("c1", location));
node.start();
-
- CalculatorService calculatorService =
+
+ CalculatorService calculatorService =
node.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
// Calculate
@@ -46,5 +46,4 @@
node.stop();
}
-
}
Modified: tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java (original)
+++ tuscany/java/sca/itest/component-type/src/main/java/calculator/CalculatorService.java Thu Dec 4 16:48:31 2008
@@ -18,7 +18,6 @@
*/
package calculator;
-
/**
* The Calculator service interface.
*/
Modified: tuscany/java/sca/itest/conversations/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/pom.xml?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/pom.xml (original)
+++ tuscany/java/sca/itest/conversations/pom.xml Thu Dec 4 16:48:31 2008
@@ -31,15 +31,23 @@
<dependencies>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
+ <artifactId>tuscany-node-api</artifactId>
<version>2.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-node-impl</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-implementation-java-runtime</artifactId>
<version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
+ <scope>test</scope>
</dependency>
+
</dependencies>
</project>
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java Thu Dec 4 16:48:31 2008
@@ -26,10 +26,11 @@
public class TestResult {
public static Hashtable<Object, Boolean> results = new Hashtable<Object, Boolean>();
private static int completed = 0;
+
public static synchronized void updateCompleted() {
++completed;
}
-
+
public static synchronized int getCompleted() {
return completed;
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java Thu Dec 4 16:48:31 2008
@@ -25,7 +25,7 @@
*/
@Conversational
public interface BService {
-
+
/**
* Returns the state for this service.
*
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java Thu Dec 4 16:48:31 2008
@@ -29,14 +29,14 @@
String getState();
void setState(String aState);
-
+
Object getConversationID();
-
+
Object getConversationObjectConversationId();
-
+
void setConversationID(String theID);
-
+
void endConversation();
-
+
void endConversationViaAnnotatedMethod();
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java Thu Dec 4 16:48:31 2008
@@ -25,5 +25,6 @@
public interface ConversationIdService {
String getCIDField();
+
String getCIDSetter();
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java Thu Dec 4 16:48:31 2008
@@ -22,7 +22,6 @@
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-
/**
* The callback interface used when testing conversational callbacks
*
@@ -31,19 +30,19 @@
@Remotable
@Conversational
public interface ConversationalCallback {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
@EndsConversation
public String endConversation();
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java Thu Dec 4 16:48:31 2008
@@ -28,23 +28,39 @@
*/
@Remotable
-public interface ConversationalClient {
-
- public int runConversationFromInjectedReference();
- public int runConversationFromInjectedReference2();
- public int runConversationFromServiceReference();
- public int runConversationWithUserDefinedConversationId();
- public String runConversationCheckUserDefinedConversationId();
- public int runConversationCheckingScope();
- public int runConversationWithCallback();
- public int runConversationHavingPassedReference();
- public String runConversationBusinessException();
- public String runConversationBusinessExceptionCallback();
- public int runConversationCallingEndedConversation();
- public int runConversationCallingEndedConversationCallback();
- public String runConversationCallingEndedConversationCheckConversationId();
- public String runConversationCallingEndedConversationCallbackCheckConversationId();
- public int runConversationAgeTimeout();
- public int runConversationIdleTimeout();
- public int runConversationPrincipleError();
+public interface ConversationalClient {
+
+ public int runConversationFromInjectedReference();
+
+ public int runConversationFromInjectedReference2();
+
+ public int runConversationFromServiceReference();
+
+ public int runConversationWithUserDefinedConversationId();
+
+ public String runConversationCheckUserDefinedConversationId();
+
+ public int runConversationCheckingScope();
+
+ public int runConversationWithCallback();
+
+ public int runConversationHavingPassedReference();
+
+ public String runConversationBusinessException();
+
+ public String runConversationBusinessExceptionCallback();
+
+ public int runConversationCallingEndedConversation();
+
+ public int runConversationCallingEndedConversationCallback();
+
+ public String runConversationCallingEndedConversationCheckConversationId();
+
+ public String runConversationCallingEndedConversationCallbackCheckConversationId();
+
+ public int runConversationAgeTimeout();
+
+ public int runConversationIdleTimeout();
+
+ public int runConversationPrincipleError();
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java Thu Dec 4 16:48:31 2008
@@ -29,8 +29,8 @@
*/
@Remotable
-public interface ConversationalReferenceClient {
-
+public interface ConversationalReferenceClient {
+
public void incrementCount(CallableReference<ConversationalService> conversationalService);
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java Thu Dec 4 16:48:31 2008
@@ -23,7 +23,6 @@
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-
/**
* The service interface used when testing conversations
*
@@ -33,30 +32,30 @@
@Conversational
@Callback(ConversationalCallback.class)
public interface ConversationalService {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
public void initializeCountCallback(int count);
-
+
public void incrementCountCallback();
-
+
public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
+
+ public void businessExceptionCallback() throws Exception;
+
@EndsConversation
public String endConversation();
-
+
public String endConversationCallback();
}
Modified: tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java?rev=723537&r1=723536&r2=723537&view=diff
==============================================================================
--- tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java (original)
+++ tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java Thu Dec 4 16:48:31 2008
@@ -23,7 +23,6 @@
import org.osoa.sca.annotations.EndsConversation;
import org.osoa.sca.annotations.Remotable;
-
/**
* The service interface used when testing conversations
*
@@ -33,30 +32,30 @@
@Conversational
@Callback(NonConversationalCallback.class)
public interface ConversationalServiceNonConversationalCallback {
-
+
public void init();
-
+
public void destroy();
-
+
public void initializeCount(int count);
-
+
public void incrementCount();
-
+
public int retrieveCount();
-
- public void businessException() throws Exception;
-
+
+ public void businessException() throws Exception;
+
public void initializeCountCallback(int count);
-
+
public void incrementCountCallback();
-
+
public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
+
+ public void businessExceptionCallback() throws Exception;
+
@EndsConversation
public String endConversation();
-
+
public String endConversationCallback();
}