Official Tuscany 2.0.1 Release

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68
author: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2013-10-07 22:23:21 +0000
committer: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2013-10-07 22:23:21 +0000
commit: 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 (patch)
tree: 018d3d8c637e265b8292d34e5f7c11ca8ce11b7d /sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket
parent: 132aa8a77685ec92bc90c03f987650d275a7b639 (diff)
46 files changed, 0 insertions, 2530 deletions
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/README b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/README
deleted file mode 100644
index a0b90cdf2f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/README
+++ /dev/null
@@ -1,67 +0,0 @@
-Tuscany - Learning More - Binding Websocket - Autocomplete Webapp
------------------------------------------------------------------
-
-This sample demonstrates how Tuscany can expose services via websockets as well
-as how to interact with them using Tuscany's javascript API.
-
-This project contains a service (CountryService) that handles requests asking
-for country names starting with a certain prefix. The service implementation
-uses a country repository to fetch the necessary data.
-
-By adding <tuscany:binding.websocket port="8090"/> to a service definition, the 
-Tuscany runtime will start a websocket server listening for requests coming
-in for the exposed service at the specified port. If no port is specified, the
-runtime will use port 9000 as a default.  
-
-The websocket binding uses embedded Jetty instances as websocket servers. At the
-moment, Jetty 8.0.0-M3 is used which has support for the 00, 01, 06 and 07 
-versions of the websocket protocol drafts.
-
-IN ORDER TO RUN THIS SAMPLE SUCCESSFULLY PLEASE CHECK IF YOUR BROWSER SUPPORTS 
-THE ABOVE WEBSOCKET PROTOCOL VERSIONS AND THAT THE WEBSOCKET SUPPORT IS ENABLED.
-
-The websocket binding also features a javascript API to simulate SCA in the 
-browser. In order to use it, the following script has to be included in the
-client page: 
-    <script type="text/javascript" 
-            src="org.apache.tuscany.sca.WebsocketComponentContext.js">
-    </script>
-	
-This will inject proxies for all services defined in the composite that are 
-using binding.websocket. All invocation and connection management is handled
-under the hood so in order to invoke a websocket service, the following should
-be called:
-	Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>(<parameters>);
-
-Given the asynchornous nature of websockets, a function should be defined in
-order to handle responses received for a certain service operation. This should
-be done as follows:
-    Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>.responseHandler = function(response) {
-        // handle response
-    };
-	
-Note that the data exchange is automatically handled by the binding, so the
-parameters should have the same structure as the data types defined in the method
-definition. Also, the response will have the same data type as the return type of
-the service method. Objects are passed over the wire in JSON format.
-
-Another detail worth mentioning is that the binding will use a single websocket 
-connection to handle communication between a browser client and all services 
-defined using binding.websocket on the same port. Requests and responses will get
-multiplexed via the same channel and get routed to the appropriate service 
-implementation, respectively javascript function.
-
-In order to run the sample, you can execute "mvn jetty:run" which will start a Jetty
-instance automatically or use "mvn package" and deploy the resulting war to the
-application server of your choice.
-
-Next, point your browser at 
-    http://localhost:8080/sample-binding-websocket-autocomplete-webapp/
-	
-You can see how suggestions are being received in real time when characters are
-entered in the text field. You can see the persistent websocket connection using 
-the developer tools provided by your browser.
-
-The websocket binding is an experimental binding so community feedback is much 
-appreciated. Feel free to send comments or suggestions on the Apache Tuscany 
-dev mailing list (dev@tuscany.apache.org).
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
deleted file mode 100644
index 307a78f6a2..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca.samples</groupId>
-		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0.1</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>sample-binding-websocket-autocomplete-webapp</artifactId>
-	<packaging>war</packaging>
-	<version>2.0.1</version>
-	<name>Apache Tuscany SCA Sample binding.websocket Autocomplete Webapp</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0.1</version>
-			<type>pom</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.26</version>
-			</plugin>
-		</plugins>
-	</build>
-	
-</project>
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java
deleted file mode 100644
index 931e205dd7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/Country.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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 sample;
-
-import java.io.Serializable;
-
-public class Country implements Serializable {
-
-	private String name;
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String toString() {
-		return name;
-	}
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java
deleted file mode 100644
index eb30e6f36a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepository.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CountryRepository {
-
-	List<Country> findStartingWith(String text);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java
deleted file mode 100644
index 17ce39a10e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryRepositoryImpl.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * 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 sample;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@EagerInit
-@Scope("COMPOSITE")
-@Service(CountryRepository.class)
-public class CountryRepositoryImpl implements CountryRepository {
-
-    private String fileName;
-    private List<Country> countries;
-
-    @Constructor
-    public CountryRepositoryImpl(@Property(name = "fileName") String fileName) {
-        this.fileName = fileName;
-        countries = new ArrayList<Country>();
-    }
-
-    @Init
-    public void start() {
-        try {
-            BufferedReader reader = new BufferedReader(new InputStreamReader(getClass().getClassLoader()
-                    .getResourceAsStream(fileName)));
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (!line.startsWith("#")) {
-                    Country c = new Country();
-                    c.setName(line);
-                    countries.add(c);
-                }
-            }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    @Override
-    public List<Country> findStartingWith(String text) {
-        List<Country> result = new ArrayList<Country>();
-        for (Country c : countries) {
-            if (c.getName().toLowerCase().startsWith(text.toLowerCase())) {
-                result.add(c);
-            }
-        }
-        return result;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java
deleted file mode 100644
index 40212d5ba5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CountryService {
-
-	List<Country> getCountriesStartingWith(String text);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java
deleted file mode 100644
index 20ceacd5f0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/java/sample/CountryServiceImpl.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.List;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(CountryService.class)
-public class CountryServiceImpl implements CountryService {
-
-    @Reference
-    protected CountryRepository repository;
-
-    @Override
-    public List<Country> getCountriesStartingWith(String text) {
-        return repository.findStartingWith(text);
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt
deleted file mode 100644
index 0ce76f8167..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/resources/countries.txt
+++ /dev/null
@@ -1,211 +0,0 @@
-# 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.
-Afghanistan
-Albania
-Algeria
-Andorra
-Angola
-Antigua & Barbuda
-Argentina
-Armenia
-Australia
-Austria
-Azerbaijan
-Bahamas
-Bahrain
-Bangladesh
-Barbados
-Belarus
-Belgium
-Belize
-Benin
-Bhutan
-Bolivia
-Bosnia & Herzegovina
-Botswana
-Brazil
-Brunei
-Bulgaria
-Burkina Faso
-Burundi
-Cambodia
-Cameroon
-Canada
-Cape Verde
-Central African Republic
-Chad
-Chile
-China
-Colombia
-Comoros
-Congo
-Congo Democratic Republic of
-Costa Rica
-Cote d'Ivoire
-Croatia
-Cuba
-Cyprus
-Czech Republic
-Denmark
-Djibouti
-Dominica
-Dominican Republic
-Ecuador
-East Timor
-Egypt
-El Salvador
-Equatorial Guinea
-Eritrea
-Estonia
-Ethiopia
-Fiji
-Finland
-France
-Gabon
-Gambia
-Georgia
-Germany
-Ghana
-Greece
-Grenada
-Guatemala
-Guinea
-Guinea-Bissau
-Guyana
-Haiti
-Honduras
-Hungary
-Iceland
-India
-Indonesia
-Iran
-Iraq
-Ireland
-Israel
-Italy
-Jamaica
-Japan
-Jordan
-Kazakhstan
-Kenya
-Kiribati
-Korea North
-Korea South
-Kosovo
-Kuwait
-Kyrgyzstan
-Laos
-Latvia
-Lebanon
-Lesotho
-Liberia
-Libya
-Liechtenstein
-Lithuania
-Luxembourg
-Macedonia
-Madagascar
-Malawi
-Malaysia
-Maldives
-Mali
-Malta
-Marshall Islands
-Mauritania
-Mauritius
-Mexico
-Micronesia
-Moldova
-Monaco
-Mongolia
-Montenegro
-Morocco
-Mozambique
-Myanmar (Burma)
-Namibia
-Nauru
-Nepal
-The Netherlands
-New Zealand
-Nicaragua
-Niger
-Nigeria
-Norway
-Oman
-Pakistan
-Palau
-Palestinian State*
-Panama
-Papua New Guinea
-Paraguay
-Peru
-The Philippines
-Poland
-Portugal
-Qatar
-Romania
-Russia
-Rwanda
-St. Kitts & Nevis
-St. Lucia
-St. Vincent & The Grenadines
-Samoa
-San Marino
-Sao Tome & Principe
-Saudi Arabia
-Senegal
-Serbia
-Seychelles
-Sierra Leone
-Singapore
-Slovakia
-Slovenia
-Solomon Islands
-Somalia
-South Africa
-Spain
-Sri Lanka
-Sudan
-Suriname
-Swaziland
-Sweden
-Switzerland
-Syria
-Taiwan
-Tajikistan
-Tanzania
-Thailand
-Togo
-Tonga
-Trinidad & Tobago
-Tunisia
-Turkey
-Turkmenistan
-Tuvalu
-Uganda
-Ukraine
-United Arab Emirates
-United Kingdom
-United States of America
-Uruguay
-Uzbekistan
-Vanuatu
-Vatican City (Holy See)
-Venezuela
-Yemen
-Zambia
-Zimbabwe
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02ef..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index fc1c177e9b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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="Chat">
-
-	<component name="CountryServiceComponent">
-		<implementation.java
-			class="sample.CountryServiceImpl" />
-		<service name="CountryService">
-			<interface.java interface="sample.CountryService" />
-			<tuscany:binding.websocket port="8090" />
-		</service>
-		<reference name="repository" target="CountryRepositoryComponent" />
-	</component>
-
-	<component name="CountryRepositoryComponent">
-		<implementation.java class="sample.CountryRepositoryImpl" />
-		<property name="fileName">countries.txt</property>
-	</component>
-
-</composite>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 25b06c457a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:j2ee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3.0.xsd" version="3.0">
-  <display-name>Apache Tuscany Stock Comet Sample</display-name>
-  <filter>
-    <filter-name>tuscany</filter-name>
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    <async-supported>true</async-supported>
-  </filter>
-  <filter-mapping>
-    <filter-name>tuscany</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-</web-app>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
deleted file mode 100644
index 618c772eb6..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/autocomplete-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
- * 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.
--->
-<html>
-	<head>
-		<title>Apache Tuscany Websocket Sample</title>
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script> 
-		<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
-		<script type="text/javascript">
-		var user = "";
-
-		Tuscany.WebsocketComponentContext.CountryServiceComponent.CountryService.getCountriesStartingWith.responseHandler = function(response) {
-			var html = '<ul>';
-			$.each(response, function(index, country) {
-				html += '<li>' + country.name + "</li>"
-			});
-			html += '</ul>'
-			$("#suggestions").html(html);
-		}
-		
-		$(document).ready(function()
-		{
-			$("#country").keyup(function() {
-				var text = $("#country").val();
-				if (text != "") {
-					Tuscany.WebsocketComponentContext.CountryServiceComponent.CountryService.getCountriesStartingWith(text);
-				} else {
-					$("#suggestions").html("");
-				}
-			});	
-			$("#country").focus();
-		});
-
-		</script>
-	</head>
-	<body>
-		<h2>Apache Tuscany Websocket Sample</h2>
-		<h3>Real-time suggestions</h3>
-		<table>
-			<tr>
-				<td>Enter a country name</td>
-				<td><input type="text" id='country'/></td>
-			</tr>
-		</table>
-		</div>
-		<div id="suggestions">
-		</div>
-	</body>
-</html>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/README b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/README
deleted file mode 100644
index 5a9381f980..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/README
+++ /dev/null
@@ -1,88 +0,0 @@
-Tuscany - Learning More - Binding Websocket - Chat Webapp
------------------------------------------------------------------
-
-This sample demonstrates how Tuscany can expose services via websockets as well
-as how to interact with them using Tuscany's javascript API. It also demonstrates
-how to push multiple responses from the server to the client for a single request
-using SCA callbacks.
-
-This project contains a service (ChatService) that handles chat operations like
-register and postMessage. Once a client is registered it will receive messages
-that are sent to the chat room.
-
-By adding <tuscany:binding.websocket port="8090"/> to a service definition, the 
-Tuscany runtime will start a websocket server listening for requests coming
-in for the exposed service at the specified port. If no port is specified, the
-runtime will use port 9000 as a default.  
-
-The websocket binding uses embedded Jetty instances as websocket servers. At the
-moment, Jetty 8.0.0-M3 is used which has support for the 00, 01, 06 and 07 
-versions of the websocket protocol drafts.
-
-IN ORDER TO RUN THIS SAMPLE SUCCESSFULLY PLEASE CHECK IF YOUR BROWSER SUPPORTS 
-THE ABOVE WEBSOCKET PROTOCOL VERSIONS AND THAT THE WEBSOCKET SUPPORT IS ENABLED.
-
-In order to enable callbacks to push multiple responses, you need to declare the 
-WebsocketBindingCallback in the service definition as follows:
-
-    <interface.java interface="sample.ChatService"
-                    callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback" />
-    <tuscany:binding.websocket />
-    <callback>
-        <tuscany:binding.websocket />
-    </callback>
-    
-The callback object has methods that facilitate sending messages back to the 
-calling client. It can be injected in the service implementation using the @Callback
-annotation. However, the service implementation for this sample has the COMPOSITE
-scope so the callback reference has to be obtained from the ComponentContext.
-
-One requirement that service methods have to meet to enable multiple response 
-support is that they have to be annotated with @OneWay to enable non-blocking 
-support. Without it, methods are treated synchronously sending a single response
-which is the object returned by the method call.  
-
-The websocket binding also features a javascript API to simulate SCA in the 
-browser. In order to use it, the following script has to be included in the
-client page: 
-    <script type="text/javascript" 
-            src="org.apache.tuscany.sca.WebsocketComponentContext.js">
-    </script>
-	
-This will inject proxies for all services defined in the composite that are 
-using binding.websocket. All invocation and connection management is handled
-under the hood so in order to invoke a websocket service, the following should
-be called:
-	Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>(<parameters>);
-
-Given the asynchornous nature of websockets, a function should be defined in
-order to handle responses received for a certain service operation. This should
-be done as follows:
-    Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>.responseHandler = function(response) {
-        // handle response
-    };
-	
-Note that the data exchange is automatically handled by the binding, so parameters 
-will be mapped to the data types defined in the method definition. Also, the response 
-will have the same data type as the server side object used to wrap the response. 
-Objects are passed over the wire in JSON format.
-
-Another detail worth mentioning is that the binding will use a single persistent 
-websocket connection to handle communication between a browser client and all services 
-defined using binding.websocket on the same port. Requests and responses will get
-multiplexed via the same channel and get routed to the appropriate service 
-implementation, respectively javascript function.
-
-In order to run the sample, you can execute "mvn jetty:run" which will start a Jetty
-instance automatically or use "mvn package" and deploy the resulting war to the
-application server of your choice.
-
-Next, point your browser at 
-    http://localhost:8080/sample-binding-websocket-chat-webapp/
-	
-You can now chat using multiple tabs or browsers. You can see the persistent websocket 
-connection using the developer tools provided by your browser.
-
-The websocket binding is an experimental binding so community feedback is much 
-appreciated. Feel free to send comments or suggestions on the Apache Tuscany 
-dev mailing list (dev@tuscany.apache.org).
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/pom.xml
deleted file mode 100644
index ad6a82ac6f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca.samples</groupId>
-		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0.1</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>sample-binding-websocket-chat-webapp</artifactId>
-	<packaging>war</packaging>
-	<version>2.0.1</version>
-	<name>Apache Tuscany SCA Sample binding.websocket Chat Webapp</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0.1</version>
-			<type>pom</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>r09</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.26</version>
-			</plugin>
-		</plugins>
-	</build>
-	
-</project>
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index 7ec6a547a9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-@Callback(WebsocketBindingCallback.class)
-@Remotable
-public interface ChatService {
-
-    @OneWay
-    void register();
-
-    @OneWay
-    void postMessage(String user, String message);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index 6fd4455ba9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/java/sample/ChatServiceImpl.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.ArrayList;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback;
-import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketStatus;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-@Service(ChatService.class)
-@Scope("COMPOSITE")
-public class ChatServiceImpl implements ChatService {
-
-    @Context
-    protected ComponentContext context;
-
-    private CopyOnWriteArrayList<WebsocketBindingCallback> clients = new CopyOnWriteArrayList<WebsocketBindingCallback>();
-
-    @Override
-    public void postMessage(String user, String message) {
-        for (WebsocketBindingCallback callback : new ArrayList<WebsocketBindingCallback>(clients)) {
-            WebsocketStatus status = callback.sendMessage(user + ": " + message);
-            if (status == WebsocketStatus.CLOSED) {
-                clients.remove(callback);
-            }
-        }
-    }
-
-    @Override
-    public void register() {
-        // saving the callback object during register() method so it will push
-        // data back to the client
-        // using the callback method defined for the register operation in the
-        // js when used
-        clients.add(context.getRequestContext().<WebsocketBindingCallback> getCallback());
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02ef..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 4e83fee9e8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-<?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="Chat">
-
-	<component name="ChatComponent">
-		<implementation.java
-			class="sample.ChatServiceImpl" />
-		<service name="ChatService">
-			<interface.java interface="sample.ChatService"
-				callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback" />
-			<tuscany:binding.websocket />
-			<callback>
-				<tuscany:binding.websocket />
-			</callback>
-		</service>
-	</component>
-
-</composite>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 25b06c457a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:j2ee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3.0.xsd" version="3.0">
-  <display-name>Apache Tuscany Stock Comet Sample</display-name>
-  <filter>
-    <filter-name>tuscany</filter-name>
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    <async-supported>true</async-supported>
-  </filter>
-  <filter-mapping>
-    <filter-name>tuscany</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-</web-app>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
deleted file mode 100644
index 2309be8533..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/chat-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
- * 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.
--->
-<html>
-	<head>
-		<title>Apache Tuscany Websocket Sample</title>
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script> 
-		<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
-		<script type="text/javascript">
-		var user = "";
-		
-		$(document).ready(function()
-		{
-			$("#chat").hide();
-			$("#username").focus();
-			
-			$("#register").click(function() {
-				register();
-			});
-			
-			$("#username").keyup(function(e) {
-				if(e.keyCode == 13) {
-					register();
-				}
-			});
-			
-			Tuscany.WebsocketComponentContext.ChatComponent.ChatService.register.responseHandler = function(response) {
-				var textarea = document.getElementById('textarea'); 
-				textarea.value += response + "\n";
-				textarea.scrollTop = textarea.scrollHeight; 
-			}
-			
-			function register() {
-				Tuscany.WebsocketComponentContext.ChatComponent.ChatService.register();
-				user = $("#username").val();
-				$("#login").hide();
-				$("#chat").show();
-				$("#message").focus();
-			}
-			
-			$("#send").click(function() {
-				postMessage(user, $("#message").val());
-			});
-			
-			$("#message").keyup(function(e) {
-				if(e.keyCode == 13) {
-					postMessage(user, $("#message").val());
-				}
-			});
-			
-			function postMessage(user, message) {
-				Tuscany.WebsocketComponentContext.ChatComponent.ChatService.postMessage(user, message);
-				$("#message").val("");
-				$("#message").focus();
-			}
-			
-		});
-		</script>
-	</head>
-	<body>
-		<h2>Apache Tuscany Comet Sample</h2>
-		<h3>Chat</h3>
-		<p/>
-		<div id="login">
-		<table>
-			<tr>
-				<td>Nickname</td>
-				<td><input type="text" id='username'/></td>
-				<td><input type="button" id='register' value='Login'/></td>
-			</tr>
-		</table>
-		</div>
-		<div id="chat">
-		<h3>Server notifications</h3>
-		<textarea id="textarea" rows="15" cols="30" readonly></textarea>
-		<table>
-			<tr>
-				<td><input type="text" id='message'/></td>
-				<td><input type="button" id='send' value='Send'/></td>
-			</tr>
-		</table>
-		</div>
-	</body>
-</html>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pom.xml
deleted file mode 100644
index f75d4bc6da..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?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.samples</groupId>
-        <artifactId>tuscany-samples-learning-more</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-samples-binding-websocket</artifactId>
-    <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Sample binding.websocket</name>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>autocomplete-webapp</module>
-                <module>weather-webapp</module>
-                <module>chat-webapp</module>
-		<module>pubsub-webapp</module>
-            </modules>
-        </profile>
-    </profiles>    
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/README b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/README
deleted file mode 100644
index 1ec7d6b807..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/README
+++ /dev/null
@@ -1,93 +0,0 @@
-Tuscany - Learning More - Binding Websocket - PubSub Webapp
------------------------------------------------------------------
-
-This sample demonstrates how Tuscany can expose services via websockets as well
-as how to interact with them using Tuscany's javascript API. It also demonstrates
-how to push multiple responses from the server to the client for a single request
-using SCA callbacks.
-
-This project contains a component that registers browser clients' interest in a 
-certain event type. When an event of that type comes in, it notifies all registered
-clients. The event processor exposes a service via the websocket binding which 
-enables server push to clients. Note that Tuscany 2.x doesn't have any conversational
-support so this has to be handled at application level by passing ids back and forth
-between the client and the server. 
-
-By adding <tuscany:binding.websocket port="8090"/> to a service definition, the 
-Tuscany runtime will start a websocket server listening for requests coming
-in for the exposed service at the specified port. If no port is specified, the
-runtime will use port 9000 as a default.  
-
-The websocket binding uses embedded Jetty instances as websocket servers. At the
-moment, Jetty 8.0.0-M3 is used which has support for the 00, 01, 06 and 07 
-versions of the websocket protocol drafts.
-
-IN ORDER TO RUN THIS SAMPLE SUCCESSFULLY PLEASE CHECK IF YOUR BROWSER SUPPORTS 
-THE ABOVE WEBSOCKET PROTOCOL VERSIONS AND THAT THE WEBSOCKET SUPPORT IS ENABLED.
-
-In order to enable callbacks to push multiple responses, you need to declare the 
-WebsocketBindingCallback in the service definition as follows:
-
-    <interface.java interface="sample.ChatService"
-                    callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback" />
-    <tuscany:binding.websocket />
-    <callback>
-        <tuscany:binding.websocket />
-    </callback>
-    
-The callback object has methods that facilitate sending messages back to the 
-calling client. It can be injected in the service implementation using the @Callback
-annotation. However, the service implementation for this sample has the COMPOSITE
-scope so the callback reference has to be obtained from the ComponentContext.
-
-One requirement that service methods have to meet to enable multiple response 
-support is that they have to be annotated with @OneWay to enable non-blocking 
-support. Without it, methods are treated synchronously sending a single response
-which is the object returned by the method call.  
-
-The websocket binding also features a javascript API to simulate SCA in the 
-browser. In order to use it, the following script has to be included in the
-client page: 
-    <script type="text/javascript" 
-            src="org.apache.tuscany.sca.WebsocketComponentContext.js">
-    </script>
-	
-This will inject proxies for all services defined in the composite that are 
-using binding.websocket. All invocation and connection management is handled
-under the hood so in order to invoke a websocket service, the following should
-be called:
-	Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>(<parameters>);
-
-Given the asynchornous nature of websockets, a function should be defined in
-order to handle responses received for a certain service operation. This should
-be done as follows:
-    Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>.responseHandler = function(response) {
-        // handle response
-    };
-	
-Note that the data exchange is automatically handled by the binding, so parameters 
-will be mapped to the data types defined in the method definition. Also, the response 
-will have the same data type as the server side object used to wrap the response. 
-Objects are passed over the wire in JSON format.
-
-Another detail worth mentioning is that the binding will use a single persistent 
-websocket connection to handle communication between a browser client and all services 
-defined using binding.websocket on the same port. Requests and responses will get
-multiplexed via the same channel and get routed to the appropriate service 
-implementation, respectively javascript function.
-
-In order to run the sample, you can execute "mvn jetty:run" which will start a Jetty
-instance automatically or use "mvn package" and deploy the resulting war to the
-application server of your choice.
-
-Next, point your browser at 
-    http://localhost:8080/sample-binding-websocket-chat-webapp/
-	
-You can now register or unregister for any of a number of events. When an event is fired
-on the server side, the browser client will receive a notification which will be displayed 
-in the page. You can see the persistent websocket connection using the developer tools 
-provided by your browser.
-
-The websocket binding is an experimental binding so community feedback is much 
-appreciated. Feel free to send comments or suggestions on the Apache Tuscany 
-dev mailing list (dev@tuscany.apache.org).
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
deleted file mode 100644
index 8187f56379..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca.samples</groupId>
-		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0.1</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>sample-binding-websocket-pubsub-webapp</artifactId>
-	<packaging>war</packaging>
-	<version>2.0.1</version>
-	<name>Apache Tuscany SCA Sample binding.websocket PubSub Webapp</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0.1</version>
-			<type>pom</type>
-			<scope>compile</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>r09</version>
-			<type>jar</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.26</version>
-			</plugin>
-		</plugins>
-	</build>
-	
-</project>
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java
deleted file mode 100644
index c9d9eb54c4..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Event.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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 sample;
-
-public class Event {
-
-	private String id;
-	private String name;
-	private String data;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getData() {
-		return data;
-	}
-
-	public void setData(String data) {
-		this.data = data;
-	}
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java
deleted file mode 100644
index d289b361cf..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessor.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback;
-import org.apache.tuscany.sca.binding.websocket.runtime.WebsocketStatus;
-import org.oasisopen.sca.ComponentContext;
-import org.oasisopen.sca.annotation.Context;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.Scope;
-import org.oasisopen.sca.annotation.Service;
-
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
-import com.google.common.collect.Multimaps;
-
-@Service({ EventProcessorConsumerService.class, EventProcessorProducerService.class })
-@Scope("COMPOSITE")
-public class EventProcessor implements EventProcessorConsumerService, EventProcessorProducerService {
-
-    @Context
-    protected ComponentContext componentContext;
-
-    private ConcurrentMap<String, WebsocketBindingCallback> clients = new ConcurrentHashMap<String, WebsocketBindingCallback>();
-    private Multimap<String, String> eventListeners = Multimaps.synchronizedMultimap(HashMultimap.<String, String> create());
-
-    @Override
-    public void onEvent(String eventName, String eventData) {
-        List<String> destinations = new ArrayList<String>();
-        synchronized (eventListeners) {
-            destinations.addAll(eventListeners.get(eventName));
-        }
-        Event event = new Event();
-        event.setName(eventName);
-        event.setData(eventData);
-        for (String registrationId : destinations) {
-            WebsocketBindingCallback client = clients.get(registrationId);
-            if (client == null) {
-                // client has unregistered from this event
-                synchronized (eventListeners) {
-                    eventListeners.remove(eventName, registrationId);
-                }
-            } else {
-                WebsocketStatus status = client.sendMessage(event);
-                if (status == WebsocketStatus.CLOSED) {
-                    unregister(registrationId);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void register(String eventName) {
-        String registrationId = UUID.randomUUID().toString();
-        WebsocketBindingCallback callback = componentContext.getRequestContext().getCallback();
-        clients.put(registrationId, callback);
-        synchronized (eventListeners) {
-            eventListeners.put(eventName, registrationId);
-        }
-        Event event = new Event();
-        event.setId(registrationId);
-        event.setName(eventName);
-        event.setData(new Date().toString());
-        callback.sendMessage(event);
-    }
-
-    @Override
-    public void unregister(String registrationId) {
-        clients.remove(registrationId);
-        // unregistration from eventListeners done during onEvent
-    }
-
-    @Destroy
-    public void shutdown() {
-        clients.clear();
-        eventListeners.clear();
-        clients = null;
-        eventListeners = null;
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java
deleted file mode 100644
index aa9156b088..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorConsumerService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-@Callback(WebsocketBindingCallback.class)
-@Remotable
-public interface EventProcessorConsumerService {
-
-    @OneWay
-    void register(String eventName);
-
-    @OneWay
-    void unregister(String registrationId);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java
deleted file mode 100644
index a9c80cc697..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/EventProcessorProducerService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface EventProcessorProducerService {
-
-	void onEvent(String eventName, String eventData);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java
deleted file mode 100644
index 88a214d843..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/java/sample/Producer.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.oasisopen.sca.annotation.Constructor;
-import org.oasisopen.sca.annotation.Destroy;
-import org.oasisopen.sca.annotation.EagerInit;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.Scope;
-
-@EagerInit
-@Scope("COMPOSITE")
-public class Producer {
-
-	@Reference
-	protected EventProcessorProducerService eventProcessor;
-
-	private String eventName;
-	private long frequency;
-
-	private Timer timer = new Timer();
-	private Object lock = new Object();
-
-	@Constructor
-	public Producer(@Property(name = "eventName") String eventName, @Property(name = "frequency") long frequency) {
-		System.out.println("Producer: In Constructor with eventName=" + eventName + " and frequency=" + frequency);
-		this.eventName = eventName;
-		this.frequency = frequency;
-	}
-
-	@Init
-	public void start() {
-		System.out.println("Producer: In Init...");
-		timer.schedule(new TimerTask() {
-
-			@Override
-			public void run() {
-				synchronized (lock) {
-					eventProcessor.onEvent(Producer.this.eventName, "Event @ " + new Date());
-				}
-			}
-		}, 0L, this.frequency);
-	}
-
-	@Destroy
-	public void stop() {
-		synchronized (lock) {
-			timer.cancel();
-		}
-		timer = null;
-	}
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02ef..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 743e2b418e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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="Event">
-
-	<component name="EventProcessorComponent">
-		<implementation.java class="sample.EventProcessor" />
-		<service name="EventProcessorConsumerService">
-			<interface.java interface="sample.EventProcessorConsumerService"
-				callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback" />
-			<tuscany:binding.websocket />
-			<callback>
-				<tuscany:binding.websocket />
-			</callback>
-		</service>
-		<service name="EventProcessorProducerService">
-			<interface.java interface="sample.EventProcessorProducerService" />
-		</service>
-	</component>
-
-	<component name="SLOWProducerComponent">
-		<implementation.java class="sample.Producer" />
-		<reference name="eventProcessor" target="EventProcessorComponent" />
-		<property name="eventName">SLOW</property>
-		<property name="frequency">6000</property>
-	</component>
-	
-	<component name="MODERATEProducerComponent">
-		<implementation.java class="sample.Producer" />
-		<reference name="eventProcessor" target="EventProcessorComponent" />
-		<property name="eventName">MODERATE</property>
-		<property name="frequency">3000</property>
-	</component>
-
-	<component name="FASTProducerComponent">
-		<implementation.java class="sample.Producer" />
-		<reference name="eventProcessor" target="EventProcessorComponent" />
-		<property name="eventName">FAST</property>
-		<property name="frequency">1000</property>
-	</component>
-
-</composite>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 25b06c457a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:j2ee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3.0.xsd" version="3.0">
-  <display-name>Apache Tuscany Stock Comet Sample</display-name>
-  <filter>
-    <filter-name>tuscany</filter-name>
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    <async-supported>true</async-supported>
-  </filter>
-  <filter-mapping>
-    <filter-name>tuscany</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-</web-app>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
deleted file mode 100644
index bfacf28236..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/pubsub-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<!--
- * 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.
--->
-<html>
-<head>
-	<title>Apache Tuscany Websocket Sample</title>
-	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script> 
-	<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
-	<script type="text/javascript">
-		var registrationIds = {};
-		
-		Tuscany.WebsocketComponentContext.EventProcessorComponent.EventProcessorConsumerService.register.responseHandler = function(event) {
-			var text = '';
-			if (event.id != null) {
-				// registration notification
-				registrationIds[event.name] = event.id;
-				text = "Registered to " + event.name + " with id " + event.id + " at " + event.data;
-			} else {
-				// event notification
-				text = event.name + ": " + event.data;
-			}
-			var textarea = $('#textarea'); 
-			$(textarea).val($(textarea).val() + text + "\n");
-			$(textarea).scrollTop($(textarea)[0].scrollHeight); 
-		}
-	
-		$(document).ready(function()
-		{
-			$('#registerEventButton').click(function(event) {
-				var eventName = $('#registerEventName').val();
-				if (registrationIds[eventName] != null) {
-					alert("Already registered for " + eventName + " events");
-				} else {
-					Tuscany.WebsocketComponentContext.EventProcessorComponent.EventProcessorConsumerService.register(eventName);
-				}
-			});
-
-			$('#unregisterEventButton').click(function(event) {
-				var eventName = $('#unregisterEventName').val();
-				if (registrationIds[eventName] != null) {
-					Tuscany.WebsocketComponentContext.EventProcessorComponent.EventProcessorConsumerService.unregister(registrationIds[eventName]);
-					registrationIds[eventName] = null;
-				} else {
-					alert("Not registered for " + eventName + " events");
-				}
-			});
-		});
-		</script>
-</head>
-<body>
-		<h2>Apache Tuscany Websocket Sample</h2>
-		<h3>PubSub for FAST, MODERATE and SLOW events</h3>
-		<p/>
-		<table>
-			<tr>
-				<td>Event name</td>
-				<td>
-					<select id="registerEventName">
-					    <option value="FAST">FAST</option>
-					    <option value="MODERATE">MODERATE</option>
-					    <option value="SLOW">SLOW</option>
-					</select>
-				</td>
-				<td><input type="button" id='registerEventButton' value='Register' /></td>
-			</tr>
-			<tr>
-				<td>Event name</td>
-				<td>
-					<select id="unregisterEventName">
-					    <option value="FAST">FAST</option>
-					    <option value="MODERATE">MODERATE</option>
-					    <option value="SLOW">SLOW</option>
-					</select>
-				</td>
-				<td><input type="button" id='unregisterEventButton' value='Unregister' /></td>
-			</tr>
-		</table>
-		<h3>Server notifications</h3>
-		<textarea id="textarea" rows="15" cols="80" readonly></textarea>
-</body>
-</html>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/README b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/README
deleted file mode 100644
index eb195bc4dc..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/README
+++ /dev/null
@@ -1,89 +0,0 @@
-Tuscany - Learning More - Binding Websocket - Weather Monitor Webapp
------------------------------------------------------------------
-
-This sample demonstrates how Tuscany can expose services via websockets as well
-as how to interact with them using Tuscany's javascript API. It also demonstrates
-how to push multiple responses for a single request using SCA callbacks.
-
-This project contains multiple services that once called will push notifications
-to the client regarding certain weather parameters according to the location of
-the user. Of course, the service implementation is a mock that generates random
-numbers at a fixed interval of time as weather parameters.
-
-By adding <tuscany:binding.websocket port="8090"/> to a service definition, the 
-Tuscany runtime will start a websocket server listening for requests coming
-in for the exposed service at the specified port. If no port is specified, the
-runtime will use port 9000 as a default.  
-
-The websocket binding uses embedded Jetty instances as websocket servers. At the
-moment, Jetty 8.0.0-M3 is used which has support for the 00, 01, 06 and 07 
-versions of the websocket protocol drafts. 
-
-IN ORDER TO RUN THIS SAMPLE SUCCESSFULLY PLEASE CHECK IF YOUR BROWSER SUPPORTS 
-THE ABOVE WEBSOCKET PROTOCOL VERSIONS AND THAT THE WEBSOCKET SUPPORT IS ENABLED.
-
-In order to enable callbacks to push multiple responses, you need to declare the 
-WebsocketBindingCallback in the service definition as follows:
-
-    <interface.java interface="sample.ChatService"
-                    callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback" />
-    <tuscany:binding.websocket />
-    <callback>
-        <tuscany:binding.websocket />
-    </callback>
-    
-The callback object has methods that facilitate sending messages back to the 
-calling client. It can be injected in the service implementation using the @Callback
-annotation.
-
-One requirement that service methods have to meet to enable multiple response 
-support is that they have to be annotated with @OneWay to enable non-blocking 
-support. Without it, methods are treated synchronously sending a single response
-which is the object returned by the method call.  
-
-The websocket binding also features a javascript API to simulate SCA in the 
-browser. In order to use it, the following script has to be included in the
-client page: 
-    <script type="text/javascript" 
-            src="org.apache.tuscany.sca.WebsocketComponentContext.js">
-    </script>
-	
-This will inject proxies for all services defined in the composite that are 
-using binding.websocket. All invocation and connection management is handled
-under the hood so in order to invoke a websocket service, the following should
-be called:
-	Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>(<parameters>);
-
-Given the asynchornous nature of websockets, a function should be defined in
-order to handle responses received for a certain service operation. This should
-be done as follows:
-    Tuscany.WebsocketComponentContext.<component name>.<service name>.<operation name>.responseHandler = function(response) {
-        // handle response
-    };
-	
-Note that the data exchange is automatically handled by the binding, so parameters 
-will be mapped to the data types defined in the method definition. Also, the response 
-will have the same data type as the server side object used to wrap the response. 
-Objects are passed over the wire in JSON format.
-
-Another detail worth mentioning is that the binding will use a single persistent 
-websocket connection to handle communication between a browser client and all services 
-defined using binding.websocket on the same port. Requests and responses will get
-multiplexed via the same channel and get routed to the appropriate service 
-implementation, respectively javascript function.
-
-In order to run the sample, you can execute "mvn jetty:run" which will start a Jetty
-instance automatically or use "mvn package" and deploy the resulting war to the
-application server of your choice.
-
-Next, point your browser at 
-    http://localhost:8080/sample-binding-websocket-weather-webapp/
-	
-You can now set a location and register for various weather parameters. Notifications 
-will be pushed to the browser when weather parameters change. You can see the persistent 
-websocket connection handling all the communication using the developer tools provided 
-by your browser.
-
-The websocket binding is an experimental binding so community feedback is much 
-appreciated. Feel free to send comments or suggestions on the Apache Tuscany 
-dev mailing list (dev@tuscany.apache.org).
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/pom.xml
deleted file mode 100644
index 811f7b6283..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<groupId>org.apache.tuscany.sca.samples</groupId>
-		<artifactId>tuscany-samples-binding-websocket</artifactId>
-		<version>2.0.1</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
-	<artifactId>sample-binding-websocket-weather-webapp</artifactId>
-	<packaging>war</packaging>
-	<version>2.0.1</version>
-	<name>Apache Tuscany SCA Sample binding.websocket Weather Monitor Webapp</name>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-binding-websocket</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-base-runtime-pom</artifactId>
-			<version>2.0.1</version>
-			<type>pom</type>
-			<scope>compile</scope>
-		</dependency>
-	</dependencies>
-	
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.mortbay.jetty</groupId>
-				<artifactId>maven-jetty-plugin</artifactId>
-				<version>6.1.26</version>
-			</plugin>
-		</plugins>
-	</build>
-	
-</project>
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java
deleted file mode 100644
index 10b46cc55f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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 sample;
-
-import java.util.Date;
-import java.util.Random;
-
-public final class Helper {
-
-    public static int randomInt(final int max) {
-        return (new Random(new Date().getTime()).nextInt(100));
-    }
-
-    private Helper() {
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java
deleted file mode 100644
index 7b38a098ac..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-import sample.model.Location;
-
-@Remotable
-@Callback(WebsocketBindingCallback.class)
-public interface HumidityService {
-
-	@OneWay
-	void getHumidity(Location location);
-
-}
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java
deleted file mode 100644
index 14fcdfd8b3..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-import sample.model.Location;
-
-@Remotable
-@Callback(WebsocketBindingCallback.class)
-public interface PrecipitationService {
-
-	@OneWay
-	void getPrecipitation(Location location);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java
deleted file mode 100644
index 5d9575686b..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-import sample.model.Location;
-import sample.model.Response;
-
-@Service(PrecipitationService.class)
-public class PrecipitationServiceImpl implements PrecipitationService {
-
-    @Callback
-    protected WebsocketBindingCallback client;
-
-    @Override
-    public void getPrecipitation(final Location location) {
-        new Timer().scheduleAtFixedRate(new TimerTask() {
-
-            @Override
-            public void run() {
-                Response response = new Response();
-                response.setDate(new Date());
-                response.setData(Helper.randomInt(100) + "%");
-                WebsocketStatus status = client.sendMessage(response);
-                if (status == WebsocketStatus.CLOSED) {
-                    System.out.println("Client disconnected from PrecipitationService.");
-                    this.cancel();
-                }
-            }
-        }, 0L, 1000L);
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java
deleted file mode 100644
index e505167b3c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-import sample.model.Location;
-import sample.model.Response;
-
-@Service({ TemperatureService.class, HumidityService.class })
-public class TemperatureHumidityServiceImpl implements TemperatureService, HumidityService {
-
-    @Callback
-    protected WebsocketBindingCallback callback;
-
-    @Override
-    public void getHumidity(final Location location) {
-        new Timer().scheduleAtFixedRate(new TimerTask() {
-
-            @Override
-            public void run() {
-                final Response response = new Response();
-                response.setDate(new Date());
-                response.setData(Helper.randomInt(90) + "%");
-                WebsocketStatus status = callback.sendMessage(response);
-                if (status == WebsocketStatus.CLOSED) {
-                    System.out.println("Client disconnected from HumidityService.");
-                    this.cancel();
-                }
-            }
-        }, 0L, 5000L);
-    }
-
-    @Override
-    public void getTemperature(final Location location) {
-        new Timer().scheduleAtFixedRate(new TimerTask() {
-
-            @Override
-            public void run() {
-                final Response response = new Response();
-                response.setDate(new Date());
-                final String data = "" + Helper.randomInt(40);
-                response.setData(data);
-                WebsocketStatus status = callback.sendMessage(response);
-                if (status == WebsocketStatus.CLOSED) {
-                    System.out.println("Client disconnected from TemperatureService.");
-                    this.cancel();
-                }
-            }
-        }, 0L, 3000L);
-    }
-
-}
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java
deleted file mode 100644
index 67318c67c7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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 sample;
-
-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;
-
-import sample.model.Location;
-
-@Remotable
-@Callback(WebsocketBindingCallback.class)
-public interface TemperatureService {
-
-    @OneWay
-    void getTemperature(Location location);
-
-}
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java
deleted file mode 100644
index 67edc140f9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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 sample.model;
-
-public class Location {
-
-    private String city;
-    private String country;
-
-    public String getCity() {
-        return this.city;
-    }
-
-    public void setCity(final String city) {
-        this.city = city;
-    }
-
-    public String getCountry() {
-        return this.country;
-    }
-
-    public void setCountry(final String country) {
-        this.country = country;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java
deleted file mode 100644
index 462af6d8ab..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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 sample.model;
-
-import java.util.Date;
-
-public class Response {
-
-    private Date date;
-    private String data;
-
-    public Date getDate() {
-        return this.date;
-    }
-
-    public void setDate(final Date date) {
-        this.date = date;
-    }
-
-    public String getData() {
-        return this.data;
-    }
-
-    public void setData(final String data) {
-        this.data = data;
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
deleted file mode 100644
index 58630c02ef..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index edf53fa76c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,57 +0,0 @@
-<?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="Weather">
-
-	<component name="c1">
-		<implementation.java class="sample.TemperatureHumidityServiceImpl"/>
-		<service name="TemperatureService">
-			<interface.java interface="sample.TemperatureService"
-				callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback"/>
-			<tuscany:binding.websocket/>
-			<callback>
-				<tuscany:binding.websocket/>
-			</callback>
-		</service>
-		<service name="HumidityService">
-			<interface.java interface="sample.HumidityService"
-				callbackInterface="org.apache.tuscany.sca.binding.websocket.runtime.WebsocketBindingCallback"/>
-			<tuscany:binding.websocket/>
-			<callback>
-				<tuscany:binding.websocket/>
-			</callback>
-		</service>
-	</component>
-
-	<component name="c2">
-		<implementation.java class="sample.PrecipitationServiceImpl"/>
-		<service name="PrecipitationService">
-			<interface.java interface="sample.PrecipitationService" 
-				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/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 25b06c457a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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.
--->
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:j2ee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3.0.xsd" version="3.0">
-  <display-name>Apache Tuscany Stock Comet Sample</display-name>
-  <filter>
-    <filter-name>tuscany</filter-name>
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
-    <async-supported>true</async-supported>
-  </filter>
-  <filter-mapping>
-    <filter-name>tuscany</filter-name>
-    <url-pattern>/*</url-pattern>
-  </filter-mapping>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
-</web-app>
-\ No newline at end of file
diff --git a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
deleted file mode 100644
index 5d5ae2c1ca..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,114 +0,0 @@
-<!--
- * 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.
--->
-<html>
-	<head>
-		<title>Apache Tuscany Websocket Sample</title>
-		<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.1/jquery.min.js" type="text/javascript"></script> 
-		<script type="text/javascript" src="org.apache.tuscany.sca.WebsocketComponentContext.js"></script>
-		<script type="text/javascript">
-		$(document).ready(function(){
-			var location = {};
-			location.city = null;
-			location.country = null;
-
-			$('#tempButton').attr('disabled', 'disabled');
-			$('#humButton').attr('disabled', 'disabled');
-			$('#precipButton').attr('disabled', 'disabled');
-
-			$('#locationButton').click(function(event) {
-				location.city = $('#city').val();
-				location.country = $('#country').val();
-				$('#locationButton').attr('disabled', 'disabled');
-				$('#tempButton').removeAttr('disabled');
-				$('#humButton').removeAttr('disabled');
-				$('#precipButton').removeAttr('disabled');
-			});
-
-			$('#tempButton').click(function(event) {
-				Tuscany.WebsocketComponentContext.c1.TemperatureService.getTemperature(location);
-				$('#tempButton').attr('disabled', 'disabled');
-			});
-			
-			Tuscany.WebsocketComponentContext.c1.TemperatureService.getTemperature.responseHandler = function(response) {
-				$('#tempText').text(response.data);
-				$('#tempDate').text(response.date);
-			}
-
-			$('#humButton').click(function(event) {
-				Tuscany.WebsocketComponentContext.c1.HumidityService.getHumidity(location);
-				$('#humButton').attr('disabled', 'disabled');
-			});
-			
-			Tuscany.WebsocketComponentContext.c1.HumidityService.getHumidity.responseHandler = function(response) {
-				$('#humText').text(response.data);
-				$('#humDate').text(response.date);
-			}
-
-			$('#precipButton').click(function(event) {
-				Tuscany.WebsocketComponentContext.c2.PrecipitationService.getPrecipitation(location);
-				$('#precipButton').attr('disabled', 'disabled');
-			});
-			
-			Tuscany.WebsocketComponentContext.c2.PrecipitationService.getPrecipitation.responseHandler = function(response) {
-				$('#precipText').text(response.data);
-				$('#precipDate').text(response.date);
-			}
-		});
-		</script>
-	</head>
-	<body>
-		<div id='sidebar'>
-		<h2>Apache Tuscany Weather Sample</h2>
-		<h3>Weather Monitor</h3>
-		<p/>
-		<table>
-			<tr>
-				<td>City</td>
-				<td><input type="text" id='city' value='Brasov'/></td>
-			</tr>
-			<tr>
-				<td>Country</td>
-				<td><input type="text" id ='country' value='Romania'/></td>
-			</tr>
-		</table>
-		<input type="button" id='locationButton' value='Set location'/>
-		<p/>
-		<table>
-			<tr>
-				<th align="left">Temperature:</th>
-				<td><span id='tempText'>N/A</span></td>
-				<td><input type='button' id='tempButton' value="Update"/></td>
-				<td><span id='tempDate'></span>
-			</tr>
-			<tr>
-				<th align="left">Humidity:</th>
-				<td><span id='humText'>N/A</span></td>
-				<td><input type='button' id='humButton' value="Update"/></td>
-				<td><span id='humDate'></span>
-			</tr>
-			<tr>
-				<th align="left">Precipitation probability:</th>
-				<td><span id='precipText'>N/A</span></td>
-				<td><input type='button' id='precipButton' value="Update"/></td>
-				<td><span id='precipDate'></span>
-			</tr>
-		</table>
-		</div>
-	</body>
-</html>
author	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2013-10-07 22:23:21 +0000
committer	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2013-10-07 22:23:21 +0000
commit	5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 (patch)
tree	018d3d8c637e265b8292d34e5f7c11ca8ce11b7d /sca-java-2.x/tags/2.0.1-RC1/samples/learning-more/binding-websocket
parent	132aa8a77685ec92bc90c03f987650d275a7b639 (diff)