You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/01/23 17:58:18 UTC

svn commit: r737093 [1/2] - in /tuscany/java/sca/samples: host-webapp-calculator/ host-webapp-calculator/src/ host-webapp-calculator/src/main/ host-webapp-calculator/src/main/java/ host-webapp-calculator/src/main/java/calculator/ host-webapp-calculator...

Author: slaws
Date: Fri Jan 23 08:58:16 2009
New Revision: 737093

URL: http://svn.apache.org/viewvc?rev=737093&view=rev
Log:
Building ant scripts for JSE/OSGi launcher and host-webapp that can be run from command line, maven and eclipse with reference to a development distribution or an installed distribution. Not in the build.

Added:
    tuscany/java/sca/samples/host-webapp-calculator/
    tuscany/java/sca/samples/host-webapp-calculator/README   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/build.xml   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/calculator-web.png   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/calculator-web.svg
    tuscany/java/sca/samples/host-webapp-calculator/pom.xml   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml   (with props)
    tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp
    tuscany/java/sca/samples/implementation-java-calculator/
    tuscany/java/sca/samples/implementation-java-calculator/README   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/build.xml   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/calculator.png   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/calculator.svg
    tuscany/java/sca/samples/implementation-java-calculator/pom.xml   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/
    tuscany/java/sca/samples/implementation-java-calculator/src/main/
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/AddService.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/AddServiceImpl.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorClient.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorService.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/CalculatorServiceImpl.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/DivideService.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/DivideServiceImpl.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/MultiplyService.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/MultiplyServiceImpl.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/SubtractService.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/java/calculator/SubtractServiceImpl.java   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/
    tuscany/java/sca/samples/implementation-java-calculator/src/main/resources/Calculator.composite   (with props)
    tuscany/java/sca/samples/implementation-java-calculator/src/test/
    tuscany/java/sca/samples/implementation-java-calculator/src/test/java/
    tuscany/java/sca/samples/implementation-java-calculator/src/test/java/calculator/
    tuscany/java/sca/samples/implementation-java-calculator/src/test/java/calculator/CalculatorTestCase.java   (with props)

