Recreate 2.0-Beta3 branch from current trunk

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

7 files changed, 270 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/async/NotificationService.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/async/NotificationService.java
new file mode 100644
index 0000000000..f6cb155023
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/async/NotificationService.java
@@ -0,0 +1,34 @@
+/*
+ * 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 async;
+
+import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.OneWay;
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+@Callback(WebsocketBindingCallback.class)
+public interface NotificationService {
+
+	@OneWay
+	void registerForNotifications();
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
new file mode 100644
index 0000000000..3350e7bd5f
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
@@ -0,0 +1,50 @@
+/*
+ * 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 async;
+
+import java.util.Date;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback;
+import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketStatus;
+import org.oasisopen.sca.annotation.Callback;
+import org.oasisopen.sca.annotation.Service;
+
+@Service(NotificationService.class)
+public class NotificationServiceImpl implements NotificationService {
+
+    @Callback
+    protected WebsocketBindingCallback client;
+
+    @Override
+    public void registerForNotifications() {
+        new Timer().scheduleAtFixedRate(new TimerTask() {
+
+            @Override
+            public void run() {
+                WebsocketStatus status = client.sendMessage("Notification @ " + new Date());
+                if (status == WebsocketStatus.CLOSED) {
+                    this.cancel();
+                }
+            }
+        }, 0L, 1000L);
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/sync/HelloService.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/sync/HelloService.java
new file mode 100644
index 0000000000..3e205c8148
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/sync/HelloService.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 sync;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface HelloService {
+
+	String sayHello(String name);
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
new file mode 100644
index 0000000000..ee55d1db78
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
@@ -0,0 +1,30 @@
+/*
+ * 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 sync;
+
+import org.oasisopen.sca.annotation.Service;
+
+@Service(HelloService.class)
+public class HelloServiceImpl implements HelloService {
+
+    @Override
+    public String sayHello(String name) {
+        return "Hello " + name;
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
new file mode 100644
index 0000000000..318e2fdd01
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
@@ -0,0 +1,59 @@
+/*
+ * 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 testcase;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.http.jetty.JettyServer;
+import org.apache.tuscany.sca.node.Node;
+import org.apache.tuscany.sca.node.NodeFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class WebsocketBindingTestCase {
+
+    @BeforeClass
+    public static void init() {
+        JettyServer.portDefault = 8085;
+    }
+
+    @Test
+    public void testSync() {
+        try {
+            Node node = NodeFactory.newInstance().createNode("sync.composite");
+            node.start();
+            node.stop();
+        } catch (final Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testAsync() {
+        try {
+            Node node = NodeFactory.newInstance().createNode("async.composite");
+            node.start();
+            node.stop();
+        } catch (final Exception e) {
+            Assert.fail(e.getMessage());
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/resources/async.composite b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/resources/async.composite
new file mode 100644
index 0000000000..277cf17df2
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/resources/async.composite
@@ -0,0 +1,37 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+           targetNamespace="http://samples"
+           name="Async">
+
+	<component name="NotificationComponent">
+		<implementation.java class="async.NotificationServiceImpl"/>
+		<service name="NotificationService">
+			<interface.java interface="async.NotificationService" 
+				callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback"/>
+			<tuscany:binding.websocket/>
+			<callback>
+				<tuscany:binding.websocket/>
+			</callback>
+		</service>
+	</component>
+	
+</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/resources/sync.composite b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/resources/sync.composite
new file mode 100644
index 0000000000..a4662cb2ee
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta3/modules/binding-websocket/src/test/resources/sync.composite
@@ -0,0 +1,32 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
+	xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+	targetNamespace="http://samples" name="Sync">
+
+	<component name="HelloComponent">
+		<implementation.java class="sync.HelloServiceImpl" />
+		<service name="HelloService">
+			<interface.java interface="sync.HelloService" />
+			<tuscany:binding.websocket />
+		</service>
+	</component>
+
+</composite>
\ No newline at end of file