Moving 1.x branches

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

17 files changed, 0 insertions, 949 deletions

diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
deleted file mode 100644
index 1ab2ba3d5d..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingPongTestCase.java
+++ /dev/null
@@ -1,60 +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 org.apache.tuscany.sca.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPingPongTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PingPortType bpelPing = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("ping-pong/ping-pong.composite");
-        //bpelPing = scaDomain.getService(PingPortType.class, "BPELPingPong-PingComponent/PingService");
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        //scaDomain.close();
-    }
-
-    public void testPing() {
-        //String response = bpelPing.Ping("Ping");
-        //System.out.println("response:" + response);
-        //assertNotNull(response);
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
deleted file mode 100644
index 34f82318a3..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPingTestCase.java
+++ /dev/null
@@ -1,63 +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 org.apache.tuscany.sca.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.ping.PingPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPingTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PingPortType bpelService = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        //scaDomain = SCADomain.newInstance("ping/ping.composite");
-        //bpelService = scaDomain.getService(PingPortType.class, "BPELPingComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        //scaDomain.close();
-    }
-
-    public void testInvoke() {
-        /*
-        String response = bpelService.Ping("Ping");
-        System.out.println("response:" + response);
-        assertNotNull(response);
-        */
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
deleted file mode 100644
index 313bd66850..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/java/pingpong/BPELPongTestCase.java
+++ /dev/null
@@ -1,62 +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 org.apache.tuscany.sca.implementation.bpel;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.implementation.bpel.example.pong.PongPortType;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * Tests the BPEL service
- * 
- * @version $Rev$ $Date$
- */
-public class BPELPongTestCase extends TestCase {
-
-    private SCADomain scaDomain;
-    PongPortType bpelService = null;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void setUp() throws Exception {
-        scaDomain = SCADomain.newInstance("pong/pong.composite");
-        bpelService = scaDomain.getService(PongPortType.class, "BPELPongComponent");
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @Override
-    protected void tearDown() throws Exception {
-        scaDomain.close();
-    }
-
-    public void testInvoke() {
-        String response = bpelService.Pong("Pong");
-        System.out.println("response:" + response);
-        assertNotNull(response);
-        
-        // assertEquals("Hello World", response);
-    }
-}
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties
deleted file mode 100644
index d0b3c3aa5a..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/log4j.properties
+++ /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.
-#
-
-# Set root logger level to WARN and its only appender to CONSOLE
-log4j.rootLogger=OFF, CONSOLE
-
-# log4j properties to work with commandline tools.
-log4j.category.org.mortbay=OFF
-log4j.category.org.hibernate.type=OFF
-log4j.category.org.objectweb=OFF
-log4j.category.org.apache.ode.axis2=OFF
-log4j.category.org.apache.ode.bpel.engine=OFF
-log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF
-log4j.category.org.apache.ode.bpel.epr=OFF
-
-# Console appender
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
deleted file mode 100644
index e4cbdfe89c..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="PingService">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)" />
-  </service>
-
-  <service name="PongService">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-
-  <reference name="Pong">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </reference>
-</componentType>  
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
deleted file mode 100644
index a0eb4d0b5b..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping-pong/ping-pong.composite
+++ /dev/null
@@ -1,36 +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://bpel"
-    xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-    xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-    name="ping">
-    
-    <component name="BPELPingPong-PingComponent">
-        <implementation.bpel process="ping:Ping"/>
-        <reference name="Pong" target="BPELPingPong-PongComponent/PongService"/>
-    </component>
-    
-    <component name="BPELPingPong-PongComponent">
-        <implementation.bpel process="pong:Pong"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml
deleted file mode 100644
index 613ed9c491..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/deploy.xml
+++ /dev/null
@@ -1,35 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:process="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl">
-
-	<process name="process:Ping">
-		<active>true</active>
-		<provide partnerLink="PingPartnerLink">
-			<service name="ping:PingService" port="PingPort"/>
-		</provide>
-		<invoke partnerLink="PongPartnerLink">
-			<service name="pong:PongService" port="PongPort"/>
-		</invoke>
-	</process>
-    
-</deploy>
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel
deleted file mode 100644
index abda9e58d2..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.bpel
+++ /dev/null
@@ -1,124 +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.
-  -->
-<process
-        name="Ping"
-        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-        xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-    <import location="ping.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-    <import location="pong.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-    <partnerLinks>
-        <partnerLink name="PingPartnerLink"
-                partnerLinkType="ping:PingPartnerLinkType"
-                myRole="Provider" />
-        <partnerLink name="PongPartnerLink"
-                partnerLinkType="pong:PongPartnerLinkType"
-                partnerRole="Provider"
-                initializePartnerRole="yes" />
-    </partnerLinks>
-
-    <variables>
-        <variable messageType="ping:PingRequest" name="pingRequest"/>
-        <variable messageType="ping:PingResponse" name="pingResponse"/>
-        <variable messageType="pong:PongRequest" name="pongRequest"/>
-        <variable messageType="pong:PongResponse" name="pongResponse"/>
-        <variable type="xsd:string" name="text" />
-    </variables>
-
-    <sequence name="Main">
-        <receive name="pingReceive"
-                createInstance="yes"
-                operation="Ping"
-                partnerLink="PingPartnerLink"
-                portType="ping:PingPortType"
-                variable="pingRequest"/>
-
-        <assign name="assignPongRequest">
-            <!-- add "ping" text to the input text -->
-            <copy>
-                <from>concat($pingRequest.body/ping:text, ' ping')</from>
-                <to variable="text"/>
-            </copy>
-            <!-- initialize pongRequest -->
-            <copy>
-                <from>
-                    <literal>
-                        <pong:PongRequest>
-                            <pong:text/>
-                        </pong:PongRequest>
-                    </literal>
-                </from>
-                <to>$pongRequest.body</to>
-            </copy>
-            <!-- copy new text into pongRequest -->
-            <copy>
-                <from>$text</from>
-                <to>$pongRequest.body/pong:text</to>
-            </copy>
-        </assign>
-        
-        <invoke name="invokePong"
-                operation="Pong"
-                inputVariable="pongRequest"
-                outputVariable="pongResponse"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"/>
-        
-        <assign name="assignPingResponse">
-            <copy>
-                <from>$pongResponse.body/pong:text</from>
-                <to>$text</to>
-            </copy>
-            <!-- initialize pingResponse -->
-            <copy>
-                <from>
-                    <literal>
-                        <ping:PingResponse>
-                            <ping:text/>
-                        </ping:PingResponse>
-                    </literal>
-                </from>
-                <to>$pingResponse.body</to>
-            </copy>
-            <!-- copy new text into pingResponse -->
-            <copy>
-                <from>$text</from>
-                <to>$pingResponse.body/ping:text</to>
-            </copy>
-        </assign>
-
-        <reply name="pingReply"
-                partnerLink="PingPartnerLink"
-                portType="ping:PingPortType"
-                operation="Ping"
-                variable="pingResponse"/>
-    </sequence>
-</process>
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType
deleted file mode 100644
index 7598a99d16..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.componentType
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <reference name="Pong">
-  	<interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </reference>
-
-  <service name="PingService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl#wsdl.interface(PingPortType)" />
-  </service>
-
-  <service name="PongService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-</componentType>  
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite
deleted file mode 100644
index 75eed03022..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.composite
+++ /dev/null
@@ -1,29 +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://bpel"
-    xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel"
-    name="ping">
-    
-    <component name="BPELPingComponent">
-        <implementation.bpel process="ping:Ping"/>
-    </component>
-</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
deleted file mode 100644
index 03e54c4de8..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/ping.wsdl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.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.
-  -->
-<definitions name="Ping"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PingRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PingResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PingRequest">
-        <part name="body" element="tns:PingRequest"/>
-    </message>
-
-    <message name="PingResponse">
-        <part name="body" element="tns:PingResponse"/>
-    </message>
-
-    <portType name="PingPortType">
-        <operation name="Ping">
-            <input message="tns:PingRequest"/>
-            <output message="tns:PingResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PingSoapBinding" type="tns:PingPortType">
-    	<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-    	<operation name="Ping">
-    		<soap:operation soapAction="" />
-    		<input name="PingRequest">
-    			<soap:body use="literal" />
-    		</input>
-    		<output name="PingResponse">
-    			<soap:body use="literal" />
-    		</output>
-    	</operation>
-    </binding>
-
-    <service name="PingService">
-    	<port name="PingPort" binding="tns:PingSoapBinding">
-    		<soap:address location="http://localhost:8085/ode/processes/ping" />
-    	</port>
-    </service>
-
-    <plnk:partnerLinkType name="PingPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PingPortType"/>
-    </plnk:partnerLinkType>
-</definitions>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
deleted file mode 100644
index 1f4c4a9aaa..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/ping/pong.wsdl
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.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.
-  -->
-<definitions name="Pong"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PongRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PongResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PongRequest">
-        <part name="body" element="tns:PongRequest"/>
-    </message>
-
-    <message name="PongResponse">
-        <part name="body" element="tns:PongResponse"/>
-    </message>
-
-    <portType name="PongPortType">
-        <operation name="Pong">
-            <input message="tns:PongRequest"/>
-            <output message="tns:PongResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PongSoapBinding" type="tns:PongPortType">
-	    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Pong">
-            <soap:operation soapAction=""/>
-            <input name="PongRequest">
-                <soap:body use="literal"/>
-            </input>
-            <output name="PongResponse">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-	</binding>
-    
-    <service name="PongService">
-		<port name="PongPort" binding="tns:PongSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/pong"/>
-		</port>
-    </service>    
-    
-    <plnk:partnerLinkType name="PongPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PongPortType"/>
-    </plnk:partnerLinkType>
-</definitions>
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml
deleted file mode 100644
index 1315ef47f0..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/deploy.xml
+++ /dev/null
@@ -1,31 +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.
-  -->
-<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
-        xmlns:process="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl">
-
-	<process name="process:Pong">
-		<active>true</active>
-		<provide partnerLink="PongPartnerLink">
-			<service name="pong:PongService" port="PongPort"/>
-		</provide>
-	</process>
-    
-</deploy>
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel
deleted file mode 100644
index b5d84898c7..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.bpel
+++ /dev/null
@@ -1,84 +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.
-  -->
-<process
-        name="Pong"
-        xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-        xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
-
-    <import location="pong.wsdl"
-            namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-
-
-    <partnerLinks>
-        <partnerLink name="PongPartnerLink"
-                partnerLinkType="pong:PongPartnerLinkType"
-                myRole="Provider" />
-    </partnerLinks>
-
-    <variables>
-        <variable messageType="pong:PongRequest" name="pongRequest"/>
-        <variable messageType="pong:PongResponse" name="pongResponse"/>
-        <variable type="xsd:string" name="text" />
-    </variables>
-
-    <sequence name="Main">
-        <receive name="pongReceive"
-                createInstance="yes"
-                operation="Pong"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"
-                variable="pongRequest"/>
-
-        <assign name="assignPongRequest">
-            <!-- add "ping" text to the input text -->
-            <copy>
-                <from>concat($pongRequest.body/pong:text, ' pong')</from>
-                <to>$text</to>
-            </copy>
-            <!-- initialize pongResponse -->
-            <copy>
-                <from>
-                    <literal>
-                        <pong:PongRequest>
-                            <pong:text/>
-                        </pong:PongRequest>
-                    </literal>
-                </from>
-                <to>$pongResponse.body</to>
-            </copy>
-            <!-- copy new text into pongResponse -->
-            <copy>
-                <from>$text</from>
-                <to>$pongResponse.body/pong:text</to>
-            </copy>
-        </assign>
-        
-        <reply name="pongReply"
-                partnerLink="PongPartnerLink"
-                portType="pong:PongPortType"
-                operation="Pong"
-                variable="pongResponse"/>
-    </sequence>
-</process>
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType
deleted file mode 100644
index 2f8fd5d3de..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.componentType
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<!--
- * 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.
--->
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" 
-	xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-  <service name="PongService">
-        <interface.wsdl interface="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl#wsdl.interface(PongPortType)" />
-  </service>
-
-</componentType>  
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.composite b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.composite
deleted file mode 100644
index e40ce7ee45..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.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://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://bpel"
-    xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel"
-    name="pong">
-    
-    <component name="BPELPongComponent">
-        <implementation.bpel process="pong:Pong"/>
-    </component>
-
-</composite>
\ No newline at end of file
diff --git a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl b/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
deleted file mode 100644
index 21ee8b82f6..0000000000
--- a/branches/sca-java-1.2.1/itest/bpel/ping-pong/test/resources/pong/pong.wsdl
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.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.
-  -->
-<definitions name="Pong"
-        targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-        xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns="http://schemas.xmlsoap.org/wsdl/">
-
-    <types>
-        <schema targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"
-                xmlns="http://www.w3.org/2001/XMLSchema">
-            <element name="PongRequest">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-            <element name="PongResponse">
-                <complexType>
-                    <all>
-                        <element name="text" type="string"/>
-                    </all>
-                </complexType>
-            </element>
-        </schema>
-    </types>
-
-    <message name="PongRequest">
-        <part name="body" element="tns:PongRequest"/>
-    </message>
-
-    <message name="PongResponse">
-        <part name="body" element="tns:PongResponse"/>
-    </message>
-
-    <portType name="PongPortType">
-        <operation name="Pong">
-            <input message="tns:PongRequest"/>
-            <output message="tns:PongResponse"/>
-        </operation>
-    </portType>
-
-    <binding name="PongSoapBinding" type="tns:PongPortType">
-	    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <operation name="Pong">
-            <soap:operation soapAction=""/>
-            <input name="PongRequest">
-                <soap:body use="literal"/>
-            </input>
-            <output name="PongResponse">
-                <soap:body use="literal"/>
-            </output>
-        </operation>
-	</binding>
-    
-    <service name="PongService">
-		<port name="PongPort" binding="tns:PongSoapBinding">
-     		<soap:address location="http://localhost:8085/ode/processes/pong"/>
-		</port>
-    </service>    
-    
-    <plnk:partnerLinkType name="PongPartnerLinkType">
-        <plnk:role name="Provider" portType="tns:PongPortType"/>
-    </plnk:partnerLinkType>
-    
-    <!--
-    
-    This is an abstract interface/portType definition.  Note the lack of 
-    binding and service.  Since Pong is only exposed on the JBI bus, the
-    JBI endpoint is defined in Pong.dd.
-
-    -->
-
-</definitions>