Moving 1.x trunk

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

14 files changed, 0 insertions, 890 deletions

diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/README b/branches/sca-java-1.x/samples/simple-callback-ws/README
deleted file mode 100644
index 6b27718f74..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/README
+++ /dev/null
@@ -1,144 +0,0 @@
-Simple Callback Sample Using Web Services
-=========================================
-This sample demonstrates asynchronous messaging using a callback over the
-Web Service binding.  It is very similar to the simple-callback sample.
-The only differences are that simplecallback.composite has been updated
-to use the Web Service binding, and there is a simplecallback.wsdl file.
-
-The README in the samples directory (the directory above this) provides 
-general instructions about building and running samples. Take a look there 
-first. 
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-simple-callback.jar simplecallback.SimpleCallbackClient
-
-
-Sample Overview
----------------
-The sample provides a single composite with two components. MyClientComponent is 
-wired to MyServiceComponent. The interface of MyServiceComponent describes one
-method as ONEWAY and with a callback semantic. When a message passes from 
-client to service the response is returned via the callback asynchronously.  
-
-simple-callback/
-  src/
-    main/
-      java/
-        simplecallback/
-          MyClient.java           - client interface 
-          MyClientImpl.java       - implements the client and service callback
-                                    interfaces
-          MyService.java          - service interface
-          MyServiceCallback.java  - service callback interface, implemented by the 
-                                    client
-          MyServiceImpl.java      - implements the service interface
-          SimpleCallbackClient.java - starts the SCA Runtime and 
-                                    deploys the simplecallback.composite. 
-                                    It then calls MyClientComponent which in turn
-                                    calls MyServiceComponent
-      resources/
-        simplecallback.composite  - the SCA assembly for this sample
-        wsdl/
-          simplecallback.wsdl     - the service description and callback binding  
-    test/
-      java/
-        simplecallback/
-          SimpleCallbackTestCase.java - JUnit test case 
-  simple-callback.png             - a pictorial representation of the sample 
-                                    .composite file
-  build.xml                       - the Ant build file
-  pom.xml                         - the Maven build file        
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as 
-follows
-
-cd simple-callback-ws
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
-     [java] 14-Jan-2008 14:25:02 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceCallbackCo
-mponent
-     [java] 14-Jan-2008 14:25:02 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
-     [java] INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceComponent
-     [java] Main thread Thread[main,5,main]
-     [java] aClientMethod on thread Thread[main,5,main]
-     [java] aClientMethod return from someMethod on thread Thread[main,5,main]
-     [java] setMyServiceCallback on thread Thread[pool-1-thread-2,5,main]
-     [java] someMethod on thread Thread[pool-1-thread-2,5,main]
-     [java] receiveResult on thread Thread[pool-1-thread-4,5,main]
-     [java] Result: -> someMethod -> receiveResult
-
-
-Building And Running The Sample Using Maven 
--------------------------------------------
-With either the binary or source distributions the sample can be built and run 
-using Maven as follows. 
-
-cd simple-callback-ws
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running simplecallback.SimpleCallbackTestCase
-14-Jan-2008 14:26:28 org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-14-Jan-2008 14:26:28 org.apache.catalina.startup.ContextConfig defaultWebConfig
-INFO: No default web.xml
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-1.dtd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-2.dtd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-14-Jan-2008 14:26:28 org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-14-Jan-2008 14:26:28 org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:26:28 org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-14-Jan-2008 14:26:28 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceCallbackComponent
-14-Jan-2008 14:26:28 org.apache.tuscany.sca.http.tomcat.TomcatServer addServletM
-apping
-INFO: Added Servlet mapping: http://L3AW203:8085/MyServiceComponent
-Main thread Thread[main,5,main]
-aClientMethod on thread Thread[main,5,main]
-aClientMethod return from someMethod on thread Thread[main,5,main]
-Sleeping ...
-setMyServiceCallback on thread Thread[pool-1-thread-1,5,main]
-someMethod on thread Thread[pool-1-thread-1,5,main]
-receiveResult on thread Thread[pool-1-thread-2,5,main]
-Result: -> someMethod -> receiveResult
-14-Jan-2008 14:26:31 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.312 sec
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/build.xml b/branches/sca-java-1.x/samples/simple-callback-ws/build.xml
deleted file mode 100644
index 10b69bd395..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/build.xml
+++ /dev/null
@@ -1,72 +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="simple-callback-ws" default="compile">
-    <property name="test.class" value="simplecallback.SimpleCallbackClient" />
-	<property name="test.jar"   value="sample-simple-callback-ws.jar" />
-	
-    <target name="init">
-        <mkdir dir="target/classes"/>
-    </target>
-	
-    <target name="compile" depends="init">
-        <javac srcdir="src/main/java"
-               destdir="target/classes"
-               debug="on"
-               source="1.5"
-               target="1.5">
-            <classpath>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </javac> 
-        <copy todir="target/classes">
-            <fileset dir="src/main/resources"/>
-        </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="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/classes"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>
-    </target>
-	
-    <target name="run">
-        <java classname="${test.class}"
-              fork="true">
-            <classpath>
-                <pathelement path="target/${test.jar}"/>
-            	<pathelement location="../../lib/tuscany-sca-manifest.jar"/>
-            </classpath>
-        </java>    	
-    </target>
-	
-    <target name="clean">
-        <delete quiet="true" includeemptydirs="true">
-            <fileset dir="target"/>
-        </delete>
-    </target>
-</project>
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/pom.xml b/branches/sca-java-1.x/samples/simple-callback-ws/pom.xml
deleted file mode 100644
index 46896f4afd..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/pom.xml
+++ /dev/null
@@ -1,79 +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.6-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>sample-simple-callback-ws</artifactId>
-    <name>Apache Tuscany SCA Sample Simple Callback WebService</name>
-
-    <repositories>
-       <repository>
-          <id>apache.incubator</id>
-          <url>http://people.apache.org/repo/m2-incubating-repository</url>
-       </repository>
-    </repositories>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-embedded</artifactId>
-            <version>1.6-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-tomcat</artifactId>
-            <version>1.6-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.5</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>${artifactId}</finalName>
-    </build>
-
-</project>
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/simple-callback-ws.png b/branches/sca-java-1.x/samples/simple-callback-ws/simple-callback-ws.png
deleted file mode 100644
index 1b6353f5cf..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/simple-callback-ws.png
+++ /dev/null
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/simple-callback-ws.svg b/branches/sca-java-1.x/samples/simple-callback-ws/simple-callback-ws.svg
deleted file mode 100644
index 7d9e3de510..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/simple-callback-ws.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\simple-callback"

