Branch for 1.3.3

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@703809 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 410 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.3/itest/callback-id/pom.xml b/branches/sca-java-1.3.3/itest/callback-id/pom.xml
new file mode 100644
index 0000000000..11613223fe
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/pom.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-itest</artifactId>
+        <version>1.3.2-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>itest-callback-id</artifactId>
+    <name>Apache Tuscany SCA Callback ID Integration Tests</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.3.2-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+</project>
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
new file mode 100644
index 0000000000..b14560a8c3
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.test;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+/**
+ *
+ */
+public interface CallBackIdCallBack {
+
+    public void callBackMessage(String aString);
+
+}
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
new file mode 100644
index 0000000000..a9e551f8b4
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.test;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface CallBackIdClient {
+
+    public void run();
+
+}
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
new file mode 100644
index 0000000000..59c9c3d069
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
@@ -0,0 +1,147 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.test;
+
+import junit.framework.Assert;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
+
+@Service(CallBackIdClient.class)
+public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack {
+
+    @Context
+    protected ComponentContext componentContext;
+
+    @Reference
+    protected ServiceReference<CallBackIdService> aCallBackService;
+
+    private static String returnMessage = null;
+    private static Object monitor = new Object();
+    private static Object callBackId;
+
+    public void run() {
+
+        // This tests the use of the set/get callbackId API both SCA generated
+        // and client specified.
+
+        // Test1 uses a SCA generated callback ID and compare that with the
+        // callbackID returned during callback.
+        test11a();
+
+        // Test2 uses a Client specified callback ID and compare that with the
+        // callbackID returned during callback.
+        test11b();
+
+        return;
+    }
+
+    private void test11a() {
+
+        // Retrieve this services callback ID and save it. Once the callback is
+        // received the callback ID will be compared with the one
+        // returned. Equal is good.
+
+        Object origCallBackId = aCallBackService.getCallbackID();
+        aCallBackService.getService().knockKnock("Knock Knock - Test1");
+        int count = 0;
+
+        // 
+        // If we cannot get a response in 30 seconds consider this a failure
+        // 
+
+        synchronized (monitor) {
+            while (returnMessage == null && count++ < 30) {
+                try {
+                    monitor.wait(1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        Assert.assertEquals("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId());
+
+    }
+
+    private void test11b() {
+
+        // Set the services callback ID and save it. Once the callback is
+        // received the callback ID will be compared with the one
+        // returned. Equal is good.
+
+        String origCallBackId = "CallBackId1";
+        aCallBackService.setCallbackID(origCallBackId);
+
+        aCallBackService.getService().knockKnock("Knock Knock - Test2");
+        int count = 0;
+
+        // 
+        // If we can't get a response in 30 seconds consider this a failure
+        // 
+
+        synchronized (monitor) {
+            while (returnMessage == null && count++ < 30) {
+                try {
+                    monitor.wait(1000L);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        Assert
+            .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId());
+
+    }
+
+    public String getReturnMessage() {
+        return returnMessage;
+    }
+
+    public void setReturnMessage(String aReturnMessage) {
+        returnMessage = aReturnMessage;
+    }
+
+    public void callBackMessage(String aString) {
+
+        System.out.println("Entering callback callBackMessage: " + aString);
+        RequestContext rc = componentContext.getRequestContext();
+        Object callBackId = rc.getServiceReference().getCallbackID();
+
+        synchronized (monitor) {
+            this.setReturnMessage(aString);
+            this.setCallBackId(callBackId);
+            monitor.notify();
+        }
+    }
+
+    protected Object getCallBackId() {
+        return callBackId;
+    }
+
+    protected void setCallBackId(Object aCallBackId) {
+        callBackId = aCallBackId;
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
new file mode 100644
index 0000000000..18c592a1c1
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.test;
+
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+@Callback(CallBackIdCallBack.class)
+/**
+ * 
+ */
+public interface CallBackIdService {
+
+    public void knockKnock(String aString);
+
+}
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
new file mode 100644
index 0000000000..8b0a4b69cf
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.test;
+
+import org.osoa.sca.ComponentContext;
+import org.osoa.sca.RequestContext;
+import org.osoa.sca.annotations.Callback;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
+
+@Service(CallBackIdService.class)
+public class CallBackIdServiceImpl implements CallBackIdService {
+
+    @Callback
+    protected CallBackIdCallBack callback;
+    @Context
+    protected ComponentContext compositeContext;
+
+    public void knockKnock(String aString) {
+
+        System.out.println("CallBackIdServiceImpl message received: " + aString);
+        RequestContext rc = compositeContext.getRequestContext();
+        Object callBackId = rc.getServiceReference().getCallbackID();
+        System.out.println("CallBackIdServiceImpl callbackID: " + callBackId);
+
+        callback.callBackMessage("Who's There");
+        System.out.println("CallBackIdServiceImpl response sent");
+        return;
+
+    }
+
+}
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/main/resources/CallBackIdClient.composite b/branches/sca-java-1.3.3/itest/callback-id/src/main/resources/CallBackIdClient.composite
new file mode 100644
index 0000000000..c9a6ba6258
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/main/resources/CallBackIdClient.composite
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	targetNamespace="http://callback"
+	name="CallBackIdTest">
+ 	      
+    <component name="CallBackIdClient">
+		<implementation.java class="org.apache.tuscany.sca.test.CallBackIdClientImpl"/>
+		<reference name="aCallBackService" target="CallBackIdService"/>
+    </component> 
+    
+    <component name="CallBackIdService">
+      <implementation.java class="org.apache.tuscany.sca.test.CallBackIdServiceImpl"/>
+    </component>  
+  
+</composite>
diff --git a/branches/sca-java-1.3.3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/branches/sca-java-1.3.3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
new file mode 100644
index 0000000000..771fbb8ff7
--- /dev/null
+++ b/branches/sca-java-1.3.3/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.test;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class CallBackIdTestCase extends TestCase {
+
+    private SCADomain domain;
+    private CallBackIdClient aCallBackClient;
+
+    public void testCallBackBasic() {
+        aCallBackClient.run();
+    }
+
+    @Override
+    protected void setUp() throws Exception {
+        domain = SCADomain.newInstance("CallBackIdClient.composite");
+
+        aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
+    }
+
+    @Override
+    protected void tearDown() throws Exception {
+        domain.close();
+    }
+}