Rename beta3 tag to final name

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

14 files changed, 0 insertions, 720 deletions

diff --git a/sca-java-2.x/tags/2.0-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/README b/sca-java-2.x/tags/2.0-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/README
deleted file mode 100644
index eb195bc4dc..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/pom.xml b/sca-java-2.x/tags/2.0-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/pom.xml
deleted file mode 100644
index cbbe851aef..0000000000
--- a/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3</version>

-		<relativePath>../pom.xml</relativePath>

-	</parent>

-

-	<artifactId>sample-binding-websocket-weather-webapp</artifactId>

-	<packaging>war</packaging>

-	<version>2.0-Beta3</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-Beta3</version>

-		</dependency>

-		<dependency>

-			<groupId>org.apache.tuscany.sca</groupId>

-			<artifactId>tuscany-base-runtime-pom</artifactId>

-			<version>2.0-Beta3</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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/Helper.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/HumidityService.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationService.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/PrecipitationServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureHumidityServiceImpl.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/TemperatureService.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Location.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/java/sample/model/Response.java b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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-Beta3-RC2/samples/learning-more/binding-websocket/weather-webapp/src/main/webapp/index.html b/sca-java-2.x/tags/2.0-Beta3-RC2/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-Beta3-RC2/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>