-   sodipodi:docname="simple-callback.svg"

-   version="1.0">

-  <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="375"

-     inkscape:cy="414.63224"

-     inkscape:document-units="px"

-     inkscape:current-layer="layer1"

-     inkscape:window-width="1054"

-     inkscape:window-height="721"

-     inkscape:window-x="74"

-     inkscape:window-y="306" />

-  <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">

-      <rect

-         rx="15.307091"

-         ry="12.692303"

-         y="192.00233"

-         x="258.31146"

-         height="299.99988"

-         width="495.71429"

-         id="rect2067"

-         style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.99999964;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">simplecallback</flowPara></flowRoot>      <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="rect1883"

-         width="115.66247"

-         height="85.862968"

-         x="549.39777"

-         y="308.7417"

-         rx="6.9961648"

-         ry="7.1230249" />

-      <flowRoot

-         xml:space="preserve"

-         id="flowRoot1885"

-         transform="translate(281.807,102.8031)"><flowRegion

-           id="flowRegion1887"><rect

-             id="rect1889"

-             width="170"

-             height="61.42857"

-             x="281.42856"

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

-           id="flowPara1891">MyService</flowPara><flowPara

-           id="flowPara1915">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 532.24723,340.58867 L 565.58227,340.58867 L 571.64318,353.72065 L 564.57212,365.84249 L 532.24723,365.84249 L 539.82338,353.72065 L 532.24723,340.58867 z "

-         id="path1895" />

-    </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.91632"

-       y="310.73904"

-       rx="6.9961648"

-       ry="7.1230249" />

-    <flowRoot

-       xml:space="preserve"

-       id="flowRoot2966"

