You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/06/19 10:36:49 UTC

svn commit: r548651 - in /incubator/tuscany/java/sca/demos/bigbank-account: ./ src/main/resources/ src/main/resources/web/ src/main/webapp/

Author: jsdelfino
Date: Tue Jun 19 01:36:49 2007
New Revision: 548651

URL: http://svn.apache.org/viewvc?view=rev&rev=548651
Log:
Changed the Bigbank demo to use the new implementation.resource component, allowing it to run with an embedded Tomcat or Jetty.

Added:
    incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/   (with props)
    incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html   (with props)
    incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/style.css
Removed:
    incubator/tuscany/java/sca/demos/bigbank-account/src/main/webapp/
Modified:
    incubator/tuscany/java/sca/demos/bigbank-account/build.xml
    incubator/tuscany/java/sca/demos/bigbank-account/pom.xml
    incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/   (props changed)
    incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite

Modified: incubator/tuscany/java/sca/demos/bigbank-account/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/build.xml?view=diff&rev=548651&r1=548650&r2=548651
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/build.xml (original)
+++ incubator/tuscany/java/sca/demos/bigbank-account/build.xml Tue Jun 19 01:36:49 2007
@@ -22,7 +22,7 @@
 
     <property name="dojo.version" value="0.4.0"/>
     <property name="dojo.distro" value="ajax"/>
-    <property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
+    <property name="unpack.location" value="${basedir}/src/main/resources/dojo"/>
 	
 
     <target name="check-dojo-installed">

Modified: incubator/tuscany/java/sca/demos/bigbank-account/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/pom.xml?view=diff&rev=548651&r1=548650&r2=548651
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/pom.xml (original)
+++ incubator/tuscany/java/sca/demos/bigbank-account/pom.xml Tue Jun 19 01:36:49 2007
@@ -26,7 +26,7 @@
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <artifactId>demo-bigbank-account</artifactId>
-    <packaging>war</packaging>
+    <packaging>jar</packaging>
     <name>Apache Tuscany BigBank Account Demo</name>
 
     <repositories>
@@ -39,12 +39,6 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.0-incubating-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-host-embedded</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
         </dependency>
@@ -73,6 +67,20 @@
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-binding-rmi</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>

Propchange: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 19 01:36:49 2007
@@ -0,0 +1 @@
+dojo

Modified: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite?view=diff&rev=548651&r1=548650&r2=548651
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite (original)
+++ incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/BigBank.composite Tue Jun 19 01:36:49 2007
@@ -24,6 +24,13 @@
         <implementation.composite name="bb:AccountData"/>
     </component>
 
+    <component name="WebResourceComponent">
+    	<service name="Resource">
+    		<binding.resource uri="/"/>
+    	</service>
+        <implementation.resource location="web"/>
+    </component>
+
     <reference name="CalculatorReference" promote="AccountServiceComponent/calculatorService">
     	<binding.rmi host="localhost" port="8099" serviceName="CalculatorRMIService"/>
    	</reference> 

Propchange: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Jun 19 01:36:49 2007
@@ -0,0 +1 @@
+dojo

Added: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html?view=auto&rev=548651
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html (added)
+++ incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html Tue Jun 19 01:36:49 2007
@@ -0,0 +1,87 @@
+<html>
+<!--
+ * 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.    
+ -->
+  <head>
+    <title>Tuscany JSON-RPC BigBank Client</TITLE>
+    
+    <script type="text/javascript">
+        var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
+        //djConfig.debugAtAllCosts = true;
+    </script>
+
+    <script type="text/javascript" src="dojo/dojo.js"> 
+    </script>
+
+    <script type="text/javascript">
+    	dojo.require("dojo.widget.*");
+    	dojo.require("dojo.widget.Button");
+    	dojo.require("dojo.rpc.JsonService");    	
+    </script>
+    
+    <link rel="stylesheet" type="text/css" href="style.css" />
+  </head>
+
+  <body>
+
+    <table>
+      <tr>
+        <th colspan="2">Tuscany JSON-RPC BigBank Client</th>
+      </tr>
+      <tr>
+        <td colspan="2">
+           <p>This example uses the <a href="http://dojotoolkit.org/">Dojo Toolkit</a>
+           to create a JavaScript object <code>accountService</code> for the service at
+           <b>SCADomain/AccountJSONService</b>
+           using <a href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's RPC classes</a>
+           and providing them with <a href="SCADomain/AccountJSONService?smd">SCADomain/AccountJSONService?smd</a>
+           for <a href="http://dojo.jot.com/SMD">Simple Method Description (SMD)</a> input.</p>
+           <p>It then creates a Dojo button that will envoke the <code>getAccountReport</code> method of the <code>accountService</code> object.</p>
+      </tr>
+      <tr>
+        <td>Request</td>
+        <td>Response</td>
+      </tr>
+      <tr>
+        <td>
+            <br><div id="myaccount" dojoType="Button" onClick='accountService.getAccountReport("Dojo1234").addCallback(contentCallBack);'>getAccountReport("Dojo1234")</div><br>
+        </td>
+        <td>           
+            <div id="ReturnedContent">None Yet.</div>
+        </td>
+      </tr>      
+      <tr>
+        <td colspan="2">
+           <div id="dojoDebug">Dojo Debug:</div>
+        </td>
+      </tr>
+    </table>    
+    
+    <script type="text/javascript">
+    
+    	function contentCallBack(result) {
+    		var handlerNode = document.getElementById("ReturnedContent");
+    		handlerNode.innerHTML = "<p>" + result + "</p>" ;
+    	}
+    
+    	var accountService = new dojo.rpc.JsonService("SCADomain/AccountJSONService?smd");
+    
+    </script>
+       
+  </body>
+</html>

Propchange: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/style.css
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/style.css?view=auto&rev=548651
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/style.css (added)
+++ incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/style.css Tue Jun 19 01:36:49 2007
@@ -0,0 +1,4 @@
+* { font-family: arial; }
+
+table, th, td { border: 2px solid blue; border-collapse: collapse; }
+th { color: white; background-color: blue; }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org