Moving 1.x branches

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

14 files changed, 935 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/README b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/README
new file mode 100644
index 0000000000..38392a13b6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/README
@@ -0,0 +1,104 @@
+Hello World Dojo RPC Sample
+===========================
+
+Note. This sample is currently not working correctly on WebSphere - see TUSCANY-1990
+
+This sample demostrates the SCA JSONRPC binding using a simple web app that
+uses the RPC support of the Dojo Toolkit to an SCA service.  
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+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-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-webapp
+
+The port and hostname will of course vary depending on your local installation. 
+
+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
+---------------
+The sample provides a single service with an operation that reflects
+a greeting back to the caller. The service is exposed using the JSONRPC
+binding. The web app provided shows how the Dojo Toolkit JSON-RPC support can be 
+used to invoke the SCA service. 
+
+The web app provided shows how the service can be called by using the DOJO toolkit. 
+
+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 
+                                        for use by the sample.
+  src/
+    main/
+      java/
+        helloworldjsonrpc/
+          HelloWorldService.java      - service interface
+          HelloWorldServiceImpl.java  - service implementation
+      resources/
+        jsonrpc.composite             - the SCA assembly for this sample
+      webapp
+        dojo/                         - the Dojo toolkit (this directory is created only 
+                                        when you build the samples from the source distribution)
+        META-INF/
+          sca-contribution.xml        - specifies the composite to be deployed
+        WEB-INF/
+          web.xml                     - defines the listener that starts up the 
+                                        Tuscany SCA runtime
+        HelloWorldJSONRPC.html        - the web application that calls the 
+                                        SCA service via JSONRPC
+        style.css                     - style sheet     
+           
+  helloworld-jsonrpc-webapp.png              - a pictorial representation of the 
+                                        sample .composite file
+  build.xml                           - the Ant build file that unpacks the
+                                        dojo installation
+  pom.xml                             - the Maven build file  
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built using Ant as 
+follows
+
+cd helloworld-dojo-webapp
+ant package
+
+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. 
+
+The process for getting the web app running will depend on which web app container
+you are using. For example, if you are using Tomcat then it is simply a matter
+of copying the WAR file to the webapps directory. 
+
+Once the web app is deployed use your browser to visit the following URL;
+
+http://localhost:8080/sample-helloworld-dojo-webapp
+
+The port and hostname will of course vary depending on your local installation. 
+
+You should see a web page that allows you to send messages, via JSONRPC, to the 
+application running in the Tuscany SCA Runtime
+
+Building And Running The Sample Using Maven 
+-------------------------------------------
+With either the binary or source distributions the sample can be built and run 
+using Maven as follows. 
+
+cd helloworld-dojo-webapp 
+mvn
+
+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.
+
+
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml
new file mode 100644
index 0000000000..040e6d6a89
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build-dojo.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.
+-->
+<project name="DojoZipInstaller">
+	
+
+    <property name="dojo.version" value="1.3.0b3"/>
+    <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.version}/dojo-${dojo.version}.zip"/>
+        </condition>
+        <condition property="maven.suffix" value="">
+            <os family="unix"/>
+        </condition>
+        <condition property="maven.suffix" value=".bat">
+            <os family="windows"/>
+        </condition>
+    </target>
+	
+
+    <target name="check-dojo-unpacked">
+        <condition property="already.unpacked" >
+            <available file="${unpack.location}"/>
+        </condition>
+    </target>
+
+    <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-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 -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-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-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.version}/dojo-${dojo.version}.zip"
+               dest="${basedir}/target/dojo-unpack-temp/"
+               overwrite="false">
+            <patternset>
+                <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-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}"/>
+    </target>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml
new file mode 100644
index 0000000000..95813af65a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/build.xml
@@ -0,0 +1,70 @@
+<!--
+ * 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.    
+-->
+<!DOCTYPE project [
+<!ENTITY buildDependency SYSTEM "build-dependency.xml">
+]>
+
+<project name="sample-helloworld-dojo-webapp" default="compile">
+	
+	&buildDependency;
+	
+    <target name="compile">
+        <mkdir dir="target/classes"/>
+        <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
+            <src path="src\main\java"/>
+            <classpath>
+                <fileset refid="tuscany.jars"/>
+                <fileset refid="3rdparty.jars"/>
+            </classpath>
+        </javac>
+        <copy todir="target/classes">
+            <fileset dir="src\main\resources"/>
+            <fileset dir="src\main\resources"/>
+        </copy>
+    	
+        <ant antfile="./build-dojo.xml" target="install-dojo-nomaven">
+          <property name="localRepository" value="./target/repo"/>
+        </ant>
+        
+        <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
+          <property name="localRepository" value="./target/repo"/>
+        </ant>  
+    	
+        <war destfile="target/sample-helloworld-dojo-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
+            <fileset dir="src/main/webapp"/>
+            <lib refid="tuscany.jars"/>
+            <lib refid="3rdparty.jars"/>
+            <classes dir="target/classes"/>
+        </war>
+    	
+        <ant antfile="./build-dojo.xml" target="clean-dojo-files">
+          <property name="localRepository" value="./target/repo"/>
+        </ant>     	
+    </target>
+	
+    <target name="package" depends="compile"/>
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
new file mode 100644
index 0000000000..57f90aed01
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.png
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
new file mode 100644
index 0000000000..d5c3bc5d3e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/helloworld-jsonrpc.svg
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<!--

