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/09/01 08:31:20 UTC
svn commit: r571713 - in /incubator/tuscany/java/sca/samples: ./
calculator-webapp-ws/ calculator-ws-webapp/
calculator-ws-webapp/src/main/resources/
calculator-ws-webapp/src/main/resources/wsdl/
calculator-ws-webapp/src/main/webapp/WEB-INF/ helloworld...
Author: jsdelfino
Date: Fri Aug 31 23:31:19 2007
New Revision: 571713
URL: http://svn.apache.org/viewvc?rev=571713&view=rev
Log:
Renamed webapp samples to *-webapp
Added:
incubator/tuscany/java/sca/samples/calculator-ws-webapp/
- copied from r570885, incubator/tuscany/java/sca/samples/calculator-webapp-ws/
incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml
- copied, changed from r571650, incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml
incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite
- copied, changed from r571650, incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite
incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/webapp/WEB-INF/web.xml
- copied unchanged from r571650, incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/
- copied from r570885, incubator/tuscany/java/sca/samples/helloworld-dojo/
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/
- copied from r570885, incubator/tuscany/java/sca/samples/helloworld-jsonrpc/
Removed:
incubator/tuscany/java/sca/samples/calculator-webapp-ws/
incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/resources/wsdl/
incubator/tuscany/java/sca/samples/helloworld-dojo/
incubator/tuscany/java/sca/samples/helloworld-jsonrpc/
Modified:
incubator/tuscany/java/sca/samples/README
incubator/tuscany/java/sca/samples/calculator-ws-webapp/README
incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml
incubator/tuscany/java/sca/samples/calculator-ws-webapp/calculator-web.svg
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/README
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/README
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/build.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
incubator/tuscany/java/sca/samples/pom.xml
Modified: incubator/tuscany/java/sca/samples/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/README?rev=571713&r1=571712&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/README (original)
+++ incubator/tuscany/java/sca/samples/README Fri Aug 31 23:31:19 2007
@@ -40,9 +40,9 @@
calculator-rmi-service sample
calculator-rmi-service - The calculator configured to accept RMI requests
from calculator-rmi-reference
-helloworld-jsonrpc - An SCA application that exposes a service using
+helloworld-jsonrpc-webapp - An SCA application that exposes a service using
JSONRPC
-helloworld-dojo - An SCA application that exposes a service using
+helloworld-dojo-webapp - An SCA application that exposes a service using
JSONRPC and a client using the Dojo toolkit
simple-callback - An SCA application with two components demonstrating
the callback interface
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/README?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/README (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/README Fri Aug 31 23:31:19 2007
@@ -17,7 +17,7 @@
Once the web app is deployed use your browser to visit the following URL;
-http://localhost:8085/sample-calculator-webapp-ws/calc.jsp
+http://localhost:8085/sample-calculator-ws-webapp/calc.jsp
The port and hostname will of course vary depending on your local installation.
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/build.xml Fri Aug 31 23:31:19 2007
@@ -40,7 +40,7 @@
</target>
<target name="package" depends="compile">
- <war destfile="target/sample-calculator-webapp-ws.war"
+ <war destfile="target/sample-calculator-ws-webapp.war"
webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
<zipfileset dir="../../modules" prefix="WEB-INF/lib">
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/calculator-web.svg
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/calculator-web.svg?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/calculator-web.svg (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/calculator-web.svg Fri Aug 31 23:31:19 2007
@@ -31,10 +31,10 @@
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.45.1"
- sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\calculator-webapp-ws"
+ sodipodi:docbase="C:\simon\tuscany\java-head\sca\samples\calculator-ws-webapp"
sodipodi:docname="calculator-web.svg"
version="1.0"
- inkscape:export-filename="C:\simon\Tuscany\java-head\sca\samples\calculator-webapp-ws\calculator-web.png"
+ inkscape:export-filename="C:\simon\Tuscany\java-head\sca\samples\calculator-ws-webapp\calculator-web.png"
inkscape:export-xdpi="52.84"
inkscape:export-ydpi="52.84"
inkscape:output_extension="org.inkscape.output.svg.inkscape">
Copied: incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml (from r571650, incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml?p2=incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml&p1=incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml&r1=571650&r2=571713&rev=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp-ws/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml Fri Aug 31 23:31:19 2007
@@ -25,7 +25,7 @@
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-calculator-webapp-ws</artifactId>
+ <artifactId>sample-calculator-ws-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany Calculator Sample WebApp With WebServices</name>
Copied: incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite (from r571650, incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite)
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite?p2=incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite&p1=incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite&r1=571650&r2=571713&rev=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp-ws/src/main/resources/Calculator.composite (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/src/main/resources/Calculator.composite Fri Aug 31 23:31:19 2007
@@ -26,7 +26,7 @@
<implementation.java class="calculator.CalculatorServiceImpl"/>
<reference name="addService" >
<interface.java interface="calculator.AddService" />
- <binding.ws uri="http://localhost:8080/sample-calculator-webapp-ws/AddServiceComponent"/>
+ <binding.ws uri="http://localhost:8080/sample-calculator-ws-webapp/AddServiceComponent"/>
</reference>
<reference name="subtractService" target="SubtractServiceComponent"></reference>
<reference name="multiplyService" target="MultiplyServiceComponent"></reference>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/README?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/README (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/README Fri Aug 31 23:31:19 2007
@@ -9,16 +9,16 @@
As this sample provides a web app there is a manual step where the WAR file
that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-helloworld-dojo.war)
+to give this sample a go deploy the WAR file (target/sample-helloworld-dojo-webapp.war)
to you web application server.
Once the web app is deployed use your browser to visit the following URL;
-http://localhost:8080/sample-helloworld-dojo
+http://localhost:8080/sample-helloworld-dojo-webapp
The port and hostname will of course vary depending on your local installation.
-See also the similar helloworld-jsonrpc sample which also uses the SCA JSONRPC binding
+See also the similar helloworld-jsonrpc-webapp sample which also uses the SCA JSONRPC binding
but uses SCA scaDomain.js script on the client instead of the Dojo Toolkit.
Sample Overview
@@ -30,7 +30,7 @@
The web app provided shows how the service can be called by using the DOJO toolkit.
-helloworld-dojo/
+helloworld-dojo-webapp/
build-dojo.xml - This file is an Ant script used by the
sample build process to download the Dojo Toolkit
and get it included in the WAR file
@@ -55,7 +55,7 @@
SCA service via JSONRPC
style.css - style sheet
- helloworld-jsonrpc.png - a pictorial representation of the
+ helloworld-jsonrpc-webapp.png - a pictorial representation of the
sample .composite file
build.xml - the Ant build file that unpacks the
dojo installation
@@ -66,10 +66,10 @@
With the binary distribution the sample can be built using Ant as
follows
-cd helloworld-dojo
+cd helloworld-dojo-webapp
ant package
-This should result in a war file (sample-helloworld-dojo.war) in the target
+This should result in a war file (sample-helloworld-dojo-webapp.war) in the target
directory. Copy this war file to your web app deployment directory in your
web app container.
@@ -79,7 +79,7 @@
Once the web app is deployed use your browser to visit the following URL;
-http://localhost:8080/sample-helloworld-dojo
+http://localhost:8080/sample-helloworld-dojo-webapp
The port and hostname will of course vary depending on your local installation.
@@ -91,10 +91,10 @@
With either the binary or source distributions the sample can be built and run
using Maven as follows.
-cd helloworld-dojo
+cd helloworld-dojo-webapp
mvn
-Again this should result in a war file (sample-helloworld-dojo.war) in the target
+Again this should result in a war file (sample-helloworld-dojo-webapp.war) in the target
directory. Follow the steps described in the previous section for running the web
app and for the expected results.
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build-dojo.xml Fri Aug 31 23:31:19 2007
@@ -20,14 +20,13 @@
<project name="DojoZipInstaller">
- <property name="dojo.version" value="0.4.0"/>
- <property name="dojo.distro" value="ajax"/>
+ <property name="dojo.version" value="0.9.0"/>
<property name="unpack.location" value="${basedir}/src/main/webapp/dojo"/>
<target name="check-dojo-installed">
<condition property="already.installed" >
- <available file="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
+ <available file="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
</condition>
<condition property="maven.suffix" value="">
<os family="unix"/>
@@ -46,39 +45,41 @@
<target name="install-dojo" depends="check-dojo-installed" unless="already.installed">
<mkdir dir="${basedir}/target/dojo-download/"/>
- <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}-${dojo.distro}.zip"
- dest="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
+ <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
+ dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
verbose="true"
usetimestamp="true"/>
<exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
- <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo-${dojo.distro} -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"/>
+ <arg line="install:install-file -DgroupId=dojo -DartifactId=dojo -Dversion=${dojo.version} -Dpackaging=zip -DgeneratePom=true -Dfile=${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"/>
</exec>
</target>
<target name="install-dojo-nomaven" depends="check-dojo-installed" unless="already.installed">
<mkdir dir="${basedir}/target/dojo-download/"/>
- <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-${dojo.version}-${dojo.distro}.zip"
- dest="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
+ <get src="http://download.dojotoolkit.org/release-${dojo.version}/dojo-release-${dojo.version}.zip"
+ dest="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
verbose="true"
usetimestamp="true"/>
- <copy file="${basedir}/target/dojo-download/dojo-${dojo.version}-${dojo.distro}.zip"
- tofile="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"/>
+ <copy file="${basedir}/target/dojo-download/dojo-release-${dojo.version}.zip"
+ tofile="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"/>
</target>
<target name="unpack-dojo-files" depends="check-dojo-installed, check-dojo-unpacked" unless="already.unpacked">
<fail message="dojo zip file not installed in local repository: ${localRepository}" unless="already.installed"/>
<mkdir dir="${basedir}/target/dojo-unpack-temp/"/>
- <unzip src="${localRepository}/dojo/dojo-${dojo.distro}/${dojo.version}/dojo-${dojo.distro}-${dojo.version}.zip"
+ <unzip src="${localRepository}/dojo/dojo/${dojo.version}/dojo-${dojo.version}.zip"
dest="${basedir}/target/dojo-unpack-temp/"
overwrite="false">
<patternset>
- <include name="dojo-${dojo.version}-${dojo.distro}/**"/>
- <exclude name="dojo-${dojo.version}-${dojo.distro}/demos/**"/>
- <exclude name="dojo-${dojo.version}-${dojo.distro}/tests/**"/>
+ <include name="dojo-release-${dojo.version}/dojo/**"/>
+ <exclude name="dojo-release-${dojo.version}/dojo/tests/**"/>
+ <include name="dojo-release-${dojo.version}/dijit/**"/>
+ <exclude name="dojo-release-${dojo.version}/dojox/**"/>
+ <exclude name="dojo-release-${dojo.version}/util/**"/>
</patternset>
</unzip>
- <move file="${basedir}/target/dojo-unpack-temp/dojo-${dojo.version}-${dojo.distro}"
+ <move file="${basedir}/target/dojo-unpack-temp/dojo-release-${dojo.version}"
tofile="${unpack.location}"
verbose="true"/>
<delete dir="${basedir}/target/dojo-unpack-temp/"/>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/build.xml Fri Aug 31 23:31:19 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="helloworld-dojo" default="package">
+<project name="helloworld-dojo-webapp" default="package">
<property name="settings.localRepository" value="./target/repo" />
- <property name="artifactId" value="sample-helloworld-dojo" />
+ <property name="artifactId" value="sample-helloworld-dojo-webapp" />
<target name="init">
<mkdir dir="target/classes"/>
@@ -49,7 +49,7 @@
<property name="artifactId" value="${artifactId}"/>
</ant>
- <war destfile="target/sample-helloworld-dojo.war"
+ <war destfile="target/sample-helloworld-dojo-webapp.war"
webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
<zipfileset dir="../../modules" prefix="WEB-INF/lib">
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg Fri Aug 31 23:31:19 2007
@@ -31,10 +31,10 @@
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc"
- sodipodi:docname="helloworld-jsonrpc.svg"
+ sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"
+ sodipodi:docname="helloworld-jsonrpc-webapp.svg"
version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc\helloworld-jsonrpc.png"
+ inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"
inkscape:export-xdpi="52.84"
inkscape:export-ydpi="52.84">
<defs
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml Fri Aug 31 23:31:19 2007
@@ -25,7 +25,7 @@
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-helloworld-dojo</artifactId>
+ <artifactId>sample-helloworld-dojo-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany Dojo Sample WebApp</name>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java Fri Aug 31 23:31:19 2007
@@ -18,6 +18,8 @@
*/
package helloworldjsonrpc;
+import java.util.Date;
+
import org.osoa.sca.annotations.Service;
/**
@@ -26,11 +28,11 @@
@Service(HelloWorldService.class)
public class HelloWorldServiceImpl implements HelloWorldService {
- /*
- * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
- */
+ /*
+ * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
+ */
public String getGreetings(String name) {
- return "jsonrpcHello " + name;
+ return new Date() + ": [JSONRPC] Hello " + name;
}
}
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html Fri Aug 31 23:31:19 2007
@@ -17,66 +17,73 @@
* specific language governing permissions and limitations
* under the License.
-->
- <head>
- <title>Tuscany JSON-RPC HelloWorld Example</TITLE>
-
- <script type="text/javascript">
+<head>
+<title>Tuscany JSON-RPC HelloWorld Example</TITLE>
+
+<script type="text/javascript">
var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
+ djConfig.usePlainJson=true ;
//djConfig.debugAtAllCosts = true;
</script>
+<script type="text/javascript" src="dojo/dojo/dojo.js">
+ </script>
+<script type="text/javascript" src="dojo/dijit/dijit.js">
+ </script>
- <script type="text/javascript" src="dojo/dojo.js"></script>
-
- <script type="text/javascript">
- dojo.require("dojo.widget.*");
- dojo.require("dojo.widget.Button");
+<script type="text/javascript">
+ dojo.require("dijit.form.Button");
dojo.require("dojo.rpc.JsonService");
</script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
- </head>
+<link rel="stylesheet" type="text/css" href="style.css" />
- <body>
+</head>
- <h2>Tuscany Dojo JSON-RPC HelloWorld Sample</h2>
-
- <table>
- <tr>
- <th colspan="2">Dojo Example</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>helloWorldService</code> for the SCA service
- 'HelloWorldService' using <a href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's RPC classes</a>
- and providing them with <a href="HelloWorldService?smd">HelloWorldService?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>getGreetings</code> method of the <code>HelloWorldService</code> object.</p>
- </tr>
- <tr>
- <td>Request</td>
- <td>Response</td>
- </tr>
- <tr>
- <td>
- <br><div id="myecho" dojoType="Button" onClick='helloWorldService.getGreetings("Dojo").addCallback(contentCallBack);'>helloWorldService.getGreetings("Dojo").addCallback(contentCallBack);</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">
+<body>
+
+<h2>Tuscany Dojo JSON-RPC HelloWorld Sample</h2>
+
+<table>
+ <tr>
+ <th colspan="2">Dojo Example</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>helloWorldService</code>
+ for the SCA service 'HelloWorldService' using <a
+ href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9">Dojo's
+ RPC classes</a> and providing them with <a href="HelloWorldService?smd">HelloWorldService?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>getGreetings</code>
+ method of the <code>HelloWorldService</code> object.</p>
+ </tr>
+ <tr>
+ <td>Request</td>
+ <td>Response</td>
+ </tr>
+ <tr>
+ <td><br>
+ <button id="myecho" dojoType="dijit.form.Button"
+ onClick='helloWorldService.getGreetings("Dojo").addCallback(contentCallBack);'>Send
+ Request</button>
+ </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");
@@ -86,6 +93,6 @@
var helloWorldService = new dojo.rpc.JsonService("HelloWorldService?smd");
</script>
-
- </body>
+
+</body>
</html>
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/README
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/README?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/README (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/README Fri Aug 31 23:31:19 2007
@@ -9,12 +9,12 @@
As this sample provides a web app there is a manual step where the WAR file
that contains the sample is copied to your web app container. If you just want
-to give this sample a go deploy the WAR file (target/sample-helloworld-jsonrpc.war)
+to give this sample a go deploy the WAR file (target/sample-helloworld-jsonrpc-webapp.war)
to you web application server.
Once the web app is deployed use your browser to visit the following URL;
-http://localhost:8080/sample-helloworld-jsonrpc
+http://localhost:8080/sample-helloworld-jsonrpc-webapp
The port and hostname will of course vary depending on your local installation.
@@ -25,7 +25,7 @@
binding. The web app provided shows how the SCA-provided JSON client can be
used to invoke the SCA service.
-helloworld-jsonrpc/
+helloworld-jsonrpc-webapp/
src/
main/
java/
@@ -44,7 +44,7 @@
SCA service via JSONRPC
style.css - style sheet
- helloworld-jsonrpc.png - a pictorial representation of the
+ helloworld-jsonrpc-webapp.png - a pictorial representation of the
sample .composite file
build.xml - the Ant build file that unpacks the
dojo installation
@@ -55,10 +55,10 @@
With the binary distribution the sample can be built using Ant as
follows
-cd helloworld-jsonrpc
+cd helloworld-jsonrpc-webapp
ant package
-This should result in a war file (sample-helloworld-jsonrpc.war) in the target
+This should result in a war file (sample-helloworld-jsonrpc-webapp.war) in the target
directory. Copy this war file to your web app deployment directory in your
web app container.
@@ -68,7 +68,7 @@
Once the web app is deployed use your browser to visit the following URL;
-http://localhost:8080/sample-helloworld-jsonrpc
+http://localhost:8080/sample-helloworld-jsonrpc-webapp
The port and hostname will of course vary depending on your local installation.
@@ -80,10 +80,10 @@
With either the binary or source distributions the sample can be built and run
using Maven as follows.
-cd helloworld-jsonrpc
+cd helloworld-jsonrpc-webapp
mvn
-Again this should result in a war file (sample-helloworld-jsonrpc.war) in the target
+Again this should result in a war file (sample-helloworld-jsonrpc-webapp.war) in the target
directory. Follow the steps described in the previous section for running the web
app and for the expected results.
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/build.xml?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/build.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/build.xml Fri Aug 31 23:31:19 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
-->
-<project name="helloworld-jsonrpc" default="package">
+<project name="helloworld-jsonrpc-webapp" default="package">
<target name="init">
<mkdir dir="target/classes"/>
@@ -38,7 +38,7 @@
</target>
<target name="package" depends="compile">
- <war destfile="target/sample-helloworld-jsonrpc.war"
+ <war destfile="target/sample-helloworld-jsonrpc-webapp.war"
webxml="src/main/webapp/WEB-INF/web.xml">
<fileset dir="src/main/webapp"/>
<zipfileset dir="../../modules" prefix="WEB-INF/lib">
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/helloworld-jsonrpc.svg Fri Aug 31 23:31:19 2007
@@ -31,10 +31,10 @@
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.44"
- sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc"
- sodipodi:docname="helloworld-jsonrpc.svg"
+ sodipodi:docbase="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp"
+ sodipodi:docname="helloworld-jsonrpc-webapp.svg"
version="1.0"
- inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc\helloworld-jsonrpc.png"
+ inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-jsonrpc-webapp\helloworld-jsonrpc.png"
inkscape:export-xdpi="52.84"
inkscape:export-ydpi="52.84">
<defs
Modified: incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml?rev=571713&r1=570885&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml Fri Aug 31 23:31:19 2007
@@ -25,7 +25,7 @@
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
- <artifactId>sample-helloworld-jsonrpc</artifactId>
+ <artifactId>sample-helloworld-jsonrpc-webapp</artifactId>
<packaging>war</packaging>
<name>Apache Tuscany JSON-RPC Sample WebApp</name>
Modified: incubator/tuscany/java/sca/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?rev=571713&r1=571712&r2=571713&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/pom.xml Fri Aug 31 23:31:19 2007
@@ -47,15 +47,15 @@
<module>calculator-rmi-service</module>
<module>calculator-script</module>
<module>calculator-webapp</module>
- <module>calculator-webapp-ws</module>
+ <module>calculator-ws-webapp</module>
<module>chat-webapp</module>
<module>company-das</module>
<module>company-das-webapp</module>
<module>databinding-echo</module>
<module>feed-aggregator</module>
<module>feed-aggregator-webapp</module>
- <module>helloworld-dojo</module>
- <module>helloworld-jsonrpc</module>
+ <module>helloworld-dojo-webapp</module>
+ <module>helloworld-jsonrpc-webapp</module>
<module>helloworld-ws-service</module>
<module>helloworld-ws-service-webapp</module>
<module>helloworld-ws-reference</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org