summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>2011-07-26 21:10:39 +0000
committerfmoga <fmoga@13f79535-47bb-0310-9956-ffa450edef68>2011-07-26 21:10:39 +0000
commit24eb985532c90f1fa09a6c4672ced19e63627fc9 (patch)
tree08976324ed6b64d827bd3283dca0c77859ebbbb6
parent74d9cac502ce78872317dcebe18deec3f8b37fdd (diff)
Move the websocket binding to trunk.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151250 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/LICENSE (renamed from sca-java-2.x/contrib/modules/binding-websocket/LICENSE)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/META-INF/MANIFEST.MF (renamed from sca-java-2.x/contrib/modules/binding-websocket/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/NOTICE (renamed from sca-java-2.x/contrib/modules/binding-websocket/NOTICE)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/pom.xml (renamed from sca-java-2.x/contrib/modules/binding-websocket/pom.xml)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/META-INF/MANIFEST.MF (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/META-INF/MANIFEST.MF)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBinding.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBinding.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBindingFactory.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBindingFactory.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JSONUtil.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JSONUtil.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptGenerator.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptGenerator.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/TuscanyWebsocket.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/TuscanyWebsocket.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingCallback.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingCallback.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingDispatcher.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingDispatcher.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingMessage.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingMessage.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingProviderFactory.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingProviderFactory.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketCallbackInvoker.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketCallbackInvoker.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketConnectionManager.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketConnectionManager.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketReferenceBindingProvider.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketReferenceBindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServer.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServer.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceInvoker.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceInvoker.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketStatus.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketStatus.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.websocket.WebsocketBindingFactory (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.websocket.WebsocketBindingFactory)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/binding-websocket.xsd (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/binding-websocket.xsd)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/java/async/NotificationService.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/java/sync/HelloService.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/resources/async.composite (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite)0
-rw-r--r--sca-java-2.x/trunk/modules/binding-websocket/src/test/resources/sync.composite (renamed from sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite)0
35 files changed, 0 insertions, 0 deletions
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/LICENSE b/sca-java-2.x/trunk/modules/binding-websocket/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/LICENSE
+++ b/sca-java-2.x/trunk/modules/binding-websocket/LICENSE
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-websocket/META-INF/MANIFEST.MF
index 2f29092dbe..2f29092dbe 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-websocket/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/NOTICE b/sca-java-2.x/trunk/modules/binding-websocket/NOTICE
index f6ce2542c3..f6ce2542c3 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/NOTICE
+++ b/sca-java-2.x/trunk/modules/binding-websocket/NOTICE
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/pom.xml b/sca-java-2.x/trunk/modules/binding-websocket/pom.xml
index d473ba8503..d473ba8503 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/pom.xml
+++ b/sca-java-2.x/trunk/modules/binding-websocket/pom.xml
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/META-INF/MANIFEST.MF
index 5e9495128c..5e9495128c 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/META-INF/MANIFEST.MF
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/META-INF/MANIFEST.MF
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBinding.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBinding.java
index a78a6b11c2..a78a6b11c2 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBinding.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBinding.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBindingFactory.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBindingFactory.java
index 1357bb5a7c..1357bb5a7c 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBindingFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/WebsocketBindingFactory.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JSONUtil.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JSONUtil.java
index 80cbf6a6d9..80cbf6a6d9 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JSONUtil.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JSONUtil.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptGenerator.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptGenerator.java
index 21b953151b..21b953151b 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptGenerator.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptGenerator.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
index 50d68a19bc..50d68a19bc 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/JavascriptResourceServlet.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/TuscanyWebsocket.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/TuscanyWebsocket.java
index b71ca27543..b71ca27543 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/TuscanyWebsocket.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/TuscanyWebsocket.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingCallback.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingCallback.java
index 3ece55aa00..3ece55aa00 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingCallback.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingCallback.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingDispatcher.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingDispatcher.java
index eda78de98a..eda78de98a 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingDispatcher.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingDispatcher.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingMessage.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingMessage.java
index f7ea1d1620..f7ea1d1620 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingMessage.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingMessage.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingProviderFactory.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingProviderFactory.java
index 5c5f96bd76..5c5f96bd76 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingProviderFactory.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketBindingProviderFactory.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketCallbackInvoker.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketCallbackInvoker.java
index ebd7f13081..ebd7f13081 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketCallbackInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketCallbackInvoker.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketConnectionManager.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketConnectionManager.java
index ba95d77b7f..ba95d77b7f 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketConnectionManager.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketConnectionManager.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketReferenceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketReferenceBindingProvider.java
index dfd632d330..dfd632d330 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketReferenceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketReferenceBindingProvider.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServer.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServer.java
index cde86b0575..cde86b0575 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServer.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServer.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
index 2352970b2e..2352970b2e 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceBindingProvider.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceInvoker.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceInvoker.java
index 6c7a25c59e..6c7a25c59e 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceInvoker.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketServiceInvoker.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketStatus.java b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketStatus.java
index bb89761459..bb89761459 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketStatus.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/java/org/apache/tuscany/sca/binding/websocket/runtime/WebsocketStatus.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.websocket.WebsocketBindingFactory b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.websocket.WebsocketBindingFactory
index 4ec8ba4eb2..4ec8ba4eb2 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.websocket.WebsocketBindingFactory
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.websocket.WebsocketBindingFactory
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index fd2e21a468..fd2e21a468 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
index d4a7646f48..d4a7646f48 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
index e97707636d..e97707636d 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/binding-websocket.xsd b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/binding-websocket.xsd
index 8ed0011361..8ed0011361 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/binding-websocket.xsd
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/binding-websocket.xsd
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js
index ede28579d3..ede28579d3 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/main/resources/js/TuscanyWebsocketToolkit.js
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/async/NotificationService.java
index f6cb155023..f6cb155023 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationService.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/async/NotificationService.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
index 3350e7bd5f..3350e7bd5f 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/async/NotificationServiceImpl.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/sync/HelloService.java
index 3e205c8148..3e205c8148 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloService.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/sync/HelloService.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
index ee55d1db78..ee55d1db78 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/sync/HelloServiceImpl.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
index 318e2fdd01..318e2fdd01 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/java/testcase/WebsocketBindingTestCase.java
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite b/sca-java-2.x/trunk/modules/binding-websocket/src/test/resources/async.composite
index 277cf17df2..277cf17df2 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/async.composite
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/resources/async.composite
diff --git a/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite b/sca-java-2.x/trunk/modules/binding-websocket/src/test/resources/sync.composite
index a4662cb2ee..a4662cb2ee 100644
--- a/sca-java-2.x/contrib/modules/binding-websocket/src/test/resources/sync.composite
+++ b/sca-java-2.x/trunk/modules/binding-websocket/src/test/resources/sync.composite