31 files changed, 0 insertions, 2220 deletions
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/README b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/README
deleted file mode 100644
index aa4819927a..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/README
+++ /dev/null
@@ -1,92 +0,0 @@
-Hello World Web Service SDO WebApp Sample
-=========================================
-This sample demonstrates an SCA web service binding which works with
-SDO and runs as a web application.  
-
-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 is built and copied to your web app container. 
-See the sections below for instructions on building the war.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-   http://localhost:8080/sample-helloworld-ws-sdo-webapp
-
-The port and hostname will of course vary depending on your local installation.
-
-The resulting web page displayed should show:
-
-   Hello John Smith, Jane Doe!
-   
-Sample Overview
----------------
-The sample builds a war with a single JSP (HelloWorld.jsp). This JSP 
-calls an SCA component with an SDO parameter. This in turn calls another
-SCA component with the SDO parameter. The contents of the SDO are then 
-returned as a simple string. This sample shows how SDO objects can 
-be passed into and between services in the context of a web application. 
-
-
-helloworld-jsonrpc-webapp/
-  src/
-    main/
-      java/
-        helloworld/ 
-          HelloWorld.java             - service interface
-          HelloWorldComponent.java    - first service implementation
-          HelloWorldmpl.java          - second service implementation
-      resources/
-        wsdl/
-          helloworld.wsdl             - the web services description
-          helloworld.xsd              - the SDO description
-        helloworldws.composite        - the SCA assembly for this sample
-      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
-        HelloWorld.jsp                - the web application that calls the 
-                                        SCA service passing in an SDO   
-           
-  helloworld-ws-sdo-webapp.png        - a pictorial representation of the 
-                                        sample .composite file
-  build.xml                           - the Ant build file 
-  pom.xml                             - the Maven build file     
-
-Building The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built using Ant as 
-follows
-
-cd helloworld-ws-sdo-webapp
-ant package
-
-This should result in a war file (sample-helloworld-ws-sdo-webapp.war) in the target 
-directory. Copy this war file to your web app deployment directory in your
-web app container. 
-
-The process for getting the web app running will depend on which web app container
-you are using. For example, if you are using Tomcat then it is simply a matter
-of copying the WAR file to the webapps directory. 
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-helloworld-ws-sdo-webapp
-
-The port and hostname will of course vary depending on your local installation. 
-
-Building The Sample Using Maven
--------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When using Maven you don't need to run the helloworld-
-ws-service sample first as Maven does this for you.
-
-cd helloworld-ws-sdo-webapp
-mvn
-
-That should end with "BUILD SUCCESSFUL" and create the target/sample-helloworld-ws-sdo-webapp.war
-which you can copy to your server.
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/build.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/build.xml
deleted file mode 100644
index 386008e707..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/build.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<!DOCTYPE project [
-<!ENTITY buildDependency SYSTEM "build-dependency.xml">
-]>
-	
-<project name="sample-helloworld-ws-sdo-webapp" default="compile">
-	&buildDependency;
-	
-    <property file="${user.home}/tuscany/build.properties" />
-    <property file="${user.home}/build.properties" />
-
-    <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
-    <property name="tuscany.sca.lib.location" value="../../lib"/>
-    <property name="tuscany.sca.modules.location" value="../../modules"/>
-            
-    <path id="project.classpath">
-        <pathelement path="target/classes"/>
-        <pathelement path="target/sdo-source"/>
-        <pathelement location="${tuscany.sca.manifest.location}"/>
-    </path>
-    	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-        <mkdir dir="target/sdo-source"/>
-    </target>
-	
-    <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.type"/>
-            <arg value="-prefix"/>
-            <arg value="Type"/>
-            <arg value="-noNotification"/>
-            <arg value="src/main/resources/wsdl/helloworld.xsd"/>
-
-            <classpath refid="project.classpath"/>
-        </java>
-        <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="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"/>
-        </copy>
-        <war destfile="target/sample-helloworld-ws-sdo-webapp.war" 
-             webxml="src/main/webapp/WEB-INF/web.xml">
-            <fileset dir="src/main/webapp"/>       	
-            <lib refid="tuscany.jars"/>
-            <lib refid="3rdparty.jars"/>
-            <classes dir="target/classes"/>
-        </war>
-    </target>	
-	
-    <target name="package" depends="compile"/>
-		
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
deleted file mode 100644
index 2590f02a45..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.png
+++ /dev/null
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
deleted file mode 100644
index 56a29db23c..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/helloworld-ws-sdo-webapp.svg
+++ /dev/null
@@ -1,221 +0,0 @@
-<?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-panic\sca\samples\helloworld-ws-sdo-webapp"
-   sodipodi:docname="helloworld-ws-sdo-webapp.svg"
-   version="1.0"
-   inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\helloworld-ws-sdo-webapp\helloworld-ws-sdo-webapp.png"
-   inkscape:export-xdpi="52.84"
-   inkscape:export-ydpi="52.84"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <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="474.33468"
-     inkscape:cy="392.43347"
-     inkscape:document-units="px"
-     inkscape:current-layer="g3216"
-     inkscape:window-width="1163"
-     inkscape:window-height="721"
-     inkscape:window-x="357"
-     inkscape:window-y="72" />
-  <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">helloworldws</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="339.20203"
-       y="307.1676"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2966"
-       transform="translate(79.611257,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:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 322.05153,339.0146 L 355.38657,339.0146 L 361.44748,352.14658 L 354.37642,364.26842 L 322.05153,364.26842 L 329.62768,352.14658 L 322.05153,339.0146 z "
-       id="path3017" />
-    <path
-       style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 435.30397,337.17632 L 468.63901,337.17632 L 474.69992,350.3083 L 467.62886,362.43014 L 435.30397,362.43014 L 442.88012,350.3083 L 435.30397,337.17632 z "
-       id="path3019" />
-    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.76309967px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 230.68358,326.42055 L 285.13117,326.42055 L 295.03072,351.41286 L 283.48124,374.4827 L 230.68358,374.4827 L 243.05804,351.41286 L 230.68358,326.42055 z "
-       id="path2180" />
-    <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="rect2182"
-       width="115.66247"
-       height="85.862968"
-       x="535.82629"
-       y="305.44873"
-       rx="6.9961648"
-       ry="7.1230249" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2184"
-       transform="translate(283.37839,113.51021)"><flowRegion
-         id="flowRegion2186"><rect
-           id="rect2188"
-           width="170"
-           height="61.42857"
-           x="281.42856"
-           y="212.66591" /></flowRegion><flowPara
-         id="flowPara2194">HelloWorld</flowPara><flowPara
-         id="flowPara2204">Impl</flowPara></flowRoot>    <path
-       style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 518.67581,337.29571 L 552.01085,337.29571 L 558.07176,350.42769 L 551.0007,362.54953 L 518.67581,362.54953 L 526.25196,350.42769 L 518.67581,337.29571 z "
-       id="path2196" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 473.57143,350.52305 C 525,350.52305 526.42857,350.52305 526.42857,350.52305"
-       id="path2206" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 295,351.52305 C 329.28571,351.52305 329.28571,351.52305 329.28571,351.52305"
-       id="path2208" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot2210"><flowRegion
-         id="flowRegion2212"><rect
-           id="rect2214"
-           width="27.857143"
-           height="15.714286"
-           x="483.57144"
-           y="328.38019" /></flowRegion><flowPara
-         id="flowPara2216">SDO</flowPara></flowRoot>    <rect
-       style="opacity:1;fill:#e4a637;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.32558763;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect2218"
-       width="72.069756"
-       height="85.64119"
-       x="130.03654"
-       y="303.41675"
-       rx="1.4370956"
-       ry="0.69386131" />
-    <flowRoot
-       xml:space="preserve"
-       id="flowRoot3194"
-       transform="matrix(0.7837401,0,0,1,28.844049,-2.1428568)"><flowRegion
-         id="flowRegion3196"><rect
-           id="rect3198"
-           width="95.714287"
-           height="22.857143"
-           x="135.71428"
-           y="310.52304" /></flowRegion><flowPara
-         id="flowPara3200">HelloWorld.jsp</flowPara></flowRoot>    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 202.14286,350.52305 C 242.85714,350.52305 242.85714,350.52305 242.85714,350.52305"
-       id="path3202" />
-    <g
-       id="g3216"
-       transform="matrix(1.4466337,0,0,1.2696311,-263.94558,-87.265114)">
-      <rect
-         rx="13.79423"
-         ry="12.692303"
-         y="192.00233"
-         x="258.3114"
-         height="299.99988"
-         width="446.72086"
-         id="rect3218"
-         style="opacity:0.18888889;fill:#223756;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      <text
-         xml:space="preserve"
-         style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans"
-         x="130"
-         y="179.09448"
-         id="text4213"
-         transform="matrix(0.69126,0,0,0.7876304,182.45502,68.732653)"><tspan
-           sodipodi:role="line"
-           id="tspan4215"
-           x="130"
-           y="179.09448">sample-helloworld-ws-sdo-webapp.war</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/pom.xml
deleted file mode 100644
index 858105f9ea..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/pom.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.5.1</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-helloworld-ws-sdo-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample HelloWorld Web Service SDO WebApp</name>
-
-    <repositories>
-        <repository>
-            <id>apache.incubator</id>
-            <url>http://people.apache.org/repo/m2-incubating-repository</url>
-        </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.5.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>1.5.1</version>
-        </dependency>
-    
-        <dependency>
-            <groupId>org.apache.tuscany.sdo</groupId>
-            <artifactId>tuscany-sdo-api-r2.1</artifactId>
-            <version>1.1.1</version>
-        </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.5.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-<!-- [rfeng] It doesn't work with the embedded Tomcat, see TUSCANY-1460 -->
-<!--         
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5.1</version>
-            <scope>runtime</scope>
-        </dependency>
--->        
-
-        <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- marking dependency as provided to exclude from war file -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.4</version>
-            <scope>runtime</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>
-                            <schemaFiles>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/helloworld.xsd</fileName>
-                                    <javaPackage>helloworld.type</javaPackage>
-                                    <prefix>Type</prefix>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                                <configuration>
-                                    <fileName>${basedir}/src/main/resources/wsdl/helloworld.wsdl</fileName>
-                                    <javaPackage>helloworld</javaPackage>
-                                    <prefix>Helloworld</prefix>
-                                    <noNotification>true</noNotification>
-                                </configuration>
-                            </schemaFiles>
-                        </configuration>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.tuscany.sca</groupId>
-                <artifactId>tuscany-maven-ant-generator</artifactId>
-                <version>1.5.1</version>
-                <executions>
-                    <execution>
-                        <configuration>
-                            <buildDependencyFileOnly>true</buildDependencyFileOnly>
-                        </configuration>                    
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>             
-        </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
deleted file mode 100644
index eb82418516..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorld.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.    
- */
-
-/**
- * HelloWorld.java
- *
- * This file was auto-generated from WSDL
- * by the Apache Axis2 version: #axisVersion# #today#
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/*
- * HelloWorld java interface
- */
-
-@Remotable
-public interface HelloWorld {
-
-    /**
-     * Auto generated method signatures
-     * 
-     * @param getGreetings
-     */
-    public java.lang.String getGreetings(helloworld.Party getGreetings);
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
deleted file mode 100644
index fea4e2a16c..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldComponent.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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;
-
-
-public class HelloWorldComponent implements HelloWorld {
-
-    HelloWorld helloWorld;
-
-    public String getGreetings(Party party)  {
-        System.out.println("Called getGreetings");
-        return helloWorld.getGreetings(party);
-    }
-
-    public HelloWorld getHelloWorld() {
-        System.out.println("Got Injected helloWorld");      
-        return helloWorld;
-    }
-    
-    public void setHelloWorld(HelloWorld helloWorld) {
-        System.out.println("Injected helloWorld");        
-        this.helloWorld = helloWorld;
-    }
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 3d6576aca0..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.util.List;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloWorld.class)
-public class HelloWorldImpl implements HelloWorld {
-
-    public String getGreetings(Party party) {
-        System.out.println("Greeting party");
-        StringBuffer greetings = new StringBuffer();
-        greetings.append("Hello ");
-        List<Person> people = party.getPeople();
-        int i=0;
-        for (Person person : people) {
-            greetings.append(person.getFirstName());
-            greetings.append(" ");
-            greetings.append(person.getLastName());
-            i++;
-            if (i < people.size()) {
-                greetings.append(", ");
-            }
-        }
-        greetings.append("!");
-        
-        return greetings.toString();
-    }
-
-}
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
deleted file mode 100644
index 34396b1b02..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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"
-            xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"
-            name="helloworldws">
-            
-    <service name="HelloWorld" promote="HelloWorldImpl">
-        <interface.java interface="helloworld.HelloWorld" />
-        <binding.ws wsdlElement="http://helloworld#wsdl.binding(HelloWorldSoapBinding)"/>
-    </service>
-    
-    <component name="HelloWorldImpl">
-        <implementation.java class="helloworld.HelloWorldImpl" />
-    </component>
-
-    <component name="HelloWorldServiceComponent">
-        <implementation.java class="helloworld.HelloWorldComponent"/>
-        <reference name="helloWorld" >
-            <interface.java interface="helloworld.HelloWorld" />
-            <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)"/>
-        </reference>
-    </component>
-
-</composite>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index fe79094b94..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,111 +0,0 @@
-<?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:hw="http://helloworld/type"
-    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:tns="http://helloworld"
-            xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <import namespace="http://helloworld/type"
-                schemaLocation="helloworld.xsd" />
-
-            <element name="getGreetings">
-                <complexType>
-                    <sequence>
-                        <element name="party" type="tns:Party" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="getGreetingsResponse">
-                <complexType>
-                    <sequence>
-                        <element name="getGreetingsReturn"
-                            type="xsd:string" />
-                    </sequence>
-                </complexType>
-            </element>
-
-            <complexType name="Party">
-                <sequence>
-                    <element name="people" type="tns:Person"
-                        maxOccurs="unbounded" />
-                </sequence>
-            </complexType>
-
-            <complexType name="Person">
-                <complexContent>
-                    <extension base="hw:Person_Base">
-                        <sequence>
-                            <element name="lastName" type="xsd:string" />
-                        </sequence>
-                    </extension>
-                </complexContent>
-            </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:8080/sample-helloworld-ws-sdo-webapp/HelloWorld" />
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
deleted file mode 100644
index a0b7c37cd9..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/resources/wsdl/helloworld.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://helloworld/type"
-    xmlns:tns="http://helloworld/type"
-    elementFormDefault="qualified">
-    
-    <complexType name="Person_Base">
-        <sequence>
-            <element name="firstName" type="string" />
-        </sequence>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
deleted file mode 100644
index 4657c6cdc1..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/HelloWorld.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<%--
- * 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="helloworld.HelloWorld" %>
-<%@ page import="helloworld.HelloworldFactory"%>
-<%@ page import="helloworld.Party"%>
-<%@ page import="helloworld.Person"%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
-    SCADomain scaDomain = (SCADomain) application.getAttribute("org.apache.tuscany.sca.SCADomain");
-    HelloWorld helloWorld = (HelloWorld)scaDomain.getService(HelloWorld.class, "HelloWorldServiceComponent");
-%>
-<html>
-<head><title>Hello World SDO sample</title></head>
-
-<body>
-<%
-	Party party = HelloworldFactory.INSTANCE.createParty();
-	Person person = HelloworldFactory.INSTANCE.createPerson();
-	person.setFirstName("John");
-	person.setLastName("Smith");
-	party.getPeople().add(person);
-	person = HelloworldFactory.INSTANCE.createPerson();
-	person.setFirstName("Jane");
-	person.setLastName("Doe");
-	party.getPeople().add(person);
-%>
-<%= helloWorld.getGreetings(party) %>
-</body>
-</html>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 5b2179a9ba..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?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:helloworldws"/>
-</contribution>
-\ No newline at end of file
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 4f4ffd3f46..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0"
-    xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
-    <d:environment>
-        <d:moduleId>
-            <d:groupId>org.apache.tuscany.sca</d:groupId>
-            <d:artifactId>sample-helloworld-ws-sdo-webapp</d:artifactId>
-            <d:version>1.5.1</d:version>
-            <d:type>war</d:type>
-        </d:moduleId>
-        
-        <!-- Using the shared library -->
-        <d:dependencies>
-            <d:dependency>
-                <d:groupId>org.apache.geronimo.configs</d:groupId>
-                <d:artifactId>sharedlib</d:artifactId>
-            </d:dependency>
-        </d:dependencies>
-
-		<!-- TUSCANY-2622 -->
-		<d:hidden-classes>
-			<d:filter>org.apache.axiom</d:filter>
-			<d:filter>org.apache.axis2</d:filter>
-			<d:filter>org.apache.commons</d:filter>
-			<d:filter>org.jdom</d:filter>
-		</d:hidden-classes>	
-		
-    </d:environment>
-</web-app>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 257e65aad4..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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 Hello World Web Service SDO 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>
-  
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/services/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>HelloWorld.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/README b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/README
deleted file mode 100644
index be947b1923..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/README
+++ /dev/null
@@ -1,214 +0,0 @@
-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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/build.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/build.xml
deleted file mode 100644
index 401315d424..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/build.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<!--
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/helloworld-ws-sdo.png b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
deleted file mode 100644
index bd2bba41db..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/helloworld-ws-sdo.png
+++ /dev/null
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
deleted file mode 100644
index 333ad53e0a..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/helloworld-ws-sdo.svg
+++ /dev/null
@@ -1,150 +0,0 @@
-<?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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/pom.xml b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/pom.xml
deleted file mode 100644
index 5a19969fcc..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/pom.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * Licensed to the Apache Software Foundation (ASF) under one
-    * or more contributor license agreements.  See the NOTICE file
-    * distributed with this work for additional information
-    * regarding copyright ownership.  The ASF licenses this file
-    * to you under the Apache License, Version 2.0 (the
-    * "License"); you may not use this file except in compliance
-    * with the License.  You may obtain a copy of the License at
-    * 
-    *   http://www.apache.org/licenses/LICENSE-2.0
-    * 
-    * Unless required by applicable law or agreed to in writing,
-    * software distributed under the License is distributed on an
-    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    * KIND, either express or implied.  See the License for the
-    * specific language governing permissions and limitations
-    * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-sca</artifactId>
-        <version>1.5.1</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.5.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.5.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.5.1</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.5.1</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.5.1</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>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index de4795ceaf..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c950f7df04..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index e03ed4dc25..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 367c5b4a12..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
deleted file mode 100644
index 711eef63b5..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/java/helloworld/HelloWorldServiceComponent.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
deleted file mode 100644
index c255df2897..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
deleted file mode 100644
index d4fba548d5..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/helloworldwsclient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-<?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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/logging.properties b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/logging.properties
deleted file mode 100644
index 3dca310cdb..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/logging.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 2ecc0bea43..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,88 +0,0 @@
-<?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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
deleted file mode 100644
index 11564c370f..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldClientTestCase.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * 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/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
deleted file mode 100644
index 4b0c40dafd..0000000000
--- a/sca-java-1.x/tags/1.5.1-RC4/samples/helloworld-ws-sdo/src/test/java/helloworld/HelloWorldTestServer.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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();
-	}
-
-}