Updated the stock sample to use the comet binding implementation.

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

4 files changed, 24 insertions, 49 deletions

diff --git a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/context.xml b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/context.xml
deleted file mode 100755
index 80763de382..0000000000
--- a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/context.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Context>
-    <Loader delegate="true"/>
-</Context>
diff --git a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite
index 47ab8557ea..5a1d2bb21b 100644
--- a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite
+++ b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite
@@ -22,12 +22,12 @@
            targetNamespace="http://samples"
            name="Stock">
 
-    <component name="StockServlet">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="StockService"/>
-    </component>
-
-    <component name="StockService">
-        <implementation.java class="sample.StockServiceImpl"/>
-    </component>
-</composite>
+	<component name="test">
+		<implementation.java class="org.apache.tuscany.sca.sample.comet.StockServiceImpl"/>
+		<service name="StockService">
+			<interface.java interface="org.apache.tuscany.sca.sample.comet.StockService"/>
+			<tuscany:binding.comet/>
+		</service>
+	</component>
+	
+</composite>
\ No newline at end of file
diff --git a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml
index 4a534c043d..66c2ee4480 100644
--- a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml
+++ b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml
@@ -28,38 +28,8 @@
 	<listener>
 		<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
 	</listener>
-	
-	<servlet>
-        <description>CometServlet</description>
-        <servlet-name>CometServlet</servlet-name>
-        <servlet-class>org.atmosphere.cpr.MeteorServlet</servlet-class>
-        <async-supported>true</async-supported>
-        <init-param>
-            <param-name>org.atmosphere.servlet</param-name>
-            <param-value>sample.CometServlet</param-value>
-        </init-param>
-        <init-param>
-        	<param-name>org.apache.tuscany.comet.scope</param-name>
-        	<param-value>request</param-value>
-        	<!-- <param-value>application</param-value> -->
-        	<!-- <param-value>vm</param-value> -->
-        </init-param>
-        <!-- 
-        <init-param>
-        	<param-name>org.apache.tuscany.comet.transport</param-name>
-        	<param-value>http-streaming</param-value>
-        	<param-value>long-pooling</param-value>
-        	<param-value>websocket</param-value>
-        </init-param>
-         -->
-        <load-on-startup>0</load-on-startup>
-    </servlet>
-    <servlet-mapping>
-        <servlet-name>CometServlet</servlet-name>
-        <url-pattern>/comet</url-pattern>
-    </servlet-mapping>
 
-	<welcome-file-list id="WelcomeFileList">
+	<welcome-file-list>	
 		<welcome-file>index.html</welcome-file>
 	</welcome-file-list>
 </web-app>
diff --git a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html
index 3ae0ac1ae8..e03a08ccd2 100644
--- a/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html
+++ b/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html
@@ -27,24 +27,33 @@
 				document.getElementById('price').textContent = aux[1];
 			}
 	
-			function startMonitoring() {
-				new Ajax.Request('/stock-comet/comet',
+			function getQuotes() {
+				new Ajax.Request('test/StockService/getQuotes',
 					{
-						method: 'post',
+						onSuccess: function(response) {
+							alert("onSuccess");
+						},
+						onError: function(response) {
+							alert("onError");
+						}
 					});
 			}
+			
+		    Event.observe(document, 'DOMContentLoaded', function(e) {
+				$('comet').src='test/StockService/getQuotes';
+		    });
 		</script>
 	</head>
 	<body>
 		<h2>Apache Tuscany Asynchronous Servlet Sample</h2>
 		<h3>Stock Monitor</h3>
-		<button type="button" onclick="startMonitoring()">Get values</button>
+		<button type="button" onclick="getQuotes()">Get values</button>
 		<div id='text'>
 			<b><label>Company Symbol: </label></b>
 			<span id="symbol">N/A</span>
 			<b><label>Price: </label></b>
 			<span id="price">N/A</span>
 		</div>
-		<iframe style="display:none" src="/stock-comet/comet"></iframe>
+		<iframe id='comet' style="display:none"></iframe>
 	</body>
 </html>