-       transform="translate(72.32554,104.8005)"><flowRegion

-         id="flowRegion2968"><rect

-           id="rect2970"

-           width="170"

-           height="61.42857"

-           x="281.42856"

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

-         id="flowPara2972">MyClient</flowPara><flowPara

-         id="flowPara1913">Component</flowPara></flowRoot>    <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 436.01825,340.74775 L 469.35329,340.74775 L 475.4142,353.87973 L 468.34314,366.00157 L 436.01825,366.00157 L 443.5944,353.87973 L 436.01825,340.74775 z "

-       id="path3019" />

-    <path

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

-       d="M 474.28571,353.3802 L 539.28571,354.09448"

-       id="path1917"

-       inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\simple-callback\simple-callback.png"

-       inkscape:export-xdpi="52.84"

-       inkscape:export-ydpi="52.84" />

-  </g>

-</svg>

diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
deleted file mode 100644
index 4cc00d6d0f..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyClient.java
+++ /dev/null
@@ -1,27 +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 simplecallback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
-    void aClientMethod();
-}
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
deleted file mode 100644
index ad7c6d8fef..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyClientImpl.java
+++ /dev/null
@@ -1,51 +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 simplecallback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl implements MyClient, MyServiceCallback {
-
-    private MyService myService;
-    static String result;
-
-    @Reference
-    public void setMyService(MyService myService) {
-        this.myService = myService;
-    }
-
-    public void aClientMethod() {
-        System.out.println("aClientMethod on thread " + Thread.currentThread());
-        myService.someMethod("-> someMethod");
-        System.out.println("aClientMethod return from someMethod on thread " + Thread.currentThread());
-    }
-
-    public void receiveResult(String result) {
-        System.out.println("receiveResult on thread " + Thread.currentThread());
-        System.out.println("Result: " + result);
-        MyClientImpl.result = result;
-    }
-}
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
deleted file mode 100644
index 48acc0e94f..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyService.java
+++ /dev/null
@@ -1,34 +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 simplecallback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Remotable
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
-    @OneWay
-    void someMethod(String arg);
-}
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
deleted file mode 100644
index 66cfb2bc8a..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceCallback.java
+++ /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.    
- */
-package simplecallback;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The callback interface for {@link MyService}.
- */
-@Remotable
-public interface MyServiceCallback {
-
-    void receiveResult(String result);
-}
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
deleted file mode 100644
index 08057d2fcc..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/MyServiceImpl.java
+++ /dev/null
@@ -1,54 +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 simplecallback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(MyService.class)
-@Scope("COMPOSITE")
-public class MyServiceImpl implements MyService {
-
-    private MyServiceCallback myServiceCallback;
-
-    /**
-     * The setter used by the runtime to set the callback reference 
-     * @param myServiceCallback
-     */
-    @Callback
-    public void setMyServiceCallback(MyServiceCallback myServiceCallback) {
-        System.out.println("setMyServiceCallback on thread " + Thread.currentThread());
-        this.myServiceCallback = myServiceCallback;
-    }
-    
-    public void someMethod(String arg) {
-        System.out.println("someMethod on thread " + Thread.currentThread());
-        // invoke the callback
-        try {
-            myServiceCallback.receiveResult(arg + " -> receiveResult");
-        } catch(RuntimeException e) {
-            System.out.println("RuntimeException invoking receiveResult: " + e.toString());
-            e.printStackTrace();
-        }
-    }
-}
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
deleted file mode 100644
index eeb0e52163..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/java/simplecallback/SimpleCallbackClient.java
+++ /dev/null
@@ -1,38 +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 simplecallback;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackClient {
-
-    public static void main(String[] args) throws Exception {
-        SCADomain scaDomain = SCADomain.newInstance("simplecallback.composite");
-        MyClient myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-        
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient.aClientMethod();
-        Thread.sleep(1000);
-        
-        scaDomain.close();
-    }
-}
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/resources/simplecallback.composite b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/resources/simplecallback.composite
deleted file mode 100644
index 53e7fe66af..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/resources/simplecallback.composite
+++ /dev/null
@@ -1,49 +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://simplecallback"

-	xmlns:cb="http://simplecallback"

-	name="simplecallback">

-

