Moving 1.x trunk

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

22 files changed, 1307 insertions, 0 deletions

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/README b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/README
new file mode 100644
index 0000000000..be947b1923
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/README
@@ -0,0 +1,214 @@
+Hello World Web Service References using SDO Sample

+===================================================

+This sample demonstrates an SCA reference that uses a web service binding which works with SDO.  

+

+The README in the samples directory (the directory above this) provides 

+general instructions about building and running samples. Take a look there 

+first. 

+

+To run this sample

+------------------

+This sample is dependent on helloworld-ws-service. Open a command prompt to start

+the service. If you are running ant do the following:

+

+cd helloworld-ws-service

+ant run

+

+if you don't have ant, issue one of the following commands for windows or *nix:

+

+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer

+

+and on *nix do

+

+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer

+

+You should see the following output:

+

+Buildfile: build.xml

+

+run-server:

+     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

+om.util.StAXUtils).

+     [java] log4j:WARN Please initialize the log4j system properly.

+     [java] Aug 24, 2007 11:17:33 AM org.apache.catalina.core.StandardEngine sta

+rt

+     [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.ContextConfig d

+efaultWebConfig

+     [java] INFO: No default web.xml

+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

+ register

+     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.

+xsd

+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

+ register

+     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

+aglibrary_1_1.dtd

+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

+ register

+     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

+aglibrary_1_2.dtd

+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

+ register

+     [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt

+aglibrary_2_0.xsd

+     [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory

+ register

+     [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_ser

+vices_1_1.xsd

+     [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol ini

+t

+     [java] INFO: Initializing Coyote HTTP/1.1 on http-8085

+     [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol sta

+rt

+     [java] INFO: Starting Coyote HTTP/1.1 on http-8085

+     [java] Aug 24, 2007 11:17:34 AM org.apache.tuscany.sca.http.tomcat.TomcatSe

+rver addServletMapping

+     [java] INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService

+

+     [java] HelloWorld server started (press enter to shutdown)

+

+The server is now ready.

+

+

+Now, open another command window to run the client.  

+

+cd helloworld-ws-sdo

+ant run

+

+OR if you don't have ant, on Windows do

+

+java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-sdo.jar helloworld.HelloWorldClient

+

+and on *nix do

+

+java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-sdo.jar helloworl.HelloWorldClient

+

+You should be able to see the following result:

+

+Buildfile: build.xml

+

+run:

+     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

+om.util.StAXUtils).

+     [java] log4j:WARN Please initialize the log4j system properly.

+     [java] Injected helloWorldService

+     [java] Called getGreetings

+     [java] Hello David Haney

+

+BUILD SUCCESSFUL

+Total time: 9 seconds

+

+

+Sample Overview

+---------------

+The sample provides a single component that is wired to a reference with a 

+web service binding. The binding refers to WSDL that identifies the service

+exposed by the helloworld-ws-service sample. 

+

+helloworld-ws-sdo/

+  src/

+    main/

+      java/

+        helloworld/

+          HelloWorldService.java          - interface description for 

+                                            HelloWorldServiceComponent

+          HelloWorldServiceComponent.java - component implementation

+          HelloWorldClient.java           - starts the SCA Runtime and 

+                                            deploys the helloworldwsclient

+                                            .composite. It then calls the 

+                                            HelloWorldServiceComponent

+      resources/

+        wsdl

+          helloworld.wsdl                 - the service description that the 

+                                            SCA reference uses to bind to service. 

+      

+    test/

+      java/

+        helloworld/

+          HelloWorldClientTestCase.java   - JUnit test case

+        helloworld-ws-sdo.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

+-----------------------------------------

+You can build and run the sample with the binary distribution using Ant. 

+Make sure that you have started helloworld-ws-service which this sample is dependent on

+in a separate command window. You can either follow the instruction at the begining of this 

+sample file or if you want to build and run the service, follow the README under helloworld-ws-service.

+

+Now, let's build and run helloworld-ws-sdo sample:

+

+cd helloworld-ws-sdo                                             

+ant 

+ant run 

+

+You should see the following output from the run target.

+

+run:

+     [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.

+om.util.StAXUtils).

+     [java] log4j:WARN Please initialize the log4j system properly.

+     [java] Injected helloWorldService

+     [java] Called getGreetings

+     [java] Hello World

+

+Building And Running The Sample Using Maven 

+-------------------------------------------

+You can build and run the sample with either the binary or source distributions using Maven. Please note that you do not need to start helloworld-ws-service in this case since Maven does this for you.

+

+cd helloworld-ws-sdo

+mvn

+

+You should see the following output from the test phase.

+

+-------------------------------------------------------

+ T E S T S

+-------------------------------------------------------

+Running helloworld.HelloWorldClientTestCase

+log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

+Utils).

+log4j:WARN Please initialize the log4j system properly.

+log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX

+Utils).

+log4j:WARN Please initialize the log4j system properly.

+Aug 23, 2007 2:27:32 PM org.apache.catalina.core.StandardEngine start

+INFO: Starting Servlet Engine: Apache Tomcat/6.0.10

+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.ContextConfig defaultWebConf

+ig

+INFO: No default web.xml

+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

+WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd

+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

+WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

+1.dtd

+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

+WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_

+2.dtd

+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

+WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_

+0.xsd

+Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register

+WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs

+d

+Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol init

+INFO: Initializing Coyote HTTP/1.1 on http-8085

+Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol start

+INFO: Starting Coyote HTTP/1.1 on http-8085

+Aug 23, 2007 2:27:32 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServl

+etMapping

+INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService

+Injected helloWorldService

+Called getGreetings

+Aug 23, 2007 2:27:34 PM org.apache.coyote.http11.Http11Protocol destroy

+INFO: Stopping Coyote HTTP/1.1 on http-8085

+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.502 sec

+

+Results :

+

+Tests run: 1, Failures: 0, Errors: 0, Skipped: 0

+

+

+This shows that the Junit test cases have run successfully. 

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml
new file mode 100644
index 0000000000..401315d424
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/build.xml
@@ -0,0 +1,101 @@
+<!--
+ * 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="helloworld-ws-sdo" default="compile" basedir=".">
+    <property file="${user.home}/tuscany/build.properties" />
+    <property file="${user.home}/build.properties" />
+
+    <property name="server.class" value="helloworld.HelloWorldServer" />    
+    <property name="client.class" value="helloworld.HelloWorldClient" />
+    <property name="test.jar"   value="sample-helloworld-ws-sdo.jar" />
+
+    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
+
+    <target name="init">
+        <mkdir dir="target/classes"/>
+        <mkdir dir="target/sdo-source"/>
+    </target>
+        
+    <path id="project.classpath">
+        <pathelement path="target/classes"/>
+        <pathelement path="target/sdo-source"/>
+        <pathelement location="${tuscany.sca.manifest.location}"/>
+    </path>
+        
+    <target name="generate-sdo" depends="init">
+        <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true">
+            <arg value="-targetDirectory"/>
+            <arg value="target/sdo-source"/>
+            <arg value="-javaPackage"/>
+            <arg value="helloworld"/>
+            <arg value="-prefix"/>
+            <arg value="Helloworld"/>
+            <arg value="-noNotification"/>
+            <arg value="-noContainment"/>
+            <arg value="-noUnsettable"/>
+            <arg value="src/main/resources/wsdl/helloworld.wsdl"/>
+
+            <classpath refid="project.classpath"/>
+        </java>
+    </target>
+
+    <target name="compile" depends="init, generate-sdo">
+        <javac destdir="target/classes"
+               debug="on"
+               source="1.5"
+               target="1.5">
+            <src location="src/main/java"/>
+            <src location="target/sdo-source"/>
+            <classpath refid="project.classpath"/>
+        </javac> 
+        <copy todir="target/classes">
+            <fileset dir="src/main/resources"/>
+            <fileset dir="target/sdo-source"/>
+        </copy>
+        <jar destfile="target/${test.jar}" basedir="target/classes">
+            <manifest>
+                <attribute name="Main-Class" value="${test.class}" /> 
+            </manifest>
+        </jar>    	
+    </target>	
+	
+    <target name="run-classes">
+        <java classname="${client.class}" fork="true">
+        <classpath refid="project.classpath"/>        </java>
+    </target>
+
+    <target name="run-server">
+        <java classname="${server.class}" fork="true">
+            <classpath path="target/${test.jar}"/>
+            <classpath refid="project.classpath"/>
+        </java>    	
+    </target>
+
+    <target name="run">
+        <java classname="${client.class}" fork="true">
+            <classpath path="target/${test.jar}"/>
+            <classpath refid="project.classpath"/>
+        </java>    	
+    </target>
+		
+    <target name="clean">
+        <delete quiet="true" includeemptydirs="true">
+            <fileset dir="target"/>
+        </delete>
+    </target>
+</project>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
new file mode 100644
index 0000000000..bd2bba41db
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
new file mode 100644
index 0000000000..333ad53e0a
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
@@ -0,0 +1,150 @@
+<?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-ws-reference"

+   sodipodi:docname="helloworld-ws-reference.svg"

+   version="1.0"

+   inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-reference\helloworld-ws-reference.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="519.38407"

+     inkscape:cy="414.63224"

+     inkscape:document-units="px"

+     inkscape:current-layer="layer1"

+     inkscape:window-width="1054"

+     inkscape:window-height="721"

+     inkscape:window-x="85"

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

+  <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(0.991389,0,0,1,2.215655,0)">

+      <rect

+         rx="13.79423"

+         ry="12.692303"

+         y="192.00233"

+         x="258.3114"

+         height="299.99988"

+         width="446.72086"

+         id="rect2067"

+         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;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">helloworldwsclient</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="432.05917"

+       y="307.1676"

+       rx="6.9961648"

+       ry="7.1230249" />

+    <flowRoot

+       xml:space="preserve"

+       id="flowRoot2966"

+       transform="translate(172.4684,115.2291)"><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">Service</flowPara><flowPara

+         id="flowPara1885">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 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z "

+       id="path3017" />

+    <path

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

+       d="M 528.16111,337.17632 L 561.49615,337.17632 L 567.55706,350.3083 L 560.486,362.43014 L 528.16111,362.43014 L 535.73726,350.3083 L 528.16111,337.17632 z "

+       id="path3019" />

+    <path

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

+       d="M 651.01647,320.75333 L 718.80207,320.75333 L 731.12672,349.11387 L 716.74797,375.29287 L 651.01647,375.29287 L 666.4223,349.11387 L 651.01647,320.75333 z "

+       id="path1887" />

+    <flowRoot

+       xml:space="preserve"

+       id="flowRoot1889"

+       transform="translate(388.9491,122.6895)"

+       style="font-size:10px;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="flowRegion1891"><rect

+           id="rect1893"

+           width="170"

+           height="61.42857"

+           x="281.42856"

+           y="212.66591"

+           style="font-size:10px;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="flowPara1895">HelloWorld</flowPara><flowPara

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

+         id="flowPara1899" /></flowRoot>    <path

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

+       d="M 567.85714,349.09448 C 666.42857,348.3802 666.42857,348.3802 666.42857,348.3802"

+       id="path1901" />

+  </g>

+</svg>

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml
new file mode 100644
index 0000000000..e9f4a60d8c
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/pom.xml
@@ -0,0 +1,165 @@
+<?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.6-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+    <artifactId>sample-helloworld-ws-sdo</artifactId>
+    <name>Apache Tuscany SCA Sample HelloWorld Web Service SDO</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-embedded</artifactId>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-axis2</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-lib</artifactId>
+            <version>1.1.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sdo</groupId>
+            <artifactId>tuscany-sdo-impl</artifactId>
+            <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>backport-util-concurrent</groupId>
+                    <artifactId>backport-util-concurrent</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>backport-util-concurrent</groupId>
+            <artifactId>backport-util-concurrent</artifactId>
+            <version>3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-tomcat</artifactId>
+            <version>1.6-SNAPSHOT</version>
+            <scope>runtime</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.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/sdo-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-plugin</artifactId>
+                <version>1.1.1</version>
+                <executions>
+                    <execution>
+                        <id>generate-helloworld-sdo</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <schemaFile>${basedir}/src/main/resources/wsdl/helloworld.wsdl</schemaFile>
+                            <javaPackage>helloworld</javaPackage>
+                            <prefix>Helloworld</prefix>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noUnsettable>true</noUnsettable>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                   <execution>
+                        <id>generate-helloworld-sdo1</id>
+                        <phase>generate-sources</phase>
+                        <configuration>
+                            <schemaFile>${basedir}/src/main/resources/test.xsd</schemaFile>
+                            <javaPackage>model.sdo</javaPackage>
+                            <prefix>Entity</prefix>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noUnsettable>true</noUnsettable>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
new file mode 100644
index 0000000000..de4795ceaf
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
@@ -0,0 +1,44 @@
+/*
+ * 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 helloworld;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * This client program shows how to create an SCA runtime, start it, locate the
+ * HelloWorld service and invoke it.
+ */
+public class HelloWorldClient {
+
+    public final static void main(String[] args) throws Exception {
+        SCADomain scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
+        HelloWorldService helloWorldService =
+            scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
+
+        Name name = HelloworldFactory.INSTANCE.createName();
+
+        name.setFirst("David");
+        name.setLast("Haney");
+
+        String value = helloWorldService.getGreetings(name);
+        System.out.println(value);
+
+        scaDomain.close();
+    }
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
new file mode 100644
index 0000000000..c950f7df04
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
@@ -0,0 +1,33 @@
+/*
+ * 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 helloworld;
+
+import org.osoa.sca.annotations.Service;
+
+/**
+ * This class implements the HelloWorld service.
+ */
+@Service(HelloWorldService.class)
+public class HelloWorldImpl implements HelloWorldService {
+
+    public String getGreetings(Name name) {
+        return "Hello " + name.getFirst() + " " + name.getLast();
+    }
+
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
new file mode 100644
index 0000000000..e03ed4dc25
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
@@ -0,0 +1,46 @@
+/*
+ * 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 helloworld;
+
+import java.io.IOException;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+/**
+ * This server program shows how to create an SCA runtime, and start it which
+ * activates the helloworld Web service endpoint.
+ */
+public class HelloWorldServer {
+
+    public static void main(String[] args) {
+
+        SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");
+
+        try {
+            System.out.println("HelloWorld server started (press enter to shutdown)");
+            System.in.read();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
+        scaDomain.close();
+        System.out.println("HelloWorld server stopped");
+    }
+
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
new file mode 100644
index 0000000000..367c5b4a12
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
@@ -0,0 +1,29 @@
+/*
+ * 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 helloworld;
+
+import org.osoa.sca.annotations.Remotable;
+
+/**
+ * The interface for the helloworld service
+ */
+@Remotable
+public interface HelloWorldService {
+    public String getGreetings(Name name);
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
new file mode 100644
index 0000000000..711eef63b5
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
@@ -0,0 +1,42 @@
+/*
+ * 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 helloworld;
+
+/**
+ * The HelloWorld service implementation
+ */
+public class HelloWorldServiceComponent implements HelloWorldService {
+   
+    HelloWorldService helloWorldService;
+
+    public String getGreetings(Name name) {
+        System.out.println("Called getGreetings");
+        return helloWorldService.getGreetings(name);
+    }
+
+    public HelloWorldService getHelloWorldService() {
+        System.out.println("Got Injected helloWorldService");
+        return helloWorldService;
+    }
+
+    public void setHelloWorldService(HelloWorldService helloWorldService) {
+        System.out.println("Injected helloWorldService");        
+        this.helloWorldService = helloWorldService;
+    }
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
new file mode 100644
index 0000000000..39fa5d2d14
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BioTestCase.java
@@ -0,0 +1,51 @@
+/*
+ * 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 services.bcircle;
+
+import model.sdo.EntityFactory;
+import model.sdo.Laboratory;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+
+public class BioTestCase {
+
+    /**
+     * @param args
+     */
+    public static void main(String[] args) {
+        BiochemicalCircle biochemicalCircl = new BiochemicalCircleImpl();
+        Laboratory lab2 = biochemicalCircl.getLaboratory("Lab2"); //This invocation without use SCA works ok.
+
+        SCADomain scaDomain = SCADomain.newInstance("resources/clinicalLaboratory.composite");
+        BiochemicalCircle biochemicalCircle =
+            scaDomain.getService(BiochemicalCircle.class, "BiochemicalCircleComponent");
+        Laboratory lab = EntityFactory.INSTANCE.createLaboratory();
+        lab.setName("lab2");
+        biochemicalCircle.setLaboratory(lab); // this invocation works ok too
+
+        lab = biochemicalCircle.getLaboratory("Lab2"); // here I have an exception posted below.
+
+        //here I wait a moment before close scaDomain
+        System.out.println(lab.getName());
+
+        scaDomain.close();
+
+    }
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
new file mode 100644
index 0000000000..9d77e0cbd9
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircle.java
@@ -0,0 +1,29 @@
+/*
+ * 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 services.bcircle;
+
+import org.osoa.sca.annotations.Remotable;
+
+@Remotable
+public interface BiochemicalCircle {
+    void setLaboratory(model.sdo.Laboratory lab);
+
+    model.sdo.Laboratory getLaboratory(String name);
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
new file mode 100644
index 0000000000..287e8e22cb
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/java/services/bcircle/BiochemicalCircleImpl.java
@@ -0,0 +1,40 @@
+/*
+ * 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 services.bcircle;
+import model.sdo.EntityFactory;
+import model.sdo.Laboratory;
+
+import org.osoa.sca.annotations.Service;
+
+
+@Service(BiochemicalCircle.class)
+public class BiochemicalCircleImpl implements BiochemicalCircle{
+   public Laboratory getLaboratory(String name) {
+
+      Laboratory lab = EntityFactory.INSTANCE.createLaboratory();
+      lab.setName("Main Laboratory");
+      return lab;
+   }
+
+   public void setLaboratory(Laboratory lab) {
+      //sad method
+      System.out.println(lab.getName());
+   }
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..1c1216cc17
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/META-INF/sca-contribution.xml
@@ -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:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
+  <tuscany:sdo.types namespace="http://helloworld" location="wsdl/helloworld.wsdl"/>
+</contribution>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
new file mode 100644
index 0000000000..c255df2897
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
@@ -0,0 +1,32 @@
+<?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://helloworld"

+    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

+    name="helloworldws">

+    

+    <component name="HelloWorldServiceComponent">

+        <implementation.java class="helloworld.HelloWorldImpl" />
+        <service name="HelloWorldService">

+            <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />

+            <binding.ws uri="http://localhost:8085/HelloWorldService" />

+        </service>

+    </component>

+

+</composite>

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
new file mode 100644
index 0000000000..d4fba548d5
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
@@ -0,0 +1,33 @@
+<?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://helloworld"

+    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" xmlns:hw="http://helloworld"

+    name="helloworldwsclient">

+

+    <component name="HelloWorldServiceComponent">

+        <implementation.java class="helloworld.HelloWorldServiceComponent" />

+    </component>

+

+    <reference name="HelloWorldService" promote="HelloWorldServiceComponent/helloWorldService">

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

+        <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" />

+    </reference>

+

+</composite>

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/logging.properties
new file mode 100644
index 0000000000..3dca310cdb
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/logging.properties
@@ -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.    
+#
+#  $Rev$ $Date$
+#
+
+# Custom logging configuration for Tuscany samples
+# By default, only INFO level logging is enabled and ALL messages get sent to the console
+# For more messages from the runtime, uncomment specific settings at the end of this file
+handlers = java.util.logging.ConsoleHandler
+java.util.logging.ConsoleHandler.level = ALL
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+.level=INFO
+
+# Uncomment the next setting to get all Tuscany messages (this will be a lot)
+#org.apache.tuscany.level=FINEST
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
new file mode 100644
index 0000000000..56d47ef194
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/resources/clinicalLaboratory.composite
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sca:composite xmlns:federation="http://eclipse.org/SCAExample1/src/resources/federation"
+    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" name="clinicalLaboratory"
+    targetNamespace="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory">
+
+    <sca:component name="BiochemicalCircleComponent">
+        <sca:implementation.java class="services.bcircle.BiochemicalCircleImpl" />
+        <sca:service name="BiochemicalCircle">
+            <sca:interface.java interface="services.bcircle.BiochemicalCircle" />
+            <sca:binding.ws uri="http://localhost:8080/SCA1/MyServiceComponent" />
+        </sca:service>
+    </sca:component>
+    <!--
+    <sca:service name="BiochemicalCircle" promote="BiochemicalCircleComponent/BiochemicalCircle" />
+     -->
+</sca:composite>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/test.xsd b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/test.xsd
new file mode 100644
index 0000000000..415e1648d4
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/test.xsd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+    targetNamespace="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory"
+    xmlns:tns="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory"
+    elementFormDefault="qualified">
+    <complexType name="Practice">
+        <sequence>
+            <element name="name" type="string" />
+        </sequence>
+    </complexType>
+    <complexType name="Laboratory">
+        <sequence>
+            <element name="name" type="string" />
+            <element name="practices" type="tns:Practice" maxOccurs="unbounded" />
+        </sequence>
+    </complexType>
+</schema>
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
new file mode 100644
index 0000000000..2ecc0bea43
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
@@ -0,0 +1,88 @@
+<?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.    

+-->

+<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld"

+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"

+    xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld">

+

+    <wsdl:types>

+        <schema elementFormDefault="qualified" targetNamespace="http://helloworld"

+            xmlns="http://www.w3.org/2001/XMLSchema">

+

+            <element name="getGreetings">

+                <complexType>

+                    <sequence>

+                        <element name="name" type="tns:Name" />

+                    </sequence>

+                </complexType>

+            </element>

+

+            <element name="getGreetingsResponse">

+                <complexType>

+                    <sequence>

+                        <element name="getGreetingsReturn" type="xsd:string" />

+                    </sequence>

+                </complexType>

+            </element>

+

+            <complexType name="Name">

+                <sequence>

+                    <element name="first" type="xsd:string" />

+                    <element name="last" type="xsd:string" />

+                </sequence>

+            </complexType>

+

+        </schema>

+    </wsdl:types>

+

+    <wsdl:message name="getGreetingsRequest">

+        <wsdl:part element="tns:getGreetings" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:message name="getGreetingsResponse">

+        <wsdl:part element="tns:getGreetingsResponse" name="parameters" />

+    </wsdl:message>

+

+    <wsdl:portType name="HelloWorld">

+        <wsdl:operation name="getGreetings">

+            <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" />

+            <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" />

+        </wsdl:operation>

+    </wsdl:portType>

+

+    <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld">

+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+        <wsdl:operation name="getGreetings">

+            <wsdlsoap:operation soapAction="" />

+            <wsdl:input name="getGreetingsRequest">

+                <wsdlsoap:body use="literal" />

+            </wsdl:input>

+            <wsdl:output name="getGreetingsResponse">

+                <wsdlsoap:body use="literal" />

+            </wsdl:output>

+        </wsdl:operation>

+    </wsdl:binding>

+

+    <wsdl:service name="HelloWorldService">

+        <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort">

+            <wsdlsoap:address location="http://localhost:8085/HelloWorldService" />

+        </wsdl:port>

+    </wsdl:service>

+

+</wsdl:definitions>

diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
new file mode 100644
index 0000000000..11564c370f
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
@@ -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 helloworld;
+
+import junit.framework.Assert;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test case for helloworld web service client 
+ */
+public class HelloWorldClientTestCase {
+
+    private HelloWorldService helloWorldService;
+    private SCADomain scaDomain;
+    
+    private SCATestCaseRunner server;
+
+    @Before
+    public void startClient() throws Exception {
+        try {
+            scaDomain = SCADomain.newInstance("helloworldwsclient.composite");
+            helloWorldService = scaDomain.getService(HelloWorldService.class, "HelloWorldServiceComponent");
+    
+            server =  new SCATestCaseRunner(HelloWorldTestServer.class);
+            server.before();
+
+        } catch (Throwable e) {
+            e.printStackTrace();
+        }
+    }
+    
+    @Test
+    public void testWSClient() throws Exception {
+        Name name = HelloworldFactory.INSTANCE.createName();
+        name.setFirst("John");
+        name.setLast("Smith");
+        String msg = helloWorldService.getGreetings(name);
+        Assert.assertEquals("Hello John Smith", msg);
+    }
+    
+    @After
+    public void stopClient() throws Exception {
+    	server.after();
+        scaDomain.close();
+    }
+
+}
diff --git a/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
new file mode 100644
index 0000000000..4b0c40dafd
--- /dev/null
+++ b/sca-java-1.x/trunk/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
@@ -0,0 +1,55 @@
+/*
+ * 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 helloworld;
+
+import java.io.IOException;
+import java.net.Socket;
+
+import org.apache.tuscany.sca.host.embedded.SCADomain;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Starts up the SCA runtime which starts listening for service requests
+ */
+public class HelloWorldTestServer {
+
+    private SCADomain scaDomain;
+
+        @Before
+	public void startServer() throws Exception {
+            try {
+                scaDomain = SCADomain.newInstance("helloworldws.composite");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+	}
+
+	@Test
+	public void testPing() throws IOException {
+		new Socket("127.0.0.1", 8085);
+	}
+
+	@After
+	public void stopServer() throws Exception {
+            scaDomain.close();
+	}
+
+}