You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by fm...@apache.org on 2010/08/02 22:27:47 UTC

svn commit: r981678 - in /tuscany/sca-java-2.x/contrib/samples/stock-comet: ./ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/tuscany/ src/main/java/org/apache/tuscany/sca/ src/main/java/org/apache/tuscany/sca/sample/ src/main/ja...

Author: fmoga
Date: Mon Aug  2 20:27:46 2010
New Revision: 981678

URL: http://svn.apache.org/viewvc?rev=981678&view=rev
Log:
Updated the stock sample to use the comet binding implementation.

Added:
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/
      - copied from r979743, tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/sample/
Removed:
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/CometServlet.java
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/ScriptFilter.java
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/sample/
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/context.xml
Modified:
    tuscany/sca-java-2.x/contrib/samples/stock-comet/pom.xml
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockService.java
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockServiceImpl.java
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml
    tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html

Modified: tuscany/sca-java-2.x/contrib/samples/stock-comet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/stock-comet/pom.xml?rev=981678&r1=981677&r2=981678&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/samples/stock-comet/pom.xml (original)
+++ tuscany/sca-java-2.x/contrib/samples/stock-comet/pom.xml Mon Aug  2 20:27:46 2010
@@ -50,6 +50,20 @@
 			<version>6.0</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-comet</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.tuscany.sca</groupId>
+			<artifactId>tuscany-binding-comet-runtime</artifactId>
+			<version>2.0-SNAPSHOT</version>
+			<type>jar</type>
+			<scope>compile</scope>
+		</dependency>
 	</dependencies>
 	
 	<build>

Modified: tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockService.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockService.java?rev=981678&r1=979743&r2=981678&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockService.java (original)
+++ tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockService.java Mon Aug  2 20:27:46 2010
@@ -16,12 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package sample;
+package org.apache.tuscany.sca.sample.comet;
 
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
 public interface StockService {
     
-    String getSymbol();
+    String getQuotes();
 
-    Double getValue();
-    
 }

Modified: tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockServiceImpl.java?rev=981678&r1=979743&r2=981678&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockServiceImpl.java (original)
+++ tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/java/org/apache/tuscany/sca/sample/comet/StockServiceImpl.java Mon Aug  2 20:27:46 2010
@@ -16,26 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package sample;
+package org.apache.tuscany.sca.sample.comet;
 
 import java.text.DecimalFormat;
 import java.util.Date;
 import java.util.Random;
 
+import org.oasisopen.sca.annotation.Service;
+
+@Service(StockService.class)
 public class StockServiceImpl implements StockService {
 
     public static final int MAX_VALUE = 1000;
     private Random random = new Random(new Date().getTime());
 
     @Override
-    public String getSymbol() {
-        return "ASF";
-    }
-
-    @Override
-    public Double getValue() {
+    public String getQuotes() {
         Double value = Math.abs(random.nextDouble() * random.nextInt(MAX_VALUE));
-        return Double.valueOf(new DecimalFormat("#.##").format(value));
+        return "ASF" + "#" + Double.valueOf(new DecimalFormat("#.##").format(value));
     }
-
+    
 }

Modified: tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite?rev=981678&r1=981677&r2=981678&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite (original)
+++ tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.composite Mon Aug  2 20:27:46 2010
@@ -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

Modified: tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml?rev=981678&r1=981677&r2=981678&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml (original)
+++ tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/WEB-INF/web.xml Mon Aug  2 20:27:46 2010
@@ -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>

Modified: tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html?rev=981678&r1=981677&r2=981678&view=diff
==============================================================================
--- tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html (original)
+++ tuscany/sca-java-2.x/contrib/samples/stock-comet/src/main/webapp/index.html Mon Aug  2 20:27:46 2010
@@ -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>