Author: rfeng
Date: Wed Aug 29 21:44:19 2007
New Revision: 571036
URL: http://svn.apache.org/viewvc?rev=571036&view=rev
Log:
Upgrade to dojo 0.90 and update the web.xml to use TuscanyServletFilter
Modified:
incubator/tuscany/java/sca/demos/alert-aggregator/build-dojo.xml
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
incubator/tuscany/java/sca/demos/bigbank-account/build-dojo.xml
incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html
incubator/tuscany/java/sca/samples/helloworld-dojo/build-dojo.xml
incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
Modified: incubator/tuscany/java/sca/demos/alert-aggregator/build-dojo.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/build-dojo.xml?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/alert-aggregator/build-dojo.xml (original)
+++ incubator/tuscany/java/sca/demos/alert-aggregator/build-dojo.xml Wed Aug 29
21:44:19 2007
@@ -18,16 +18,15 @@
* under the License.
-->
<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"/>
@@ -36,7 +35,7 @@
<os family="windows"/>
</condition>
</target>
-
+
<target name="check-dojo-unpacked">
<condition property="already.unpacked" >
@@ -46,44 +45,46 @@
<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/"/>
</target>
-
+
<target name="clean-dojo-files">
<delete dir="${unpack.location}"/>
Modified:
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
---
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
(original)
+++
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/AlertAggregator.html
Wed Aug 29 21:44:19 2007
@@ -17,33 +17,34 @@
* specific language governing permissions and limitations
* under the License.
-->
- <head>
- <title>Apache Tuscany Alert Aggregator Sample</TITLE>
-
- <script type="text/javascript">
+<head>
+<title>Apache Tuscany Alert Aggregator Sample</TITLE>
+
+<script type="text/javascript">
//var djConfig = {isDebug: true,debugContainerId: "dojoDebug" };
//djConfig.debugAtAllCosts = true;
</script>
-
- <script type="text/javascript" src="dojo/dojo.js">
+
+<script type="text/javascript" src="dojo/dojo/dojo.js">
+ </script>
+<script type="text/javascript" src="dojo/dijit/dijit.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>
- <body onload="getAlertSources()">
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
- <script type="text/javascript">
+<body onload="getAlertSources()">
+
+<script type="text/javascript">
// The proxy for the alert and alertsources services running in Tuscany
- var alertsService = new
dojo.rpc.JsonService("services/AlertsServiceJSONRPC?smd");
- var alertSourcesService = new
dojo.rpc.JsonService("services/AlertsSourcesServiceJSONRPC?smd");
+ var alertsService = new
dojo.rpc.JsonService("AlertsServiceJSONRPC?smd");
+ var alertSourcesService = new
dojo.rpc.JsonService("AlertsSourcesServiceJSONRPC?smd");
// If you want to put an HTTP sniffer in the way to look at the
JSONROPC packets you'll
// need to edit the target address of the service in the smd. The only
way to do this easily
@@ -87,7 +88,6 @@
}
function getAlertSourcesCallback(result) {
- dojo.debug("in getAlertsCallback");
var resultsNode = document.getElementById("alertSourcesTable");
if ( result.error != null ) {
resultsNode.innerHTML = result.error;
@@ -274,7 +274,6 @@
}
function getAlertsCallback(result) {
- dojo.debug("in getAlertsCallback");
var resultsNode = document.getElementById("alertsTable");
if ( result.error != null ) {
resultsNode.innerHTML = result.error;
@@ -314,19 +313,18 @@
</script>
- <h1 id="top">Apache Tuscany Alert Aggregator Demo</h1>
- <div id="errors"></div>
- <p>Alert Sources<span id="refreshSources"></span>:</p>
- <!--input type="button" value="getSources" onclick="getAlertSources()"/-->
- <div id="alertSourcesTable">Refreshing...</div>
- <p/>
- <input type="button" value="Refresh" onclick="getAlerts()"/>
- <p/>
- <div id="alertsTable">Refreshing...</div>
- <p><a id="data" HREF="#top">Back to top</a></p>
- <div id="alertData"></div>
- <p/>
- <div id="dojoDebug"></div>
-
- </body>
+<h1 id="top">Apache Tuscany Alert Aggregator Demo</h1>
+<div id="errors"></div>
+<p>Alert Sources<span id="refreshSources"></span>:</p>
+<!--input type="button" value="getSources" onclick="getAlertSources()"/-->
+<div id="alertSourcesTable">Refreshing...</div>
+<p /><input type="button" value="Refresh" onclick="getAlerts()" />
+<p />
+<div id="alertsTable">Refreshing...</div>
+<p><a id="data" HREF="#top">Back to top</a></p>
+<div id="alertData"></div>
+<p />
+<div id="dojoDebug"></div>
+
+</body>
</html>
Modified:
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
---
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
(original)
+++
incubator/tuscany/java/sca/demos/alert-aggregator/src/main/webapp/WEB-INF/web.xml
Wed Aug 29 21:44:19 2007
@@ -24,19 +24,19 @@
<display-name>Tuscany Alert Aggregator Demo</display-name>
+ <filter>
+ <filter-name>tuscany</filter-name>
+
<filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>tuscany</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
<listener>
<listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class>
</listener>
-
- <servlet>
- <servlet-name>TuscanyServlet</servlet-name>
-
<servlet-class>org.apache.tuscany.sca.host.webapp.TuscanyServlet</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TuscanyServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
<welcome-file-list id="WelcomeFileList">
<welcome-file>AlertAggregator.html</welcome-file>
Modified: incubator/tuscany/java/sca/demos/bigbank-account/build-dojo.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/demos/bigbank-account/build-dojo.xml?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
--- incubator/tuscany/java/sca/demos/bigbank-account/build-dojo.xml (original)
+++ incubator/tuscany/java/sca/demos/bigbank-account/build-dojo.xml Wed Aug 29
21:44: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="unpack.location"
value="${basedir}/target/classes/web/dojo"/>
+ <property name="dojo.version" value="0.9.0"/>
+ <property name="unpack.location"
value="${basedir}/src/main/resources/web/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/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?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
---
incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html
(original)
+++
incubator/tuscany/java/sca/demos/bigbank-account/src/main/resources/web/AccountJSON.html
Wed Aug 29 21:44:19 2007
@@ -17,62 +17,67 @@
* specific language governing permissions and limitations
* under the License.
-->
- <head>
- <title>Tuscany JSON-RPC BigBank Client</TITLE>
-
- <script type="text/javascript">
+<head>
+<title>Tuscany JSON-RPC BigBank Client</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.js">
+<script type="text/javascript" src="dojo/dojo/dojo.js">
+ </script>
+<script type="text/javascript" src="dojo/dijit/dijit.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>
- <body>
+<link rel="stylesheet" type="text/css" href="style.css" />
+</head>
- <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>http://localhost:8080/AccountJSONService</b>
- using <a
href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9";>Dojo's RPC
classes</a>
- and providing them with <a
href="AccountJSONService?smd">http://localhost:8080/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">
+<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>http://localhost:8080/AccountJSONService</b>
using <a
+
href="http://manual.dojotoolkit.org/WikiHome/DojoDotBook/Book9";>Dojo's
+ RPC classes</a> and providing them with <a
href="AccountJSONService?smd">http://localhost:8080/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>
+ <button id="myaccount" dojoType="dijit.form.Button"
+
onClick='accountService.getAccountReport("Dojo1234").addCallback(contentCallBack);'>getAccountReport("Dojo1234")</button>
+ <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");
@@ -82,6 +87,6 @@
var accountService = new dojo.rpc.JsonService("AccountJSONService?smd");
</script>
-
- </body>
+
+</body>
</html>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo/build-dojo.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo/build-dojo.xml?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo/build-dojo.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo/build-dojo.xml Wed Aug
29 21:44: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/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
Wed Aug 29 21:44: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/src/main/webapp/HelloWorldJSONRPC.html
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html?rev=571036&r1=571035&r2=571036&view=diff
==============================================================================
---
incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
(original)
+++
incubator/tuscany/java/sca/samples/helloworld-dojo/src/main/webapp/HelloWorldJSONRPC.html
Wed Aug 29 21:44: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>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