Added: tuscany/java/sca/samples/host-webapp-calculator/README
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/README?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/README (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/README Fri Jan 23 08:58:16 2009
@@ -0,0 +1,108 @@
+Calculator Sample Exposing Web Services In A WebApp
+===================================================
+This sample uses the same code as the calculator sample, it deploys the
+sample wrapped in a web app and exposes the AddService as a web 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-calculator-ws-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-calculator-ws-webapp
+
+The sample is configured to use a service on port 8080. If your servlet container
+is using a port other than 8080 then you will need to edit the Calculator.composite
+and change the uri attribute of the <binding.ws> used by the CalculatorServiceComponent
+to use the correct port.
+
+Sample Overview
+---------------
+The sample provides a single calculator service with a default SCA (java) 
+binding. The CalculatorClient exercises this interface by calling add, 
+subtract, multiply and divide operations. This results in messages passing to 
+the appropriate components in the composite.
+
+calculator-webapp/
+  src/
+    main/
+      java/
+        calculator/
+          AddService.java         - As calculator sample
+          AddServiceImpl.java
+          CalculatorClient.java   - As calculator sample
+          CalculatorService.java  - As calculator sample
+          CalculatorServiceImpl.java
+          DivideService.java      - As calculator sample
+          DivideServiceImpl.java
+          MultiplyService.java    - As calculator sample
+          MultiplyServiceImpl.java
+          SubtractService.java    - As calculator sample
+          SubtractServiceImpl.java
+      resources/
+        Calculator.composite      - As calculator sample except that the 
+                                    connection between the CalculatorService
+                                    and the AddService is web services
+      webapp
+        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 and maps service
+                                    calls to the TuscanyServlet
+        calc.jsp                  - the web application that makes use of the
+                                    SCA application 
+           
+  calculator.png - a pictorial representation of the sample .composite file
+  build.xml      - the Ant build file
+  pom.xml        - the Maven build file
+  README         - this file  
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built using Ant as 
+follows
+
+cd calculator-ws-webapp
+ant package
+
+This should result in a war file (sample-calculator-ws-webapp.war) in the target 
+directory. Copy this war file to your web app deployment directory in you
+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-calculator-ws-webapp
+
+The port and hostname will of course vary depending on your local installation. 
+
+You should see the following output.
+
+Expression	Result
+2 + 3	5.0
+3 - 2	1.0
+3 * 2	6.0
+3 / 2	1.5
+
+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 calculator-ws-webapp 
+mvn
+
+Again this should result in a war file (sample-calculator-ws-webapp.war) in the target 
+directory. Follow the steps described in the previous section for running the web 
+app and for the expected results.
+
+

Propchange: tuscany/java/sca/samples/host-webapp-calculator/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/README
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: tuscany/java/sca/samples/host-webapp-calculator/build.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/build.xml?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/build.xml (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/build.xml Fri Jan 23 08:58:16 2009
@@ -0,0 +1,73 @@
+<!--
+ * 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="sample-host-webapp-calculator" default="compile">
+    <property name="sample.name" value="${ant.project.name}"/>
+	<property name="sample.root" value="."/>
+    <property name="sample.war" value="${sample.root}/target/${sample.name}.war" />
+	<available file="../../distribution/pom.xml" property="running.in.development"/>
+	
+	<target name="set-development" if="running.in.development">
+		<property name="distro.root" value="../../distribution/all/target"/>
+	</target>
+	
+	<target name="set-distribution" unless="running.in.development">
+		<property name="distro.root" value="../.."/>
+	</target>
+			
+    <target name="init" depends="set-development, set-distribution" >
+    	
+        <mkdir dir="${sample.root}/target/classes"/>
+    </target>
+	
+    <target name="compile" depends="init">
+        <javac srcdir="${sample.root}/src/main/java"
+               destdir="${sample.root}/target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <classpath>
+            	<!--pathelement location="${distro.root}/tuscany-distribution-all/manifest.jar"/-->
+                <fileset dir="${distro.root}/modules">
+                    <include name="*.jar" />
+                    <include name="*/*.jar" />
+                </fileset>
+            </classpath>
+        </javac> 
+        <copy todir="${sample.root}/target/classes">
+            <fileset dir="${sample.root}/src/main/resources"/>
+        </copy>
+        <fileset id="tuscany.jars" dir="${distro.root}/modules">
+            <include name="*.jar" />
+            <include name="*/*.jar" />
+        </fileset>    	
+        <war destfile="${sample.war}" webxml="${sample.root}/src/main/webapp/WEB-INF/web.xml">
+            <fileset dir="${sample.root}/src/main/webapp"/>
+        	<lib refid="tuscany.jars"/>
+            <classes dir="${sample.root}/target/classes"/>
+        </war>    	
+    </target>	
+
+    <target name="clean">
+        <delete includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+
+</project>

Propchange: tuscany/java/sca/samples/host-webapp-calculator/build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/build.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/build.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/calculator-web.png
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/calculator-web.png?rev=737093&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tuscany/java/sca/samples/host-webapp-calculator/calculator-web.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: tuscany/java/sca/samples/host-webapp-calculator/calculator-web.svg
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/calculator-web.svg?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/calculator-web.svg (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/calculator-web.svg Fri Jan 23 08:58:16 2009
@@ -0,0 +1,455 @@
+<?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.45.1"
+   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-ws-webapp\calculator-web.png"
+   inkscape:export-xdpi="52.84"
+   inkscape:export-ydpi="52.84"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <marker
+       inkscape:stockid="Arrow1Lend"
+       orient="auto"
+       refY="0.0"
+       refX="0.0"
+       id="Arrow1Lend"
+       style="overflow:visible;">
+      <path
+         id="path4252"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+         transform="scale(0.8) rotate(180) translate(12.5,0)" />
+    </marker>
+  </defs>
+  <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="330.5192"
+     inkscape:cy="378.84265"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     inkscape:window-width="1054"
+     inkscape:window-height="721"
+     inkscape:window-x="59"
+     inkscape:window-y="79" />
+  <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="matrix(1,0,0,1.144214,0,-27.53557)">
+      <rect
+         rx="15.307091"
+         ry="12.692303"
+         y="192.00233"
+         x="258.31146"
+         height="299.99988"
+         width="495.71429"
+         id="rect2067"
+         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.86971939;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">Calculator</flowPara></flowRoot>    </g>
+    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:1.9999994;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2988"
+       width="115.66247"
+       height="191.57716"
+       x="339.91632"
+       y="262.1673"
+       rx="6.9961648"
+       ry="15.892869" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot2966"
+       transform="translate(79.61125,62.65764)"><flowRegion
+         id="flowRegion2968"><rect
+           id="rect2970"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara2972">Calculator</flowPara><flowPara
+         id="flowPara1895">Service</flowPara><flowPara
+         id="flowPara1897">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 322.76581,342.58603 L 356.10085,342.58603 L 362.16176,355.71801 L 355.0907,367.83985 L 322.76581,367.83985 L 330.34196,355.71801 L 322.76581,342.58603 z "
+       id="path3017" />
+    <path
+       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 431.01809,321.46204 L 471.00147,321.46204 L 478.27117,334.59402 L 469.78986,346.71586 L 431.01809,346.71586 L 440.10523,334.59402 L 431.01809,321.46204 z "
+       id="path3019" />
+    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1.00000024px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 223.15923,328.61046 L 282.4833,328.61046 L 293.26948,355.48529 L 280.68561,380.29286 L 223.15923,380.29286 L 236.64198,355.48529 L 223.15923,328.61046 z "
+       id="path1883" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1885"
+       transform="translate(-46.16225,128.7269)"
+       style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%"><flowRegion
+         id="flowRegion1887"><rect
+           id="rect1889"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-family:Bitstream Vera Sans;font-weight:normal;font-style:normal;font-stretch:normal;font-variant:normal;font-size:11;text-anchor:start;text-align:start;writing-mode:lr;line-height:125%" /></flowRegion><flowPara
+         id="flowPara1891">Calculator</flowPara><flowPara
+         id="flowPara1893">Service</flowPara></flowRoot>    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1899"
+       width="115.66247"
+       height="70.148659"
+       x="594.75488"
+       y="209.73451"
+       rx="6.9961648"
+       ry="5.8193965" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1901"
+       transform="translate(334.4498,10.22481)"><flowRegion
+         id="flowRegion1903"><rect
+           id="rect1905"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara1907">Add</flowPara><flowPara
+         id="flowPara1909">Service</flowPara><flowPara
+         id="flowPara1911">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 573.31867,232.29606 L 606.65371,232.29606 L 612.71462,245.42804 L 605.64356,257.54988 L 573.31867,257.54988 L 580.89482,245.42804 L 573.31867,232.29606 z "
+       id="path1913" />
+    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1917"
+       width="115.66247"
+       height="70.148659"
+       x="594.06543"
+       y="292.59158"
+       rx="6.9961648"
+       ry="5.8193965" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1919"
+       transform="translate(333.7604,93.08188)"><flowRegion
+         id="flowRegion1921"><rect
+           id="rect1923"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara1925">Subtract</flowPara><flowPara
+         id="flowPara1927">Service</flowPara><flowPara
+         id="flowPara1929">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 572.62924,315.15313 L 605.96428,315.15313 L 612.02519,328.28511 L 604.95413,340.40695 L 572.62924,340.40695 L 580.20539,328.28511 L 572.62924,315.15313 z "
+       id="path1931" />
+    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1933"
+       width="115.66247"
+       height="70.148659"
+       x="594.77979"
+       y="371.87729"
+       rx="6.9961648"
+       ry="5.8193965" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1935"
+       transform="translate(334.4747,172.3676)"><flowRegion
+         id="flowRegion1937"><rect
+           id="rect1939"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara1941">Multiply</flowPara><flowPara
+         id="flowPara1943">Service</flowPara><flowPara
+         id="flowPara1945">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 573.34352,394.43884 L 606.67856,394.43884 L 612.73947,407.57082 L 605.66841,419.69266 L 573.34352,419.69266 L 580.91967,407.57082 L 573.34352,394.43884 z "
+       id="path1947" />
+    <rect
+       style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.00000024;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect1949"
+       width="115.66247"
+       height="70.148659"
+       x="596.20831"
+       y="452.59158"
+       rx="6.9961648"
+       ry="5.8193965" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1951"
+       transform="translate(335.9032,253.0819)"><flowRegion
+         id="flowRegion1953"><rect
+           id="rect1955"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591" /></flowRegion><flowPara
+         id="flowPara1957">Divide</flowPara><flowPara
+         id="flowPara1959">Service</flowPara><flowPara
+         id="flowPara1961">Component</flowPara></flowRoot>    <path
+       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 574.77209,475.15313 L 608.10713,475.15313 L 614.16804,488.28511 L 607.09698,500.40695 L 574.77209,500.40695 L 582.34824,488.28511 L 574.77209,475.15313 z "
+       id="path1963" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1965"
+       transform="translate(161.0221,114.967)"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion1967"><rect
+           id="rect1969"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara1973">add</flowPara><flowPara
+         id="flowPara1977">Service</flowPara></flowRoot>    <path
+       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 430.65917,357.18186 L 470.64255,357.18186 L 477.91225,370.31384 L 469.43094,382.43568 L 430.65917,382.43568 L 439.74631,370.31384 L 430.65917,357.18186 z "
+       id="path1979" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1981"
+       transform="translate(160.6632,150.6868)"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion1983"><rect
+           id="rect1985"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara1987">subtract</flowPara><flowPara
+         id="flowPara1989">Service</flowPara></flowRoot>    <path
+       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 431.37346,390.75329 L 471.35684,390.75329 L 478.62654,403.88527 L 470.14523,416.00711 L 431.37346,416.00711 L 440.4606,403.88527 L 431.37346,390.75329 z "
+       id="path1991" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1993"
+       transform="translate(161.3775,184.2583)"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion1995"><rect
+           id="rect1997"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara1999">multiply</flowPara><flowPara
+         id="flowPara2001">Service</flowPara></flowRoot>    <path
+       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999982px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 429.94489,422.18186 L 469.92827,422.18186 L 477.19797,435.31384 L 468.71666,447.43568 L 429.94489,447.43568 L 439.03203,435.31384 L 429.94489,422.18186 z "
+       id="path2003" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot2005"
+       transform="translate(159.9489,215.6868)"
+       style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion2007"><rect
+           id="rect2009"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara2011">divide</flowPara><flowPara
+         id="flowPara2013">Service</flowPara></flowRoot>    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:4,1;stroke-dashoffset:0"
+       d="M 477.85714,335.52305 L 511.42857,335.52305 L 510.71429,245.52305 L 579.28571,245.52305"
+       id="path2015" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 477.85714,369.80877 L 528.57143,369.80877 L 528.57143,329.80877 L 580,329.80877"
+       id="path2017" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 478.57143,402.66591 L 528.57143,401.95163 L 528.57143,408.3802 L 580,407.66591"
+       id="path2019" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 475.71429,435.52305 L 509.28571,435.52305 L 510,486.95163 L 582.14286,486.23734"
+       id="path2021" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 292.85714,355.52305 L 330,354.80877"
+       id="path2023" />
+    <path
+       sodipodi:type="arc"
+       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="path1950"
+       sodipodi:cx="179.28572"
+       sodipodi:cy="352.66592"
+       sodipodi:rx="32.857143"
+       sodipodi:ry="35"
+       d="M 197.59435,323.60313 A 32.857143,35 0 1 1 196.81963,323.06603"
+       sodipodi:start="5.3034219"
+       sodipodi:end="11.558474"
+       sodipodi:open="true"
+       transform="translate(-11.428568,5.714286)" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot1952"
+       transform="translate(-134.69216,137.10973)"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion1954"><rect
+           id="rect1956"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara1960">calc.jsp</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 235,356.23734 C 200.71429,356.23734 200.71429,356.23734 200.71429,356.23734"
+       id="path1972" />
+    <rect
+       style="opacity:0.21666667;fill:#3d2020;fill-opacity:1;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:4, 1;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect2246"
+       width="56.428566"
+       height="317.85715"
+       x="57.14286"
+       y="206.95161"
+       rx="4.7646294"
+       ry="7.7766709" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3221"
+       transform="translate(-214.7771,5.7407504)"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion3223"><rect
+           id="rect3225"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara3227">App</flowPara><flowPara
+         id="flowPara3229">Server</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3231"
+       transform="translate(232.36576,64.312179)"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion3233"><rect
+           id="rect3235"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara3237">SOAP</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3239"
+       transform="translate(249.50862,136.45504)"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion3241"><rect
+           id="rect3243"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara3245">local</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3247"
+       transform="translate(247.27783,197.54805)"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion3249"><rect
+           id="rect3251"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara3253">local</flowPara></flowRoot>    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3255"
+       transform="translate(235.13497,276.11948)"
+       style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion
+         id="flowRegion3257"><rect
+           id="rect3259"
+           width="170"
+           height="61.42857"
+           x="281.42856"
+           y="212.66591"
+           style="font-size:11px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara
+         id="flowPara3261">local</flowPara></flowRoot>    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="M 113.57143,238.80877 L 575.71429,238.80877"
+       id="path3263" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 112.85714,359.09448 C 135.71429,359.09448 135.71429,359.09448 135.71429,359.09448"
+       id="path3265" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)"
+       d="M 478.57143,334.09448 C 499.28571,291.95163 505.71429,287.66591 498.57143,273.3802 C 491.42857,259.09448 477.85714,254.09448 470.71429,253.3802 C 463.57143,252.66591 14.285714,252.66591 14.285714,252.66591 L 13.571429,234.09448 L 57.857143,234.80877"
+       id="path4244" />
+  </g>
+</svg>

Added: tuscany/java/sca/samples/host-webapp-calculator/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/pom.xml?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/pom.xml (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/pom.xml Fri Jan 23 08:58:16 2009
@@ -0,0 +1,166 @@
+<?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>2.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-host-webapp-calculator</artifactId>
+    <packaging>war</packaging>
+    <name>Apache Tuscany SCA Host Webapp Calculator Sample</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-distribution-api</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-webservice</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-webapp</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </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-surefire-plugin</artifactId>
+               <configuration>
+                   <skip>true</skip>
+               </configuration>
+           </plugin>
+           
+	       <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>test-ant-scripts</id>
+	                   <phase>package</phase>
+	                   <goals>
+	                       <goal>run</goal>
+	                   </goals>
+	                   <configuration>
+	                       <tasks>
+	                           <ant antfile="./build.xml" target="compile"/>
+	                       </tasks>
+	                   </configuration>
+	               </execution>
+	           </executions>
+	       </plugin>
+	       
+            <plugin>
+                <groupId>org.codehaus.cargo</groupId>
+                <artifactId>cargo-maven2-plugin</artifactId>
+                <version>1.0-beta-2</version>
+                <executions>
+                    <execution>
+                        <id>start-container</id>
+                        <phase>pre-integration-test</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-container</id>
+                        <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>stop</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <container>
+                        <containerId>jetty6x</containerId>
+                        <type>embedded</type>  
+                        <systemProperties>
+                            <org.apache.commons.logging.Log>org.apache.commons.logging.impl.SimpleLog</org.apache.commons.logging.Log>
+                        </systemProperties>
+                    </container>
+                    <wait>true</wait>
+                    <configuration>
+                        <properties>
+                            <cargo.servlet.port>8085</cargo.servlet.port>
+                        </properties>
+                        <deployables>
+                            <deployable>
+                                <location>
+                                    ${project.build.directory}/${project.build.finalName}.${project.packaging}
+                                </location>
+                                <pingURL>http://localhost:8085/sample-calculator-ws-webapp</pingURL>
+                                <type>war</type>
+                            </deployable>
+                        </deployables>
+                        <home>${project.build.directory}/cargo-jetty</home>
+                    </configuration>
+                </configuration>                
+            </plugin>	       
+       </plugins>       
+    </build>
+</project>

Propchange: tuscany/java/sca/samples/host-webapp-calculator/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,31 @@
+/*
+ * 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 calculator;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for the add service
+ */
+@Remotable
+public interface AddService {
+
+    double add(double n1, double n2);
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,34 @@
+/*
+ * 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 calculator;
+
+import org.osoa.sca.annotations.Service;
+
+/**
+ * An implementation of the Add service
+ */
+@Service(AddService.class)
+public class AddServiceImpl implements AddService {
+
+    public double add(double n1, double n2) {
+        System.err.println("Adding " + n1 + " to " + n2);
+        return n1 + n2;
+    }
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/AddServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,35 @@
+/*
+ * 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 calculator;
+
+
+/**
+ * The Calculator service interface.
+ */
+public interface CalculatorService {
+
+    double add(double n1, double n2);
+
+    double subtract(double n1, double n2);
+
+    double multiply(double n1, double n2);
+
+    double divide(double n1, double n2);
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,69 @@
+/*
+ * 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 calculator;
+
+import org.osoa.sca.annotations.Reference;
+
+/**
+ * An implementation of the Calculator service.
+ */
+public class CalculatorServiceImpl implements CalculatorService {
+
+    private AddService addService;
+    private SubtractService subtractService;
+    private MultiplyService multiplyService;
+    private DivideService divideService;
+
+    @Reference
+    public void setAddService(AddService addService) {
+        this.addService = addService;
+    }
+
+    @Reference
+    public void setSubtractService(SubtractService subtractService) {
+        this.subtractService = subtractService;
+    }
+
+    @Reference
+    public void setDivideService(DivideService divideService) {
+        this.divideService = divideService;
+    }
+
+    @Reference
+    public void setMultiplyService(MultiplyService multiplyService) {
+        this.multiplyService = multiplyService;
+    }
+
+    public double add(double n1, double n2) {
+        return addService.add(n1, n2);
+    }
+
+    public double subtract(double n1, double n2) {
+        return subtractService.subtract(n1, n2);
+    }
+
+    public double multiply(double n1, double n2) {
+        return multiplyService.multiply(n1, n2);
+    }
+
+    public double divide(double n1, double n2) {
+        return divideService.divide(n1, n2);
+    }
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/CalculatorServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java Fri Jan 23 08:58:16 2009
@@ -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 calculator;
+
+/**
+ * The interface for the divide service
+ */
+public interface DivideService {
+
+    double divide(double n1, double n2);
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,30 @@
+/*
+ * 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 calculator;
+
+/**
+ * An implementation of the Divide service.
+ */
+public class DivideServiceImpl implements DivideService {
+
+    public double divide(double n1, double n2) {
+        return n1 / n2;
+    }
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/DivideServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java Fri Jan 23 08:58:16 2009
@@ -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 calculator;
+
+/**
+ * The interface for the multiply service
+ */
+public interface MultiplyService {
+
+    double multiply(double n1, double n2);
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,30 @@
+/*
+ * 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 calculator;
+
+/**
+ * An implementation of the Multiply service.
+ */
+public class MultiplyServiceImpl implements MultiplyService {
+
+    public double multiply(double n1, double n2) {
+        return n1 * n2;
+    }
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/MultiplyServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java Fri Jan 23 08:58:16 2009
@@ -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 calculator;
+
+/**
+ * The interface for the subtract service
+ */
+public interface SubtractService {
+
+    double subtract(double n1, double n2);
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java Fri Jan 23 08:58:16 2009
@@ -0,0 +1,30 @@
+/*
+ * 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 calculator;
+
+/**
+ * An implementation of the subtract service.
+ */
+public class SubtractServiceImpl implements SubtractService {
+
+    public double subtract(double n1, double n2) {
+        return n1 - n2;
+    }
+
+}

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/java/calculator/SubtractServiceImpl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite Fri Jan 23 08:58:16 2009
@@ -0,0 +1,49 @@
+<?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"
+           targetNamespace="http://sample"
+           xmlns:sample="http://sample"
+           name="Calculator">
+
+    <component name="CalculatorServiceComponent">
+		<implementation.java class="calculator.CalculatorServiceImpl"/>
+        <reference name="addService" target="AddServiceComponent"/>  
+        <reference name="subtractService" target="SubtractServiceComponent"></reference>
+        <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
+        <reference name="divideService" target="DivideServiceComponent"></reference>
+    </component>
+
+    <component name="AddServiceComponent">
+        <implementation.java class="calculator.AddServiceImpl"/>
+    </component>
+
+    <component name="SubtractServiceComponent">
+        <implementation.java class="calculator.SubtractServiceImpl"/>
+    </component>
+
+    <component name="MultiplyServiceComponent">
+        <implementation.java class="calculator.MultiplyServiceImpl"/>
+    </component>
+
+    <component name="DivideServiceComponent">
+        <implementation.java class="calculator.DivideServiceImpl"/>
+    </component>
+    
+</composite>

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/resources/Calculator.composite
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml Fri Jan 23 08:58:16 2009
@@ -0,0 +1,23 @@
+<?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:Calculator"/>
+</contribution>
\ No newline at end of file

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/META-INF/sca-contribution.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jan 23 08:58:16 2009
@@ -0,0 +1,34 @@
+<?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-calculator-ws-webapp</d:artifactId>
+            <d:version>2.0-SNAPSHOT</d:version>
+            <d:type>war</d:type>
+        </d:moduleId>
+
+        <!-- TUSCANY-1986 -->
+        <d:inverse-classloading />
+    </d:environment>
+</web-app>

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/geronimo-web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite Fri Jan 23 08:58:16 2009
@@ -0,0 +1,24 @@
+<?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:sample="http://sample"
+           name="Calculator">
+    <include name="sample:Calculator"/>
+</composite>

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.composite
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml Fri Jan 23 08:58:16 2009
@@ -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 Calculator Web Service 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 id="WelcomeFileList">
+    <welcome-file>calc.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp (added)
+++ tuscany/java/sca/samples/host-webapp-calculator/src/main/webapp/calc.jsp Fri Jan 23 08:58:16 2009
@@ -0,0 +1,50 @@
+<%--
+ * 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.
+--%>
+
+<%@ page import="org.apache.tuscany.sca.host.embedded.SCADomain"%>
+<%@ page import="calculator.CalculatorService" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<%
+   SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
+   CalculatorService calculatorService = (CalculatorService)scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent");
+%>
+<html>
+<head><title>Calculator sample</title></head>
+
+<body>
+<table>
+    <tr>
+        <th>Expression</th><th>Result</th>
+    </tr>
+    <tr>
+        <td>2 + 3</td><td><%= calculatorService.add(2, 3) %></td>
+    </tr>
+    <tr>
+        <td>3 - 2</td><td><%= calculatorService.subtract(3, 2) %></td>
+    </tr>
+    <tr>
+        <td>3 * 2</td><td><%= calculatorService.multiply(3, 2) %></td>
+    </tr>
+    <tr>
+        <td>3 / 2</td><td><%= calculatorService.divide(3, 2) %></td>
+    </tr>    
+</table>
+</body>
+</html>

Added: tuscany/java/sca/samples/implementation-java-calculator/README
URL: http://svn.apache.org/viewvc/tuscany/java/sca/samples/implementation-java-calculator/README?rev=737093&view=auto
==============================================================================
--- tuscany/java/sca/samples/implementation-java-calculator/README (added)
+++ tuscany/java/sca/samples/implementation-java-calculator/README Fri Jan 23 08:58:16 2009
@@ -0,0 +1,97 @@
+Calculator Sample
+=================
+This sample implements a simple calculator using SCA components. 
+
+The README in the samples directory (the directory above this) provides 
+general instructions about building and running samples. Take a look there 
+first. 
+
+If you just want to run it to see what happens open a command prompt, navigate
+to this sample directory and do:
+
+ant run
+
+OR if you don't have ant, on Windows do
+
+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator.jar calculator.CalculatorClient
+
+and on *nix do
+
+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
+
+Sample Overview
+---------------
+The sample provides a single calculator service with a default SCA (java) 
+binding. The CalculatorClient exercises this interface by calling add, 
+subtract, multiply and divide operations. This results in messages passing to 
+the appropriate components in the composite across the local wires.
+
+calculator/
+  src/
+    main/
+      java/
+        calculator/
+          CalculatorService.java  - the first component, calls +-/* as 
+                                    appropriate
+          CalculatorServiceImpl.java
+          AddService.java         - adds two numbers
+          AddServiceImpl.java
+          SubtractService.java    - subtracts one number from another
+          SubtractServiceImpl.java
+          MultiplyService.java    - multiplies two numbers
+          MultiplyServiceImpl.java
+          DivideService.java      - divides one number by another
+          DivideServiceImpl.java
+          CalculatorClient.java   - starts the SCA Runtime and 
+                                    deploys the Calculator.composite. 
+                                    It then calls the deployed Calculator 
+                                    Components services
+      resources/
+        Calculator.composite      - the SCA assembly for this sample
+    test/
+      java/
+        calculator/
+          CalculatorTestCase.java - JUnit test case 
+  calculator.png                  - a pictorial representation of the sample 
+                                    .composite file
+  build.xml                       - the Ant build file
+  pom.xml                         - the Maven build file        
+
+Building And Running The Sample Using Ant
+-----------------------------------------
+With the binary distribution the sample can be built and run using Ant as 
+follows
+
+cd calculator
+ant compile
+ant run
+
+You should see the following output from the run target.
+
+run:
+     [java] 3 + 2=5.0
+     [java] 3 - 2=1.0
+     [java] 3 * 2=6.0
+     [java] 3 / 2=1.5
+
+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 calculator
+mvn
+
+You should see the following output from the test phase.
+
+-------------------------------------------------------
+ T E S T S
+-------------------------------------------------------
+Running calculator.CalculatorTestCase
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
+
+Results :
+
+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
+
+This shows that the Junit test cases have run successfully. 

Propchange: tuscany/java/sca/samples/implementation-java-calculator/README
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/samples/implementation-java-calculator/README
------------------------------------------------------------------------------
    svn:mime-type = text/plain