-    <component name="MyClientComponent">

-        <implementation.java class="simplecallback.MyClientImpl" />
-        <reference name="myService">

-            <interface.java interface="simplecallback.MyService"

-                callbackInterface="simplecallback.MyServiceCallback" />

-            <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceSoapService/MyServiceSoapPort)" />

-            <callback>

-                <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceCallbackSoapService/MyServiceCallbackSoapPort)" />

-            </callback>

-        </reference>

-    </component>

-

-    <component name="MyServiceComponent">

-        <implementation.java class="simplecallback.MyServiceImpl" />
-        <service name="MyService">

-            <interface.wsdl interface="http://simplecallback#wsdl.interface(MyService)"

-                callbackInterface="http://simplecallback#wsdl.interface(MyServiceCallback)" />

-            <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceSoapService/MyServiceSoapPort)" />

-            <callback>

-                <binding.ws wsdlElement="http://simplecallback#wsdl.port(MyServiceCallbackSoapService/MyServiceCallbackSoapPort)" />

-            </callback>

-        </service>

-    </component>

-    

-</composite>

diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl b/branches/sca-java-1.x/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
deleted file mode 100644
index 8a6465de3a..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/main/resources/wsdl/simplecallback.wsdl
+++ /dev/null
@@ -1,109 +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://simplecallback" xmlns:tns="http://simplecallback" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    name="simplecallback">
-
-    <wsdl:types>
-        <schema elementFormDefault="qualified" targetNamespace="http://simplecallback" xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="someMethod">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="receiveResult">
-                <complexType>
-                    <sequence>
-                        <element name="name" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-
-            <element name="receiveResultResponse">
-                <complexType/>
-            </element>
-
-        </schema>
-    </wsdl:types>
-
-    <wsdl:message name="someMethodRequest">
-        <wsdl:part element="tns:someMethod" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="receiveResultRequest">
-        <wsdl:part element="tns:receiveResult" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:message name="receiveResultResponse">
-        <wsdl:part element="tns:receiveResultResponse" name="parameters"/>
-    </wsdl:message>
-
-    <wsdl:portType name="MyService">
-        <wsdl:operation name="someMethod">
-            <wsdl:input message="tns:someMethodRequest" name="someMethodRequest"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:portType name="MyServiceCallback">
-        <wsdl:operation name="receiveResult">
-            <wsdl:input message="tns:receiveResultRequest" name="receiveResultRequest"/>
-            <wsdl:output message="tns:receiveResultResponse" name="receiveResultResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="MyServiceSoapBinding" type="tns:MyService">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="someMethod">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="someMethodRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:binding name="MyServiceCallbackSoapBinding" type="tns:MyServiceCallback">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="receiveResult">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="receiveResultRequest">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="receiveResultResponse">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-
-    <wsdl:service name="MyServiceSoapService">
-        <wsdl:port binding="tns:MyServiceSoapBinding" name="MyServiceSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/MyServiceComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-    <wsdl:service name="MyServiceCallbackSoapService">
-        <wsdl:port binding="tns:MyServiceCallbackSoapBinding" name="MyServiceCallbackSoapPort">
-            <wsdlsoap:address location="http://localhost:8085/MyServiceCallbackComponent"/>
-        </wsdl:port>
-    </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-java-1.x/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java b/branches/sca-java-1.x/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
deleted file mode 100644
index 580a7f6b0c..0000000000
--- a/branches/sca-java-1.x/samples/simple-callback-ws/src/test/java/simplecallback/SimpleCallbackTestCase.java
+++ /dev/null
@@ -1,53 +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 simplecallback;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A testcase that demonstrates resolving the client service and initiating the callback sequence
- */
-public class SimpleCallbackTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    private MyClient myClient;
-
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("simplecallback.composite");
-        myClient = scaDomain.getService(MyClient.class, "MyClientComponent");
-    }
-    
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void test() throws Exception {
-        System.out.println("Main thread " + Thread.currentThread());
-        myClient.aClientMethod();
-        System.out.println("Sleeping ...");
-        Thread.sleep(2000);
-        assertEquals("-> someMethod -> receiveResult", MyClientImpl.result);
-    }
-}
-
-