From e614fa94331b4aac4e087e9957995b5a9e49537c Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 11 May 2012 09:40:06 +0000
Subject: Move BPEL sample out of trunk as Implementation BPEL doesn't work
 properly yet

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1337083 13f79535-47bb-0310-9956-ffa450edef68
---
 .../samples/getting-started/helloworld-bpel/README |  18 +++
 .../getting-started/helloworld-bpel/pom.xml        | 136 +++++++++++++++++++++
 .../main/resources/META-INF/sca-contribution.xml   |  25 ++++
 .../src/main/resources/helloworld.bpel             |  80 ++++++++++++
 .../src/main/resources/helloworld.composite        |  30 +++++
 .../src/main/resources/helloworld.wsdl             |  94 ++++++++++++++
 .../src/test/java/sample/Helloworld.java           |  28 +++++
 .../src/test/java/sample/HelloworldTestCase.java   |  48 ++++++++
 .../samples/getting-started/helloworld-bpel/README |  18 ---
 .../getting-started/helloworld-bpel/pom.xml        | 136 ---------------------
 .../main/resources/META-INF/sca-contribution.xml   |  25 ----
 .../src/main/resources/helloworld.bpel             |  80 ------------
 .../src/main/resources/helloworld.composite        |  30 -----
 .../src/main/resources/helloworld.wsdl             |  94 --------------
 .../src/test/java/sample/Helloworld.java           |  28 -----
 .../src/test/java/sample/HelloworldTestCase.java   |  48 --------
 16 files changed, 459 insertions(+), 459 deletions(-)
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/README
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/pom.xml
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java
 create mode 100644 sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/README
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java
 delete mode 100644 sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java

diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/README b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/README
new file mode 100644
index 0000000000..17676cf5dd
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/README
@@ -0,0 +1,18 @@
+Tuscany - Getting Started - Helloworld Spring Sample
+----------------------------------------------------
+
+This sample is an alternative version of the helloworld sample which uses the Spring Framework instead of an SCA Java component.
+
+The changes to the helloworld sample are:
+- update the pom.xml with the additional Spring dependencies
+- add a Spring context xml file
+- update the composite to use <implementation.spring>
+
+As with all the getting-started samples you can run this sample with:
+
+   mvn tuscany:run 
+
+And then as with the original helloworld sample you may test the service by using the Shell "invoke" command:
+
+   invoke HelloworldComponent sayHello yourName
+
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/pom.xml b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/pom.xml
new file mode 100644
index 0000000000..06fb9364f0
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/pom.xml
@@ -0,0 +1,136 @@
+<?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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+
+   <parent>
+      <groupId>org.apache.tuscany.sca.samples</groupId>
+      <artifactId>tuscany-samples</artifactId>
+      <version>2.0-SNAPSHOT</version>
+      <relativePath />
+   </parent>
+
+   <!-- packaging>zip</packaging -->
+   <artifactId>helloworld-bpel</artifactId>
+   <version>2.0-SNAPSHOT</version>
+
+   <name>Apache Tuscany SCA Samples Helloworld BPEL</name>
+
+   <properties>
+      <tuscany.version>${project.version}</tuscany.version>
+   </properties>
+
+   <!-- ASF repositories so sample can be built from SVN without building trunk-->
+   <repositories><repository>
+       <id>apache.snapshots</id>
+       <name>Apache Snapshot Repository</name>
+       <url>http://repository.apache.org/snapshots</url>
+       <releases><enabled>false</enabled></releases>
+   </repository></repositories>
+   <pluginRepositories><pluginRepository>
+       <id>apache.snapshots</id>
+       <name>Apache Snapshot Repository</name>
+       <url>http://repository.apache.org/snapshots</url>
+       <releases><enabled>false</enabled></releases>
+   </pluginRepository></pluginRepositories>
+
+   <dependencies>
+
+      <dependency>
+         <groupId>junit</groupId>
+         <artifactId>junit</artifactId>
+         <version>4.8.1</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.tuscany.sca</groupId>
+         <artifactId>tuscany-base-runtime</artifactId>
+         <version>${tuscany.version}</version>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.apache.tuscany.sca</groupId>
+         <artifactId>tuscany-implementation-bpel-runtime</artifactId>
+         <version>${tuscany.version}</version>
+         <scope>test</scope>
+      </dependency>
+
+   </dependencies>
+
+   <build>
+
+      <plugins>
+
+         <!-- to support zip packaging -->
+         <plugin>
+            <groupId>org.apache.tuscany.maven.plugins</groupId>
+            <artifactId>maven-zip-plugin</artifactId>
+            <version>alpha2</version>
+            <extensions>true</extensions>
+         </plugin>
+
+         <!-- to support running the composite with mvn tuscany:run -->
+         <plugin>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-plugin</artifactId>
+            <version>${tuscany.version}</version>
+            <dependencies>
+               <dependency>
+                  <groupId>org.apache.tuscany.sca</groupId>
+                  <artifactId>tuscany-implementation-bpel-runtime</artifactId>
+                  <version>${tuscany.version}</version>
+               </dependency>
+            </dependencies>
+         </plugin>
+
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>unpack</id>
+						<phase>test-compile</phase>
+						<goals>
+							<goal>unpack</goal>
+						</goals>
+						<configuration>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.apache.ode</groupId>
+									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+									<version>1.1</version>
+									<type>zip</type>
+									<overWrite>true</overWrite>
+									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
+								</artifactItem>
+							</artifactItems>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+
+      </plugins>
+
+   </build>
+
+</project>
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
new file mode 100644
index 0000000000..95c32fb5bf
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
+              xmlns:sample="http://sample">
+   
+   <deployable composite="sample:helloworld-contribution" />
+
+</contribution>
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel
new file mode 100644
index 0000000000..ab31ee1d0b
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel
@@ -0,0 +1,80 @@
+<!--
+  ~ 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.
+  -->
+<process name="HelloWorld"
+    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
+    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:test="http://testing/"
+    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+
+  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
+     namespace="http://testing/"/>
+
+   <partnerLinks>
+      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
+   </partnerLinks>
+    
+   <variables>
+     <variable name="helloMessage" messageType="test:HelloMessage"/>
+     <variable name="helloMessageResponse" messageType="test:HelloMessageResponse"/>
+     <variable name="tmpVar" type="xsd:string"/>
+   </variables>
+
+   <sequence>
+       <receive
+          name="start"
+          partnerLink="helloPartnerLink"
+          portType="test:HelloPortType"
+          operation="sayHello"
+          variable="helloMessage"
+          createInstance="yes"/>
+
+      <assign name="assign1">
+          <copy>
+              <!-- from>concat($helloMessage.TestPart/test:message/text(), ' World')</from -->
+              <from>concat($helloMessage.TestPart/test:arg0/text(), ' World')</from>
+              <!-- from>concat('Hello ', 'world')</from -->
+              <to variable="tmpVar"/>
+          </copy>
+          <!-- Initialize the response -->
+          <copy>
+              <from>
+                  <literal>
+                      <test:helloResponse>
+                          <test:messageResponse>Dummy</test:messageResponse>
+                      </test:helloResponse>
+                  </literal>        
+              </from>
+              <to variable="helloMessageResponse" part="TestResponse"/>
+          </copy>                  
+          <copy>
+              <from variable="tmpVar"/>
+              <to>$helloMessageResponse.TestResponse/test:messageResponse</to>
+          </copy>
+      </assign>
+       <reply name="end"  
+              partnerLink="helloPartnerLink"
+              portType="test:HelloPortType" 
+              operation="sayHello"
+              variable="helloMessageResponse"/>
+   </sequence>
+</process>
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite
new file mode 100644
index 0000000000..2b032b696b
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite
@@ -0,0 +1,30 @@
+<?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://docs.oasis-open.org/ns/opencsa/sca/200912"
+           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
+           targetNamespace="http://sample"
+xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
+           name="helloworld-contribution">
+
+    <component name="HelloworldComponent">
+       <implementation.bpel process="hns:HelloWorld"/>
+    </component>
+
+</composite>
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl
new file mode 100644
index 0000000000..a866d29f2d
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl
@@ -0,0 +1,94 @@
+<?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 name="helloworld"
+    targetNamespace="http://testing/"
+    xmlns="http://schemas.xmlsoap.org/wsdl/"
+    xmlns:tns="http://testing/"
+    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
+    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
+    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    
+    <wsdl:types>
+        <schema elementFormDefault="qualified" 
+           targetNamespace="http://testing/" 
+           xmlns="http://www.w3.org/2001/XMLSchema">
+
+            <element name="hello">
+                <complexType>
+                    <sequence>
+                        <element name="message" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>
+            
+            <element name="helloResponse">
+                <complexType>
+                    <sequence>
+                        <element name="messageResponse" type="xsd:string"/>
+                    </sequence>
+                </complexType>
+            </element>                     
+        </schema>
+    </wsdl:types>
+    
+    <wsdl:message name="HelloMessage">
+        <wsdl:part element="tns:hello" name="TestPart"/>
+    </wsdl:message>
+    
+    <wsdl:message name="HelloMessageResponse">
+        <wsdl:part element="tns:helloResponse" name="TestResponse"/>
+    </wsdl:message>
+    
+    <wsdl:portType name="HelloPortType">
+        <wsdl:operation name="sayHello">
+            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
+            <wsdl:output message="tns:HelloMessageResponse" name="TestOut"/>
+        </wsdl:operation>    
+    </wsdl:portType>
+    
+
+    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
+        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="sayHello">
+            <wsdlsoap:operation soapAction=""/>
+            <wsdl:input name="TestIn">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output name="TestOut">
+                <wsdlsoap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>    
+    
+    <wsdl:service name="HelloService">
+		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
+		</wsdl:port>
+    </wsdl:service>
+    
+   <plnk:partnerLinkType name="HelloPartnerLinkType">
+       <plnk:role name="me" portType="tns:HelloPortType"/>
+       <plnk:role name="you" portType="tns:HelloPortType"/>
+   </plnk:partnerLinkType>
+</wsdl:definitions>
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java
new file mode 100644
index 0000000000..f4e8c50448
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package sample;
+
+import org.oasisopen.sca.annotation.Remotable;
+
+@Remotable
+public interface Helloworld {
+
+    String sayHello(String name);
+
+}
diff --git a/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java
new file mode 100644
index 0000000000..be27aa68ef
--- /dev/null
+++ b/sca-java-2.x/contrib/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java
@@ -0,0 +1,48 @@
+/*
+ * 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 sample;
+
+import org.junit.Assert;
+
+import org.apache.tuscany.sca.Node;
+import org.apache.tuscany.sca.TuscanyRuntime;
+import org.junit.Test;
+import org.oasisopen.sca.NoSuchServiceException;
+
+public class HelloworldTestCase {
+
+    @Test
+    public void testSayHello() throws NoSuchServiceException {
+
+        // Run the SCA composite in a Tuscany runtime
+        Node node = TuscanyRuntime.runComposite("helloworld.composite", "target/classes");
+        try {
+            
+            // Get the Helloworld service proxy
+            Helloworld helloworld = node.getService(Helloworld.class, "HelloworldComponent");
+            
+            // test that it works as expected
+            Assert.assertEquals("Hello Amelia", helloworld.sayHello("Amelia"));
+            
+        } finally {
+            // Stop the Tuscany runtime Node
+            node.stop();        
+        }
+    }
+}
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/README b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/README
deleted file mode 100644
index 17676cf5dd..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/README
+++ /dev/null
@@ -1,18 +0,0 @@
-Tuscany - Getting Started - Helloworld Spring Sample
-----------------------------------------------------
-
-This sample is an alternative version of the helloworld sample which uses the Spring Framework instead of an SCA Java component.
-
-The changes to the helloworld sample are:
-- update the pom.xml with the additional Spring dependencies
-- add a Spring context xml file
-- update the composite to use <implementation.spring>
-
-As with all the getting-started samples you can run this sample with:
-
-   mvn tuscany:run 
-
-And then as with the original helloworld sample you may test the service by using the Shell "invoke" command:
-
-   invoke HelloworldComponent sayHello yourName
-
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml
deleted file mode 100644
index 06fb9364f0..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/pom.xml
+++ /dev/null
@@ -1,136 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
-
-   <parent>
-      <groupId>org.apache.tuscany.sca.samples</groupId>
-      <artifactId>tuscany-samples</artifactId>
-      <version>2.0-SNAPSHOT</version>
-      <relativePath />
-   </parent>
-
-   <!-- packaging>zip</packaging -->
-   <artifactId>helloworld-bpel</artifactId>
-   <version>2.0-SNAPSHOT</version>
-
-   <name>Apache Tuscany SCA Samples Helloworld BPEL</name>
-
-   <properties>
-      <tuscany.version>${project.version}</tuscany.version>
-   </properties>
-
-   <!-- ASF repositories so sample can be built from SVN without building trunk-->
-   <repositories><repository>
-       <id>apache.snapshots</id>
-       <name>Apache Snapshot Repository</name>
-       <url>http://repository.apache.org/snapshots</url>
-       <releases><enabled>false</enabled></releases>
-   </repository></repositories>
-   <pluginRepositories><pluginRepository>
-       <id>apache.snapshots</id>
-       <name>Apache Snapshot Repository</name>
-       <url>http://repository.apache.org/snapshots</url>
-       <releases><enabled>false</enabled></releases>
-   </pluginRepository></pluginRepositories>
-
-   <dependencies>
-
-      <dependency>
-         <groupId>junit</groupId>
-         <artifactId>junit</artifactId>
-         <version>4.8.1</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.apache.tuscany.sca</groupId>
-         <artifactId>tuscany-base-runtime</artifactId>
-         <version>${tuscany.version}</version>
-         <scope>test</scope>
-      </dependency>
-
-      <dependency>
-         <groupId>org.apache.tuscany.sca</groupId>
-         <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-         <version>${tuscany.version}</version>
-         <scope>test</scope>
-      </dependency>
-
-   </dependencies>
-
-   <build>
-
-      <plugins>
-
-         <!-- to support zip packaging -->
-         <plugin>
-            <groupId>org.apache.tuscany.maven.plugins</groupId>
-            <artifactId>maven-zip-plugin</artifactId>
-            <version>alpha2</version>
-            <extensions>true</extensions>
-         </plugin>
-
-         <!-- to support running the composite with mvn tuscany:run -->
-         <plugin>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-plugin</artifactId>
-            <version>${tuscany.version}</version>
-            <dependencies>
-               <dependency>
-                  <groupId>org.apache.tuscany.sca</groupId>
-                  <artifactId>tuscany-implementation-bpel-runtime</artifactId>
-                  <version>${tuscany.version}</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>unpack</id>
-						<phase>test-compile</phase>
-						<goals>
-							<goal>unpack</goal>
-						</goals>
-						<configuration>
-							<artifactItems>
-								<artifactItem>
-									<groupId>org.apache.ode</groupId>
-									<artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-									<version>1.1</version>
-									<type>zip</type>
-									<overWrite>true</overWrite>
-									<outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
-								</artifactItem>
-							</artifactItems>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-
-      </plugins>
-
-   </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 95c32fb5bf..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-              xmlns:sample="http://sample">
-   
-   <deployable composite="sample:helloworld-contribution" />
-
-</contribution>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel
deleted file mode 100644
index ab31ee1d0b..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.bpel
+++ /dev/null
@@ -1,80 +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.
-  -->
-<process name="HelloWorld"
-    targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"    
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:test="http://testing/"
-    queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-    expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
-
-  <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
-     namespace="http://testing/"/>
-
-   <partnerLinks>
-      <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
-   </partnerLinks>
-    
-   <variables>
-     <variable name="helloMessage" messageType="test:HelloMessage"/>
-     <variable name="helloMessageResponse" messageType="test:HelloMessageResponse"/>
-     <variable name="tmpVar" type="xsd:string"/>
-   </variables>
-
-   <sequence>
-       <receive
-          name="start"
-          partnerLink="helloPartnerLink"
-          portType="test:HelloPortType"
-          operation="sayHello"
-          variable="helloMessage"
-          createInstance="yes"/>
-
-      <assign name="assign1">
-          <copy>
-              <!-- from>concat($helloMessage.TestPart/test:message/text(), ' World')</from -->
-              <from>concat($helloMessage.TestPart/test:arg0/text(), ' World')</from>
-              <!-- from>concat('Hello ', 'world')</from -->
-              <to variable="tmpVar"/>
-          </copy>
-          <!-- Initialize the response -->
-          <copy>
-              <from>
-                  <literal>
-                      <test:helloResponse>
-                          <test:messageResponse>Dummy</test:messageResponse>
-                      </test:helloResponse>
-                  </literal>        
-              </from>
-              <to variable="helloMessageResponse" part="TestResponse"/>
-          </copy>                  
-          <copy>
-              <from variable="tmpVar"/>
-              <to>$helloMessageResponse.TestResponse/test:messageResponse</to>
-          </copy>
-      </assign>
-       <reply name="end"  
-              partnerLink="helloPartnerLink"
-              portType="test:HelloPortType" 
-              operation="sayHello"
-              variable="helloMessageResponse"/>
-   </sequence>
-</process>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite
deleted file mode 100644
index 2b032b696b..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.composite
+++ /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.    
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://sample"
-xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
-           name="helloworld-contribution">
-
-    <component name="HelloworldComponent">
-       <implementation.bpel process="hns:HelloWorld"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl
deleted file mode 100644
index a866d29f2d..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,94 +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 name="helloworld"
-    targetNamespace="http://testing/"
-    xmlns="http://schemas.xmlsoap.org/wsdl/"
-    xmlns:tns="http://testing/"
-    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
-    xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
-    
-    <wsdl:types>
-        <schema elementFormDefault="qualified" 
-           targetNamespace="http://testing/" 
-           xmlns="http://www.w3.org/2001/XMLSchema">
-
-            <element name="hello">
-                <complexType>
-                    <sequence>
-                        <element name="message" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>
-            
-            <element name="helloResponse">
-                <complexType>
-                    <sequence>
-                        <element name="messageResponse" type="xsd:string"/>
-                    </sequence>
-                </complexType>
-            </element>                     
-        </schema>
-    </wsdl:types>
-    
-    <wsdl:message name="HelloMessage">
-        <wsdl:part element="tns:hello" name="TestPart"/>
-    </wsdl:message>
-    
-    <wsdl:message name="HelloMessageResponse">
-        <wsdl:part element="tns:helloResponse" name="TestResponse"/>
-    </wsdl:message>
-    
-    <wsdl:portType name="HelloPortType">
-        <wsdl:operation name="sayHello">
-            <wsdl:input message="tns:HelloMessage" name="TestIn"/>
-            <wsdl:output message="tns:HelloMessageResponse" name="TestOut"/>
-        </wsdl:operation>    
-    </wsdl:portType>
-    
-
-    <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
-        <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="sayHello">
-            <wsdlsoap:operation soapAction=""/>
-            <wsdl:input name="TestIn">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output name="TestOut">
-                <wsdlsoap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>    
-    
-    <wsdl:service name="HelloService">
-		<wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/helloWorld"/>
-		</wsdl:port>
-    </wsdl:service>
-    
-   <plnk:partnerLinkType name="HelloPartnerLinkType">
-       <plnk:role name="me" portType="tns:HelloPortType"/>
-       <plnk:role name="you" portType="tns:HelloPortType"/>
-   </plnk:partnerLinkType>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java
deleted file mode 100644
index f4e8c50448..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/Helloworld.java
+++ /dev/null
@@ -1,28 +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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
-    String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.java
deleted file mode 100644
index be27aa68ef..0000000000
--- a/sca-java-2.x/trunk/samples/getting-started/helloworld-bpel/src/test/java/sample/HelloworldTestCase.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 sample;
-
-import org.junit.Assert;
-
-import org.apache.tuscany.sca.Node;
-import org.apache.tuscany.sca.TuscanyRuntime;
-import org.junit.Test;
-import org.oasisopen.sca.NoSuchServiceException;
-
-public class HelloworldTestCase {
-
-    @Test
-    public void testSayHello() throws NoSuchServiceException {
-
-        // Run the SCA composite in a Tuscany runtime
-        Node node = TuscanyRuntime.runComposite("helloworld.composite", "target/classes");
-        try {
-            
-            // Get the Helloworld service proxy
-            Helloworld helloworld = node.getService(Helloworld.class, "HelloworldComponent");
-            
-            // test that it works as expected
-            Assert.assertEquals("Hello Amelia", helloworld.sayHello("Amelia"));
-            
-        } finally {
-            // Stop the Tuscany runtime Node
-            node.stop();        
-        }
-    }
-}
-- 
cgit v1.2.3