+    * 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.    

+-->

+<!-- Created with Inkscape (http://www.inkscape.org/) -->

+<svg

+   xmlns:dc="http://purl.org/dc/elements/1.1/"

+   xmlns:cc="http://web.resource.org/cc/"

+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"

+   xmlns:svg="http://www.w3.org/2000/svg"

+   xmlns="http://www.w3.org/2000/svg"

+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"

+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"

+   width="1052.3622"

+   height="744.09448"

+   id="svg2"

+   sodipodi:version="0.32"

+   inkscape:version="0.44"

+   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-webapp\helloworld-jsonrpc.png"

+   inkscape:export-xdpi="52.84"

+   inkscape:export-ydpi="52.84">

+  <defs

+     id="defs4" />

+  <sodipodi:namedview

+     id="base"

+     pagecolor="#ffffff"

+     bordercolor="#666666"

+     borderopacity="1.0"

+     gridtolerance="10000"

+     guidetolerance="10"

+     objecttolerance="10"

+     inkscape:pageopacity="0.0"

+     inkscape:pageshadow="2"

+     inkscape:zoom="1.4"

+     inkscape:cx="516.28571"

+     inkscape:cy="414.63224"

+     inkscape:document-units="px"

+     inkscape:current-layer="layer1"

+     inkscape:window-width="1054"

+     inkscape:window-height="721"

+     inkscape:window-x="158"

+     inkscape:window-y="164" />

+  <metadata

+     id="metadata7">

+    <rdf:RDF>

+      <cc:Work

+         rdf:about="">

+        <dc:format>image/svg+xml</dc:format>

+        <dc:type

+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />

+      </cc:Work>

+    </rdf:RDF>

+  </metadata>

+  <g

+     inkscape:label="Layer 1"

+     inkscape:groupmode="layer"

+     id="layer1">

+    <g

+       id="g2997"

+       transform="translate(144.2857,52.85714)">

+      <rect

+         rx="8.0946665"

+         ry="12.692303"

+         y="192.00233"

+         x="258.31134"

+         height="299.99988"

+         width="262.14267"

+         id="rect2067"

+         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999893;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />

+      <flowRoot

+         id="flowRoot2954"

+         xml:space="preserve"><flowRegion

+           id="flowRegion2956"><rect

+             y="212.66591"

+             x="281.42856"

+             height="61.42857"

+             width="170"

+             id="rect2958" /></flowRegion><flowPara

+           id="flowPara2960">helloworldjsonrpc</flowPara></flowRoot>    </g>

+    <rect

+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"

+       id="rect2988"

+       width="115.66247"

+       height="85.862968"

+       x="449.91632"

+       y="349.31049"

+       rx="6.9961648"

+       ry="7.1230249" />

+    <flowRoot

+       xml:space="preserve"

+       id="flowRoot2966"

+       transform="translate(190.3256,143.3719)"><flowRegion

+         id="flowRegion2968"><rect

+           id="rect2970"

+           width="170"

+           height="61.42857"

+           x="281.42856"

+           y="212.66591" /></flowRegion><flowPara

+         id="flowPara2972">HelloWorld</flowPara><flowPara

+         id="flowPara1883">JSONService</flowPara><flowPara

+         id="flowPara1885">Component</flowPara></flowRoot>    <path

+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000036px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

+       d="M 373.48019,364.72909 L 455.16689,364.72909 L 470.019,392.34681 L 452.69154,417.84009 L 373.48019,417.84009 L 392.04536,392.34681 L 373.48019,364.72909 z "

+       id="path3017" />

+    <flowRoot

+       xml:space="preserve"

+       id="flowRoot1887"

+       transform="translate(113.6483,167.4037)"><flowRegion

+         id="flowRegion1889"><rect

+           id="rect1891"

+           width="170"

+           height="61.42857"

+           x="281.42856"

+           y="212.66591" /></flowRegion><flowPara

+         id="flowPara1893">HelloWorld</flowPara><flowPara

+         id="flowPara1897">Service</flowPara></flowRoot>    <rect

+       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

+       id="rect1888"

+       width="85"

+       height="97.85714"

+       x="214.28571"

+       y="340.52307"

+       rx="6.9961648"

+       ry="7.1230249" />

+    <flowRoot

+       xml:space="preserve"

+       id="flowRoot1892"

+       transform="translate(-56.88742,135.3526)"><flowRegion

+         id="flowRegion1894"><rect

+           id="rect1896"

+           width="170"

+           height="61.42857"

+           x="281.42856"

+           y="212.66591" /></flowRegion><flowPara

+         id="flowPara1900">WebApp</flowPara></flowRoot>    <rect

+       style="opacity:1;fill:#f19a9a;fill-opacity:1;stroke:#2e2424;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:3, 1;stroke-dashoffset:0;stroke-opacity:1"

+       id="rect1912"

+       width="45.714287"

+       height="40.714287"

+       x="277.85715"

+       y="370.52304"

+       rx="6.9961648"

+       ry="7.1230249" />

+    <flowRoot

+       xml:space="preserve"

+       id="flowRoot1914"

+       transform="translate(1.400116,166.6895)"><flowRegion

+         id="flowRegion1916"><rect

+           id="rect1918"

+           width="170"

+           height="61.42857"

+           x="281.42856"

+           y="212.66591" /></flowRegion><flowPara

+         id="flowPara1920">DOJO</flowPara></flowRoot>    <path

+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"

+       d="M 324.28571,391.23734 C 391.42857,391.95163 391.42857,391.95163 391.42857,391.95163"

+       id="path1922" />

+  </g>

+</svg>

diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml
new file mode 100644
index 0000000000..c38a26ec50
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/pom.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-sca</artifactId>
+        <version>1.5-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-helloworld-dojo-webapp</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Sample HelloWorld DOJO WebApp</name>
+
+    <repositories>
+       <repository>
+          <id>apache.incubator</id>
+          <url>http://people.apache.org/repo/m2-incubating-repository</url>
+       </repository>
+    </repositories>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-webapp</artifactId>
+            <version>1.5-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
+            <version>1.5-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0.1</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- marking dependency as provided to exclude from war file -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <!-- version>1.1</version --> 
+			    <dependencies>
+			        <dependency>
+			    	    <groupId>ant</groupId>
+			    	    <artifactId>ant-trax</artifactId>
+			    	    <version>1.6.5</version>
+			        </dependency>
+			    </dependencies>                    
+                <executions>
+                    <execution> 
+                        <id>install-dojo</id>                       
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-dojo.xml" target="install-dojo">
+                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution> 
+                        <id>copy-dojo-files</id>                       
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-dojo.xml" target="unpack-dojo-files">
+                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                    <property name="artifactId" value="${artifactId}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                    <execution> 
+                        <id>clean-dojo-files</id>                       
+                        <phase>clean</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <ant antfile="./build-dojo.xml" target="clean-dojo-files">
+                                    <property name="localRepository" value="${settings.localRepository}"/>
+                                    <property name="artifactId" value="${artifactId}"/>
+                                </ant>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin> 
+            <plugin>
+                <groupId>org.apache.tuscany.sca</groupId>
+                <artifactId>tuscany-maven-ant-generator</artifactId>
+                <version>1.5-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
+                        </configuration>                    
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>           
+        </plugins>
+    </build>
+</project>
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
new file mode 100644
index 0000000000..3d8ea24f04
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldService.java
@@ -0,0 +1,28 @@
+/*
+ * 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.    
+ */
+package helloworldjsonrpc;
+
+/**
+ * This is the business interface of the HelloWorld service component.
+ */
+public interface HelloWorldService {
+
+    String getGreetings(String name);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
new file mode 100644
index 0000000000..e205f4da9b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/java/helloworldjsonrpc/HelloWorldServiceImpl.java
@@ -0,0 +1,38 @@
+/*
+ * 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.    
+ */
+package helloworldjsonrpc;
+
+import java.util.Date;
+
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service component.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldServiceImpl implements HelloWorldService {
+
+    /*
+     * @see org.apache.tuscany.samples.helloworld.HelloWorldServiceComponent#getGreetings()
+     */
+    public String getGreetings(String name) {
+        return new Date() + ": [JSONRPC] Hello " + name;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
new file mode 100644
index 0000000000..e895ab455d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/resources/jsonrpc.composite
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * 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.    

+-->

+

+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

+           targetNamespace="http://sample"

+           xmlns:sample="http://sample"

+           name="helloworldjsonrpc">

+           

+	<service name="HelloWorldService" promote="HelloWorldJSONServiceComponent/HelloWorldService">

+         <interface.java interface="helloworldjsonrpc.HelloWorldService"/>

+         <tuscany:binding.jsonrpc/>

+     </service>           

+

+    <component name="HelloWorldJSONServiceComponent">

+        <implementation.java class="helloworldjsonrpc.HelloWorldServiceImpl"/>

+    </component>

+

+</composite>

+

diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
new file mode 100644
index 0000000000..4195f3288c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/HelloWorldJSONRPC.html
@@ -0,0 +1,98 @@
+<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 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">
+    	dojo.require("dijit.form.Button");
+    	dojo.require("dojo.rpc.JsonService");    	
+    </script>
+
+<link rel="stylesheet" type="text/css" href="style.css" />
+
+</head>
+
+<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");
+    		handlerNode.innerHTML = "<p>" + result + "</p>" ;
+    	}
+    
+    	var helloWorldService = new dojo.rpc.JsonService("HelloWorldService?smd");
+    
+    </script>
+
+</body>
+</html>
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..b5e24d40f6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+* 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.    
+-->
+
+<contribution xmlns="http://www.osoa.org/xmlns/sca/1.0"
+              xmlns:sample="http://sample">
+   <deployable composite="sample:helloworldjsonrpc"/>
+</contribution>
+
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
new file mode 100644
index 0000000000..98f4a98bfd
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.    
+-->
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
+    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
+
+    <d:environment>
+        <d:moduleId>
+            <d:groupId>org.apache.tuscany.sca</d:groupId>
+            <d:artifactId>sample-helloworld-dojo-webapp</d:artifactId>
+            <d:version>1.5-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+		<!-- TUSCANY-2622 -->
+		<d:hidden-classes>
+			<d:filter>org.apache.axiom</d:filter>
+			<d:filter>org.apache.axis2</d:filter>
+			<d:filter>org.apache.commons</d:filter>
+			<d:filter>org.jdom</d:filter>
+		</d:hidden-classes>	
+		
+    </d:environment>
+</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000000..70cd67890a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ * 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.    
+-->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
+Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+    <display-name>Apache Tuscany DOJO HelloWorld Sample</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>
+
+    <welcome-file-list>
+        <welcome-file>HelloWorldJSONRPC.html</welcome-file>
+    </welcome-file-list>  
+
+</web-app>
diff --git a/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css
new file mode 100644
index 0000000000..1071583264
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.5/samples/helloworld-dojo-webapp/src/main/webapp/style.css
@@ -0,0 +1,22 @@
+/*
+ * 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.
+ */
+* { font-family: arial; }
+
+table, th, td { border: 2px solid blue; border-collapse: collapse; }
+th { color: white; background-color: blue; }